Update clang to r93512.

1 files changed, 21 insertions, 25 deletions

diff --git a/test/CodeGenCXX/eh.cpp b/test/CodeGenCXX/eh.cpp
index dd798f4..d233525 100644
--- a/test/CodeGenCXX/eh.cpp
+++ b/test/CodeGenCXX/eh.cpp
@@ -10,14 +10,13 @@ void test1() {
 }
 
 // CHECK:     define void @_Z5test1v() nounwind {
-// CHECK-NEXT:entry:
-// CHECK-NEXT:  %exception.ptr = alloca i8*
-// CHECK-NEXT:  %exception = call i8* @__cxa_allocate_exception(i64 8)
-// CHECK-NEXT:  store i8* %exception, i8** %exception.ptr
-// CHECK-NEXT:  %0 = bitcast i8* %exception to %struct.test1_D*
-// CHECK-NEXT:  %tmp = bitcast %struct.test1_D* %0 to i8*
-// CHECK-NEXT:  call void @llvm.memcpy.i64(i8* %tmp, i8* bitcast (%struct.test1_D* @d1 to i8*), i64 8, i32 8)
-// CHECK-NEXT:  call void @__cxa_throw(i8* %exception, i8* bitcast (%0* @_ZTI7test1_D to i8*), i8* null) noreturn
+// CHECK:       %{{exception.ptr|1}} = alloca i8*
+// CHECK-NEXT:  %{{exception|2}} = call i8* @__cxa_allocate_exception(i64 8)
+// CHECK-NEXT:  store i8* %{{exception|2}}, i8** %{{exception.ptr|1}}
+// CHECK-NEXT:  %{{0|3}} = bitcast i8* %{{exception|2}} to %struct.test1_D*
+// CHECK-NEXT:  %{{tmp|4}} = bitcast %struct.test1_D* %{{0|3}} to i8*
+// CHECK-NEXT:  call void @llvm.memcpy.i64(i8* %{{tmp|4}}, i8* bitcast (%struct.test1_D* @d1 to i8*), i64 8, i32 8)
+// CHECK-NEXT:  call void @__cxa_throw(i8* %{{exception|2}}, i8* bitcast (%0* @_ZTI7test1_D to i8*), i8* null) noreturn
 // CHECK-NEXT:  unreachable
 
 
@@ -33,14 +32,13 @@ void test2() {
 }
 
 // CHECK:     define void @_Z5test2v() nounwind {
-// CHECK-NEXT:entry:
-// CHECK-NEXT:  %exception.ptr = alloca i8*
-// CHECK-NEXT:  %exception = call i8* @__cxa_allocate_exception(i64 16)
-// CHECK-NEXT:  store i8* %exception, i8** %exception.ptr
-// CHECK-NEXT:  %0 = bitcast i8* %exception to %struct.test2_D*
-// CHECK:       invoke void @_ZN7test2_DC1ERKS_(%struct.test2_D* %0, %struct.test2_D* @d2)
-// CHECK-NEXT:     to label %invoke.cont unwind label %terminate.handler
-// CHECK:  call void @__cxa_throw(i8* %exception, i8* bitcast (%0* @_ZTI7test2_D to i8*), i8* null) noreturn
+// CHECK:       %{{exception.ptr|1}} = alloca i8*
+// CHECK-NEXT:  %{{exception|2}} = call i8* @__cxa_allocate_exception(i64 16)
+// CHECK-NEXT:  store i8* %{{exception|2}}, i8** %{{\1}}
+// CHECK-NEXT:  %{{0|3}} = bitcast i8* %{{exception|2}} to %struct.test2_D*
+// CHECK:       invoke void @_ZN7test2_DC1ERKS_(%struct.test2_D* %{{0|3}}, %struct.test2_D* @d2)
+// CHECK-NEXT:     to label %{{invoke.cont|8}} unwind label %{{terminate.handler|4}}
+// CHECK:  call void @__cxa_throw(i8* %{{exception|2}}, i8* bitcast (%{{0|3}}* @_ZTI7test2_D to i8*), i8* null) noreturn
 // CHECK-NEXT:  unreachable
 
 
@@ -55,13 +53,12 @@ void test3() {
 }
 
 // CHECK:     define void @_Z5test3v() nounwind {
-// CHECK-NEXT: entry:
-// CHECK-NEXT:   %exception.ptr = alloca i8*
-// CHECK-NEXT:   %exception = call i8* @__cxa_allocate_exception(i64 8)
-// CHECK-NEXT:   store i8* %exception, i8** %exception.ptr
-// CHECK-NEXT:   %0 = bitcast i8* %exception to %struct.test3_D**
-// CHECK-NEXT:   store %struct.test3_D* null, %struct.test3_D** %0
-// CHECK-NEXT:   call void @__cxa_throw(i8* %exception, i8* bitcast (%1* @_ZTIPV7test3_D to i8*), i8* null) noreturn
+// CHECK:        %{{exception.ptr|1}} = alloca i8*
+// CHECK-NEXT:   %{{exception|2}} = call i8* @__cxa_allocate_exception(i64 8)
+// CHECK-NEXT:   store i8* %{{exception|2}}, i8** %{{exception.ptr|1}}
+// CHECK-NEXT:   %{{0|3}} = bitcast i8* %{{exception|2}} to %struct.test3_D**
+// CHECK-NEXT:   store %struct.test3_D* null, %struct.test3_D**
+// CHECK-NEXT:   call void @__cxa_throw(i8* %{{exception|2}}, i8* bitcast (%1* @_ZTIPV7test3_D to i8*), i8* null) noreturn
 // CHECK-NEXT:   unreachable
 
 
@@ -70,6 +67,5 @@ void test4() {
 }
 
 // CHECK:     define void @_Z5test4v() nounwind {
-// CHECK-NEXT: entry:
-// CHECK-NEXT:   call void @__cxa_rethrow() noreturn
+// CHECK:        call void @__cxa_rethrow() noreturn
 // CHECK-NEXT:   unreachable