Reverting r221626 due to a too-strict test.

llvm-svn: 221629

diff --git a/llvm/lib/Target/X86/X86InstrCompiler.td b/llvm/lib/Target/X86/X86InstrCompiler.td
index 117b6ff..bf25672 100644 (file)
--- a/llvm/lib/Target/X86/X86InstrCompiler.td
+++ b/llvm/lib/Target/X86/X86InstrCompiler.td
@@ -1191,7 +1191,6 @@ def def32 : PatLeaf<(i32 GR32:$src), [{
   return N->getOpcode() != ISD::TRUNCATE &&
          N->getOpcode() != TargetOpcode::EXTRACT_SUBREG &&
          N->getOpcode() != ISD::CopyFromReg &&
-         N->getOpcode() != ISD::AssertSext &&
          N->getOpcode() != X86ISD::CMOV;
 }]>;
 

diff --git a/llvm/test/CodeGen/X86/TruncAssertZext.ll b/llvm/test/CodeGen/X86/TruncAssertZext.ll
deleted file mode 100644 (file)
index 08079e9..0000000
--- a/llvm/test/CodeGen/X86/TruncAssertZext.ll
+++ /dev/null
@@ -1,16 +0,0 @@
-; RUN: llc < %s -O2 -march=x86-64 | FileCheck %s\r
-; Checks that a zeroing mov is inserted for the trunc/zext pair even when\r
-; the source of the zext is an AssertSext node\r
-; PR20494\r
-\r
-define i64 @main(i64 %a) { \r
-; CHECK-LABEL: main\r
-; CHECK: movl %ecx, %eax\r
-; CHECK: ret\r
-  %or = or i64 %a, -2\r
-  %trunc = trunc i64 %or to i32\r
-  br label %l\r
-l:\r
-  %ext = zext i32 %trunc to i64\r
-  ret i64 %ext\r
-}\r