revert my previous patches that introduced an additional parameter to the objectsize intrinsic.

After a lot of discussion, we realized it's not the best option for run-time bounds checking

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@157255 91177308-0d34-0410-b5e6-96231b3b80d8

4 files changed, 20 insertions, 100 deletions

diff --git a/test/Transforms/InstCombine/debuginfo.ll b/test/Transforms/InstCombine/debuginfo.ll
index 62b491b..f6892fc 100644
--- a/test/Transforms/InstCombine/debuginfo.ll
+++ b/test/Transforms/InstCombine/debuginfo.ll
@@ -2,7 +2,7 @@
 
 declare void @llvm.dbg.declare(metadata, metadata) nounwind readnone
 
-declare i64 @llvm.objectsize.i64(i8*, i1, i32) nounwind readnone
+declare i64 @llvm.objectsize.i64(i8*, i1) nounwind readnone
 
 declare i8* @foo(i8*, i32, i64, i64) nounwind
 
@@ -23,7 +23,7 @@ entry:
   %tmp1 = load i32* %__val.addr, align 4, !dbg !21, !tbaa !17
   %tmp2 = load i64* %__len.addr, align 8, !dbg !21, !tbaa !19
   %tmp3 = load i8** %__dest.addr, align 8, !dbg !21, !tbaa !13
-  %0 = call i64 @llvm.objectsize.i64(i8* %tmp3, i1 false, i32 0), !dbg !21
+  %0 = call i64 @llvm.objectsize.i64(i8* %tmp3, i1 false), !dbg !21
   %call = call i8* @foo(i8* %tmp, i32 %tmp1, i64 %tmp2, i64 %0), !dbg !21
   ret i8* %call, !dbg !21
 }
diff --git a/test/Transforms/InstCombine/objsize.ll b/test/Transforms/InstCombine/objsize.ll
index e33385e..9bf215c 100644
--- a/test/Transforms/InstCombine/objsize.ll
+++ b/test/Transforms/InstCombine/objsize.ll
@@ -9,7 +9,7 @@ target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f3
 define i32 @foo() nounwind {
 ; CHECK: @foo
 ; CHECK-NEXT: ret i32 60
-  %1 = call i32 @llvm.objectsize.i32(i8* getelementptr inbounds ([60 x i8]* @a, i32 0, i32 0), i1 false, i32 0)
+  %1 = call i32 @llvm.objectsize.i32(i8* getelementptr inbounds ([60 x i8]* @a, i32 0, i32 0), i1 false)
   ret i32 %1
 }
 
