Revert 239795

I forgot to update some clang test cases.  I'll fix and resubmit tomorrow.

llvm-svn: 239800

3 files changed, 2 insertions, 44 deletions

diff --git a/llvm/test/Transforms/Inline/byval-tail-call.ll b/llvm/test/Transforms/Inline/byval-tail-call.ll
index 7553b76cf15..1e50463ed80 100644
--- a/llvm/test/Transforms/Inline/byval-tail-call.ll
+++ b/llvm/test/Transforms/Inline/byval-tail-call.ll
@@ -33,7 +33,7 @@ define void @frob(i32* %x) {
 ; CHECK: %[[POS:.*]] = alloca i32
 ; CHECK: %[[VAL:.*]] = load i32, i32* %x
 ; CHECK: store i32 %[[VAL]], i32* %[[POS]]
-; CHECK: {{^ *}}call void @ext(i32* nonnull %[[POS]]
+; CHECK: {{^ *}}call void @ext(i32* %[[POS]]
 ; CHECK: tail call void @ext(i32* null)
 ; CHECK: ret void
   tail call void @qux(i32* byval %x)
diff --git a/llvm/test/Transforms/InstCombine/nonnull-param.ll b/llvm/test/Transforms/InstCombine/nonnull-param.ll
deleted file mode 100644
index d9a84ee47cd..00000000000
--- a/llvm/test/Transforms/InstCombine/nonnull-param.ll
+++ /dev/null
@@ -1,42 +0,0 @@
-; RUN: opt -S -instcombine < %s | FileCheck %s
-
-declare void @callee(i8* %arg)
-
-; Positive test - arg is known non null
-define void @test(i8* nonnull %arg) {
-; CHECK-LABEL: @test
-; CHECK: call void @callee(i8* nonnull %arg)
-  call void @callee(i8* %arg)
-  ret void
-}
-
-
-; Negative test - arg is not known to be non null
-define void @test2(i8* %arg) {
-; CHECK-LABEL: @test2
-; CHECK: call void @callee(i8* %arg)
-  call void @callee(i8* %arg)
-  ret void
-}
-
-declare void @callee2(i8*, i8*, i8*)
-
-; Sanity check arg indexing
-define void @test3(i8* %arg1, i8* nonnull %arg2, i8* %arg3) {
-; CHECK-LABEL: @test3
-; CHECK: call void @callee2(i8* %arg1, i8* nonnull %arg2, i8* %arg3)
-  call void @callee2(i8* %arg1, i8* %arg2, i8* %arg3)
-  ret void
-}
-
-; Because of the way CallSite::paramHasAttribute looks at the callee 
-; directly, we will not set the attribute on the CallSite.  That's 
-; fine as long as all consumers use the same check. 
-define void @test4(i8* nonnull %arg) {
-; CHECK-LABEL: @test4
-; CHECK: call void @test4(i8* %arg)
-  call void @test4(i8* %arg)
-  ret void
-}
-
-
diff --git a/llvm/test/Transforms/InstCombine/select.ll b/llvm/test/Transforms/InstCombine/select.ll
index 8be247228b8..27e487b4815 100644
--- a/llvm/test/Transforms/InstCombine/select.ll
+++ b/llvm/test/Transforms/InstCombine/select.ll
@@ -1265,7 +1265,7 @@ define i32 @test77(i1 %flag, i32* %x) {
 ; load does.
 ; CHECK-LABEL: @test77(
 ; CHECK: %[[A:.*]] = alloca i32, align 1
-; CHECK: call void @scribble_on_i32(i32* nonnull %[[A]])
+; CHECK: call void @scribble_on_i32(i32* %[[A]])
 ; CHECK: store i32 0, i32* %x
 ; CHECK: %[[P:.*]] = select i1 %flag, i32* %[[A]], i32* %x
 ; CHECK: load i32, i32* %[[P]]