Correct -ftrapv to trap on errors, instead of calling the

__overflow_handler entrypoint that David Chisnall made up.
Calling __overflow_handler is not part of the contract of
-ftrapv provided by GCC, and should never have been checked
in in the first place.

According to:
http://permalink.gmane.org/gmane.comp.compilers.clang.devel/8699

David is using this for some of arbitrary precision integer stuff
or something, which is not an appropriate thing to implement on
this.



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

1 files changed, 3 insertions, 24 deletions

diff --git a/test/CodeGen/trapv.c b/test/CodeGen/trapv.c
index 46b1c8b14f..7f192c634c 100644
--- a/test/CodeGen/trapv.c
+++ b/test/CodeGen/trapv.c
@@ -20,14 +20,7 @@ void test0() {
   // CHECK-NEXT: [[T4:%.*]] = extractvalue [[I32O]] [[T3]], 0
   // CHECK-NEXT: [[T5:%.*]] = extractvalue [[I32O]] [[T3]], 1
   // CHECK-NEXT: br i1 [[T5]]
-  // CHECK:      [[F:%.*]] = load i64 (i64, i64, i8, i8)** @__overflow_handler
-  // CHECK-NEXT: [[T6:%.*]] = sext i32 [[T1]] to i64
-  // CHECK-NEXT: [[T7:%.*]] = sext i32 [[T2]] to i64
-  // CHECK-NEXT: [[T8:%.*]] = call i64 [[F]](i64 [[T6]], i64 [[T7]], i8 3, i8 32)
-  // CHECK-NEXT: [[T9:%.*]] = trunc i64 [[T8]] to i32
-  // CHECK-NEXT: br label
-  // CHECK:      [[T10:%.*]] = phi i32 [ [[T4]], {{.*}} ], [ [[T9]], {{.*}} ]
-  // CHECK-NEXT: store i32 [[T10]], i32* @i
+  // CHECK:      call void @llvm.trap()
   i = j + k;
 }
 
@@ -41,14 +34,7 @@ void test1() {
   // CHECK-NEXT: [[T3:%.*]] = extractvalue [[I32O]] [[T2]], 0
   // CHECK-NEXT: [[T4:%.*]] = extractvalue [[I32O]] [[T2]], 1
   // CHECK-NEXT: br i1 [[T4]]
-  // CHECK:      [[F:%.*]] = load i64 (i64, i64, i8, i8)** @__overflow_handler
-  // CHECK-NEXT: [[T5:%.*]] = sext i32 [[T1]] to i64
-  // CHECK-NEXT: [[T6:%.*]] = call i64 [[F]](i64 [[T5]], i64 1, i8 3, i8 32)
-  // CHECK-NEXT: [[T7:%.*]] = trunc i64 [[T6]] to i32
-  // CHECK-NEXT: br label
-  // CHECK:      [[T8:%.*]] = phi i32 [ [[T3]], {{.*}} ], [ [[T7]], {{.*}} ]
-  // CHECK-NEXT: store i32 [[T8]], i32* @i
-  // CHECK-NEXT: call void @opaque(i32 [[T1]])
+  // CHECK:      call void @llvm.trap()
 }
 
 // CHECK: define void @test2()
@@ -61,12 +47,5 @@ void test2() {
   // CHECK-NEXT: [[T3:%.*]] = extractvalue [[I32O]] [[T2]], 0
   // CHECK-NEXT: [[T4:%.*]] = extractvalue [[I32O]] [[T2]], 1
   // CHECK-NEXT: br i1 [[T4]]
-  // CHECK:      [[F:%.*]] = load i64 (i64, i64, i8, i8)** @__overflow_handler
-  // CHECK-NEXT: [[T5:%.*]] = sext i32 [[T1]] to i64
-  // CHECK-NEXT: [[T6:%.*]] = call i64 [[F]](i64 [[T5]], i64 1, i8 3, i8 32)
-  // CHECK-NEXT: [[T7:%.*]] = trunc i64 [[T6]] to i32
-  // CHECK-NEXT: br label
-  // CHECK:      [[T8:%.*]] = phi i32 [ [[T3]], {{.*}} ], [ [[T7]], {{.*}} ]
-  // CHECK-NEXT: store i32 [[T8]], i32* @i
-  // CHECK-NEXT: call void @opaque(i32 [[T8]])
+  // CHECK:      call void @llvm.trap()
 }