@@ -17,7 +17,7 @@ define i8* @bar() nounwind {
 ; CHECK: @bar
 entry:
   %retval = alloca i8*
-  %0 = call i32 @llvm.objectsize.i32(i8* getelementptr inbounds ([60 x i8]* @a, i32 0, i32 0), i1 false, i32 0)
+  %0 = call i32 @llvm.objectsize.i32(i8* getelementptr inbounds ([60 x i8]* @a, i32 0, i32 0), i1 false)
   %cmp = icmp ne i32 %0, -1
 ; CHECK: br i1 true
   br i1 %cmp, label %cond.true, label %cond.false
@@ -34,7 +34,7 @@ cond.false:
 define i32 @f() nounwind {
 ; CHECK: @f
 ; CHECK-NEXT: ret i32 0
-  %1 = call i32 @llvm.objectsize.i32(i8* getelementptr ([60 x i8]* @a, i32 1, i32 0), i1 false, i32 0)
+  %1 = call i32 @llvm.objectsize.i32(i8* getelementptr ([60 x i8]* @a, i32 1, i32 0), i1 false)
   ret i32 %1
 }
 
@@ -42,8 +42,8 @@ define i32 @f() nounwind {
 
 define i1 @baz() nounwind {
 ; CHECK: @baz
-; CHECK-NEXT: objectsize
-  %1 = tail call i32 @llvm.objectsize.i32(i8* getelementptr inbounds ([0 x i8]* @window, i32 0, i32 0), i1 false, i32 0)
+; CHECK-NEXT: ret i1 true
+  %1 = tail call i32 @llvm.objectsize.i32(i8* getelementptr inbounds ([0 x i8]* @window, i32 0, i32 0), i1 false)
   %2 = icmp eq i32 %1, -1
   ret i1 %2
 }
@@ -52,7 +52,7 @@ define void @test1(i8* %q, i32 %x) nounwind noinline {
 ; CHECK: @test1
 ; CHECK: objectsize.i32
 entry:
-  %0 = call i32 @llvm.objectsize.i32(i8* getelementptr inbounds ([0 x i8]* @window, i32 0, i32 10), i1 false, i32 0) ; <i64> [#uses=1]
+  %0 = call i32 @llvm.objectsize.i32(i8* getelementptr inbounds ([0 x i8]* @window, i32 0, i32 10), i1 false) ; <i64> [#uses=1]
   %1 = icmp eq i32 %0, -1                         ; <i1> [#uses=1]
   br i1 %1, label %"47", label %"46"
 
@@ -68,7 +68,7 @@ entry:
 define i32 @test2() nounwind {
 ; CHECK: @test2
 ; CHECK-NEXT: ret i32 34
-  %1 = call i32 @llvm.objectsize.i32(i8* getelementptr (i8* bitcast ([9 x i32]* @.str5 to i8*), i32 2), i1 false, i32 0)
+  %1 = call i32 @llvm.objectsize.i32(i8* getelementptr (i8* bitcast ([9 x i32]* @.str5 to i8*), i32 2), i1 false)
   ret i32 %1
 }
 
@@ -77,7 +77,7 @@ define i32 @test2() nounwind {
 
 declare i8* @__memcpy_chk(i8*, i8*, i32, i32) nounwind
 
-declare i32 @llvm.objectsize.i32(i8*, i1, i32) nounwind readonly
+declare i32 @llvm.objectsize.i32(i8*, i1) nounwind readonly
 
 declare i8* @__inline_memcpy_chk(i8*, i8*, i32) nounwind inlinehint
 
@@ -89,7 +89,7 @@ entry:
 bb11:
   %0 = getelementptr inbounds float* getelementptr inbounds ([480 x float]* @array, i32 0, i32 128), i32 -127 ; <float*> [#uses=1]
   %1 = bitcast float* %0 to i8*                   ; <i8*> [#uses=1]
-  %2 = call i32 @llvm.objectsize.i32(i8* %1, i1 false, i32 0) ; <i32> [#uses=1]
+  %2 = call i32 @llvm.objectsize.i32(i8* %1, i1 false) ; <i32> [#uses=1]
   %3 = call i8* @__memcpy_chk(i8* undef, i8* undef, i32 512, i32 %2) nounwind ; <i8*> [#uses=0]
 ; CHECK: unreachable
   unreachable
@@ -111,7 +111,7 @@ define i32 @test4() nounwind ssp {
 entry:
   %0 = alloca %struct.data, align 8
   %1 = bitcast %struct.data* %0 to i8*
-  %2 = call i32 @llvm.objectsize.i32(i8* %1, i1 false, i32 0) nounwind
+  %2 = call i32 @llvm.objectsize.i32(i8* %1, i1 false) nounwind
 ; CHECK-NOT: @llvm.objectsize
 ; CHECK: @llvm.memset.p0i8.i32(i8* %1, i8 0, i32 1824, i32 8, i1 false)
   %3 = call i8* @__memset_chk(i8* %1, i32 0, i32 1824, i32 %2) nounwind
@@ -125,7 +125,7 @@ define void @test5(i32 %n) nounwind ssp {
 ; CHECK: @test5
 entry:
   %0 = tail call noalias i8* @malloc(i32 20) nounwind
-  %1 = tail call i32 @llvm.objectsize.i32(i8* %0, i1 false, i32 0)
+  %1 = tail call i32 @llvm.objectsize.i32(i8* %0, i1 false)
   %2 = load i8** @s, align 8
 ; CHECK-NOT: @llvm.objectsize
 ; CHECK: @llvm.memcpy.p0i8.p0i8.i32(i8* %0, i8* %1, i32 10, i32 1, i1 false)
@@ -137,7 +137,7 @@ define void @test6(i32 %n) nounwind ssp {
 ; CHECK: @test6
 entry:
   %0 = tail call noalias i8* @malloc(i32 20) nounwind
-  %1 = tail call i32 @llvm.objectsize.i32(i8* %0, i1 false, i32 0)
+  %1 = tail call i32 @llvm.objectsize.i32(i8* %0, i1 false)
   %2 = load i8** @s, align 8
 ; CHECK-NOT: @llvm.objectsize
 ; CHECK: @__memcpy_chk(i8* %0, i8* %1, i32 30, i32 20)
@@ -153,7 +153,7 @@ define i32 @test7() {
 ; CHECK: @test7
   %alloc = call noalias i8* @malloc(i32 48) nounwind
   %gep = getelementptr inbounds i8* %alloc, i32 16
-  %objsize = call i32 @llvm.objectsize.i32(i8* %gep, i1 false, i32 0) nounwind readonly
+  %objsize = call i32 @llvm.objectsize.i32(i8* %gep, i1 false) nounwind readonly
 ; CHECK-NEXT: ret i32 32
   ret i32 %objsize
 }
@@ -164,87 +164,7 @@ define i32 @test8() {
 ; CHECK: @test8
   %alloc = call noalias i8* @calloc(i32 5, i32 7) nounwind
   %gep = getelementptr inbounds i8* %alloc, i32 5
-  %objsize = call i32 @llvm.objectsize.i32(i8* %gep, i1 false, i32 0) nounwind readonly
+  %objsize = call i32 @llvm.objectsize.i32(i8* %gep, i1 false) nounwind readonly
 ; CHECK-NEXT: ret i32 30
   ret i32 %objsize
 }
-
-; CHECK: @test9
-define i32 @test9(i32 %x, i32 %y) nounwind {
-  %a = alloca [3 x [4 x double]], align 8
-  %1 = getelementptr inbounds [3 x [4 x double]]* %a, i32 0, i32 %x
-  %2 = getelementptr inbounds [4 x double]* %1, i32 0, i32 %y
-  %3 = bitcast double* %2 to i8*
-  %objsize = call i32 @llvm.objectsize.i32(i8* %3, i1 false, i32 2)
-  ret i32 %objsize
-; CHECK-NEXT: shl i32 %x, 5
-; CHECK-NEXT: shl i32 %y, 3
-; CHECK-NEXT: add i32
-; CHECK-NEXT: sub i32 96,
-; CHECK-NEXT: icmp ugt i32 {{.*}}, 96
-; CHECK-NEXT: select i1 {{.*}}, i32 0, 
-}
-
-; CHECK: @test10
-define i32 @test10(i32 %x, i32 %y) nounwind {
-  %alloc = call noalias i8* @calloc(i32 %x, i32 %y) nounwind
-  %gep = getelementptr inbounds i8* %alloc, i32 5
-  %objsize = call i32 @llvm.objectsize.i32(i8* %gep, i1 false, i32 2)
-  ret i32 %objsize
-; CHECK-NEXT: mul i32
-; CHECK-NEXT: add i32 {{.*}}, -5
-; CHECK-NEXT: icmp ult i32 {{.*}}, 5
-; CHECK-NEXT: select i1
-; CHECK-NEXT: ret
-}
-
-; CHECK: @test11
-define i32 @test11(i32 %x, i32 %y) nounwind {
-  %alloc = call i8* @malloc(i32 %x)
-  %allocd = bitcast i8* %alloc to double*
-  %gep = getelementptr double* %allocd, i32 %y
-  %gepi8 = bitcast double* %gep to i8*
-  %objsize = call i32 @llvm.objectsize.i32(i8* %gepi8, i1 false, i32 2)
-  ret i32 %objsize
-; CHECK-NEXT: shl i32
-; CHECK-NEXT: sub i32 
-; CHECK-NEXT: icmp ugt i32
-; CHECK-NEXT: select i1
-; CHECK-NEXT: ret
-}
-
-; CHECK: @test12
-define i32 @test12(i32 %x) nounwind {
-  %alloc =  alloca i32, i32 %x, align 16
-  %gep = getelementptr i32* %alloc, i32 7
-  %gepi8 = bitcast i32* %gep to i8*
-  %objsize = call i32 @llvm.objectsize.i32(i8* %gepi8, i1 false, i32 2)
-  ret i32 %objsize
-; CHECK-NEXT: shl i32
-; CHECK-NEXT: add i32 {{.*}}, -28
-; CHECK-NEXT: icmp ult i32 {{.*}}, 28
-; CHECK-NEXT: select i1
-; CHECK-NEXT: ret
-}
-
-; CHECK: @test13
-define i32 @test13(i32 %x, i32 %y) nounwind {
-  %alloc = call i8* @calloc(i32 %x, i32 %y)
-  %alloc2 = call i8* @malloc(i32 %x)
-  %objsize = call i32 @llvm.objectsize.i32(i8* %alloc, i1 false, i32 1)
-  %objsize2 = call i32 @llvm.objectsize.i32(i8* %alloc2, i1 false, i32 1)
-  %add = add i32 %objsize, %objsize2
-  ret i32 %add
-; CHECK: objectsize
-; CHECK: objectsize
-; CHECK: add
-}
-
-; CHECK: @overflow
-define i32 @overflow() {
-  %alloc = call noalias i8* @malloc(i32 21) nounwind
-  %gep = getelementptr inbounds i8* %alloc, i32 50
-  %objsize = call i32 @llvm.objectsize.i32(i8* %gep, i1 false, i32 0) nounwind readonly
-; CHECK-NEXT: ret i32 0
-  ret i32 %objsize
-}
diff --git a/test/Transforms/SimplifyLibCalls/StpCpy.ll b/test/Transforms/SimplifyLibCalls/StpCpy.ll
index 738db37..914b095 100644
--- a/test/Transforms/SimplifyLibCalls/StpCpy.ll
+++ b/test/Transforms/SimplifyLibCalls/StpCpy.ll
@@ -11,7 +11,7 @@ declare i8* @stpcpy(i8*, i8*)
 
 declare i8* @__stpcpy_chk(i8*, i8*, i32) nounwind
 
-declare i32 @llvm.objectsize.i32(i8*, i1, i32) nounwind readonly
+declare i32 @llvm.objectsize.i32(i8*, i1) nounwind readonly
 
 define i32 @t1() {
 ; CHECK: @t1
@@ -28,7 +28,7 @@ define i32 @t2() {
   %target = alloca [1024 x i8]
   %arg1 = getelementptr [1024 x i8]* %target, i32 0, i32 0
   %arg2 = getelementptr [6 x i8]* @hello, i32 0, i32 0
-  %tmp1 = call i32 @llvm.objectsize.i32(i8* %arg1, i1 false, i32 0)
+  %tmp1 = call i32 @llvm.objectsize.i32(i8* %arg1, i1 false)
   %rslt1 = call i8* @__stpcpy_chk(i8* %arg1, i8* %arg2, i32 %tmp1)
 ; CHECK: @__memcpy_chk
   ret i32 0
diff --git a/test/Transforms/SimplifyLibCalls/StrCpy.ll b/test/Transforms/SimplifyLibCalls/StrCpy.ll
index 90611ee..83406ff 100644
--- a/test/Transforms/SimplifyLibCalls/StrCpy.ll
+++ b/test/Transforms/SimplifyLibCalls/StrCpy.ll
@@ -11,7 +11,7 @@ declare i8* @strcpy(i8*, i8*)
 
 declare i8* @__strcpy_chk(i8*, i8*, i32) nounwind
 
-declare i32 @llvm.objectsize.i32(i8*, i1, i32) nounwind readonly
+declare i32 @llvm.objectsize.i32(i8*, i1) nounwind readonly
 
 ; rdar://6839935
 
@@ -30,7 +30,7 @@ define i32 @t2() {
   %target = alloca [1024 x i8]
   %arg1 = getelementptr [1024 x i8]* %target, i32 0, i32 0
   %arg2 = getelementptr [6 x i8]* @hello, i32 0, i32 0
-  %tmp1 = call i32 @llvm.objectsize.i32(i8* %arg1, i1 false, i32 0)
+  %tmp1 = call i32 @llvm.objectsize.i32(i8* %arg1, i1 false)
   %rslt1 = call i8* @__strcpy_chk(i8* %arg1, i8* %arg2, i32 %tmp1)
 ; CHECK: @__memcpy_chk
   ret i32 0