Revert 94937 and move the noreturn check to codegen.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@95198 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGen/X86/tailcall1.ll b/test/CodeGen/X86/tailcall1.ll
index 96c4cad..d08919e 100644
--- a/test/CodeGen/X86/tailcall1.ll
+++ b/test/CodeGen/X86/tailcall1.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -tailcallopt | grep TAILCALL | count 5
+; RUN: llc < %s -march=x86 -tailcallopt | grep TAILCALL | count 4
declare fastcc i32 @tailcallee(i32 %a1, i32 %a2, i32 %a3, i32 %a4)
diff --git a/test/CodeGen/X86/tailcall2.ll b/test/CodeGen/X86/tailcall2.ll
index 81419dc..3cd8b26 100644
--- a/test/CodeGen/X86/tailcall2.ll
+++ b/test/CodeGen/X86/tailcall2.ll
@@ -127,3 +127,16 @@
%1 = tail call signext i16 %0(i32 0) nounwind
ret i16 %1
}
+
+define void @t10() nounwind ssp {
+entry:
+; 32: t10:
+; 32: call
+
+; 64: t10:
+; 64: callq
+ %0 = tail call i32 @foo4() noreturn nounwind
+ unreachable
+}
+
+declare i32 @foo4()
diff --git a/test/Transforms/TailCallElim/no-return-calls.ll b/test/Transforms/TailCallElim/no-return-calls.ll
deleted file mode 100644
index f5643ae..0000000
--- a/test/Transforms/TailCallElim/no-return-calls.ll
+++ /dev/null
@@ -1,12 +0,0 @@
-; RUN: opt < %s -tailcallelim -S | FileCheck %s
-
-define void @t() nounwind ssp {
-entry:
-; CHECK: entry:
-; CHECK: %0 = call i32 @foo()
-; CHECK: ret void
- %0 = call i32 @foo() nounwind noreturn
- ret void
-}
-
-declare i32 @foo()