From: Reid Kleckner <reid@kleckner.net>
Date: Tue, 3 Mar 2015 01:04:39 +0000 (+0000)
Subject: Fix cppeh breakage due to racing commits
X-Git-Tag: android-x86-7.1-r4~50996
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a8182029a126d9b8dcb3171b23f1c5d63f5ca1fc;p=android-x86%2Fexternal-llvm.git

Fix cppeh breakage due to racing commits

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

diff --git a/test/CodeGen/X86/cppeh-inalloca.ll b/test/CodeGen/X86/cppeh-inalloca.ll
index b1a6aae8149..d7b7d561655 100644
--- a/test/CodeGen/X86/cppeh-inalloca.ll
+++ b/test/CodeGen/X86/cppeh-inalloca.ll
@@ -40,16 +40,16 @@ $"\01??_R0H@8" = comdat any
 ; CHECK: entry:
 ; CHECK:   %frame.alloc = call i8* @llvm.frameallocate(i32 24)
 ; CHECK:   %eh.data = bitcast i8* %frame.alloc to %"struct.\01?test@@YAHUA@@@Z.ehdata"*
-; CHECK:   %.tmp.reg2mem = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 3
+; CHECK:   %.tmp.reg2mem = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata", %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 3
 ; CHECK:   %.tmp = select i1 true, <{ %struct.A }>* %0, <{ %struct.A }>* undef
 ; CHECK:   store <{ %struct.A }>* %.tmp, <{ %struct.A }>** %.tmp.reg2mem
 ; CHECK-NOT:  %retval = alloca i32, align 4
-; CHECK:   %retval = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 4
+; CHECK:   %retval = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata", %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 4
 ; CHECK:   %exn.slot = alloca i8*
 ; CHECK:   %ehselector.slot = alloca i32
 ; CHECK-NOT:  %e = alloca i32, align 4
-; CHECK:   %e = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 2
-; CHECK:   %cleanup.dest.slot = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 5
+; CHECK:   %e = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata", %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 2
+; CHECK:   %cleanup.dest.slot = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata", %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 5
 ; CHECK:   invoke void @"\01?may_throw@@YAXXZ"()
 ; CHECK:           to label %invoke.cont unwind label %lpad
 
@@ -77,21 +77,21 @@ lpad:                                             ; preds = %entry
   br label %catch.dispatch
 
 catch.dispatch:                                   ; preds = %lpad
-  %sel = load i32* %ehselector.slot
+  %sel = load i32, i32* %ehselector.slot
   %4 = call i32 @llvm.eh.typeid.for(i8* bitcast (%rtti.TypeDescriptor2* @"\01??_R0H@8" to i8*)) #3
   %matches = icmp eq i32 %sel, %4
   br i1 %matches, label %catch, label %ehcleanup
 
 catch:                                            ; preds = %catch.dispatch
-  %exn = load i8** %exn.slot
+  %exn = load i8*, i8** %exn.slot
   %5 = call i8* @llvm.eh.begincatch(i8* %exn) #3
   %6 = bitcast i8* %5 to i32*
-  %7 = load i32* %6, align 4
+  %7 = load i32, i32* %6, align 4
   store i32 %7, i32* %e, align 4
-  %a = getelementptr inbounds <{ %struct.A }>* %0, i32 0, i32 0
-  %a1 = getelementptr inbounds %struct.A* %a, i32 0, i32 0
-  %8 = load i32* %a1, align 4
-  %9 = load i32* %e, align 4
+  %a = getelementptr inbounds <{ %struct.A }>, <{ %struct.A }>* %0, i32 0, i32 0
+  %a1 = getelementptr inbounds %struct.A, %struct.A* %a, i32 0, i32 0
+  %8 = load i32, i32* %a1, align 4
+  %9 = load i32, i32* %e, align 4
   %add = add nsw i32 %8, %9
   store i32 %add, i32* %retval
   store i32 1, i32* %cleanup.dest.slot
@@ -105,27 +105,27 @@ try.cont:                                         ; preds = %invoke.cont
 
 ; The cleanup block should be re-written like this.
 ; CHECK: cleanup:                                          ; preds = %try.cont, %catch
-; CHECK-NOT:  %a2 = getelementptr inbounds <{ %struct.A }>* %0, i32 0, i32 0
-; CHECK:   %.tmp.reload1 = load volatile <{ %struct.A }>** %.tmp.reg2mem
-; CHECK:   %a2 = getelementptr inbounds <{ %struct.A }>* %.tmp.reload1, i32 0, i32 0
+; CHECK-NOT:  %a2 = getelementptr inbounds <{ %struct.A }>, <{ %struct.A }>* %0, i32 0, i32 0
+; CHECK:   %.tmp.reload1 = load volatile <{ %struct.A }>*, <{ %struct.A }>** %.tmp.reg2mem
+; CHECK:   %a2 = getelementptr inbounds <{ %struct.A }>, <{ %struct.A }>* %.tmp.reload1, i32 0, i32 0
 ; CHECK:   call x86_thiscallcc void @"\01??1A@@QAE@XZ"(%struct.A* %a2) #2
-; CHECK:   %10 = load i32* %retval
+; CHECK:   %10 = load i32, i32* %retval
 ; CHECK:   ret i32 %10
 
 cleanup:                                          ; preds = %try.cont, %catch
-  %a2 = getelementptr inbounds <{ %struct.A }>* %0, i32 0, i32 0
+  %a2 = getelementptr inbounds <{ %struct.A }>, <{ %struct.A }>* %0, i32 0, i32 0
   call x86_thiscallcc void @"\01??1A@@QAE@XZ"(%struct.A* %a2) #3
-  %10 = load i32* %retval
+  %10 = load i32, i32* %retval
   ret i32 %10
 
 ehcleanup:                                        ; preds = %catch.dispatch
-  %a3 = getelementptr inbounds <{ %struct.A }>* %0, i32 0, i32 0
+  %a3 = getelementptr inbounds <{ %struct.A }>, <{ %struct.A }>* %0, i32 0, i32 0
   call x86_thiscallcc void @"\01??1A@@QAE@XZ"(%struct.A* %a3) #3
   br label %eh.resume
 
 eh.resume:                                        ; preds = %ehcleanup
-  %exn2 = load i8** %exn.slot
-  %sel3 = load i32* %ehselector.slot
+  %exn2 = load i8*, i8** %exn.slot
+  %sel3 = load i32, i32* %ehselector.slot
   %lpad.val = insertvalue { i8*, i32 } undef, i8* %exn2, 0
   %lpad.val4 = insertvalue { i8*, i32 } %lpad.val, i32 %sel3, 1
   resume { i8*, i32 } %lpad.val4
@@ -136,20 +136,20 @@ eh.resume:                                        ; preds = %ehcleanup
 ; CHECK: catch.entry:
 ; CHECK:   %eh.alloc = call i8* @llvm.framerecover(i8* bitcast (i32 (<{ %struct.A }>*)* @"\01?test@@YAHUA@@@Z" to i8*), i8* %1)
 ; CHECK:   %eh.data = bitcast i8* %eh.alloc to %"struct.\01?test@@YAHUA@@@Z.ehdata"*
-; CHECK:   %eh.obj.ptr = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 1
-; CHECK:   %eh.obj = load i8** %eh.obj.ptr
-; CHECK:   %e = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 2
-; CHECK:   %eh.temp.alloca = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 3
-; CHECK:   %.reload = load <{ %struct.A }>** %eh.temp.alloca
-; CHECK:   %retval = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 4
-; CHECK:   %cleanup.dest.slot = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 5
+; CHECK:   %eh.obj.ptr = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata", %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 1
+; CHECK:   %eh.obj = load i8*, i8** %eh.obj.ptr
+; CHECK:   %e = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata", %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 2
+; CHECK:   %eh.temp.alloca = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata", %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 3
+; CHECK:   %.reload = load <{ %struct.A }>*, <{ %struct.A }>** %eh.temp.alloca
+; CHECK:   %retval = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata", %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 4
+; CHECK:   %cleanup.dest.slot = getelementptr inbounds %"struct.\01?test@@YAHUA@@@Z.ehdata", %"struct.\01?test@@YAHUA@@@Z.ehdata"* %eh.data, i32 0, i32 5
 ; CHECK:   %2 = bitcast i8* %eh.obj to i32*
-; CHECK:   %3 = load i32* %2, align 4
+; CHECK:   %3 = load i32, i32* %2, align 4
 ; CHECK:   store i32 %3, i32* %e, align 4
-; CHECK:   %a = getelementptr inbounds <{ %struct.A }>* %.reload, i32 0, i32 0
-; CHECK:   %a1 = getelementptr inbounds %struct.A* %a, i32 0, i32 0
-; CHECK:   %4 = load i32* %a1, align 4
-; CHECK:   %5 = load i32* %e, align 4
+; CHECK:   %a = getelementptr inbounds <{ %struct.A }>, <{ %struct.A }>* %.reload, i32 0, i32 0
+; CHECK:   %a1 = getelementptr inbounds %struct.A, %struct.A* %a, i32 0, i32 0
+; CHECK:   %4 = load i32, i32* %a1, align 4
+; CHECK:   %5 = load i32, i32* %e, align 4
 ; CHECK:   %add = add nsw i32 %4, %5
 ; CHECK:   store i32 %add, i32* %retval
 ; CHECK:   store i32 1, i32* %cleanup.dest.slot
diff --git a/test/CodeGen/X86/cppeh-nonalloca-frame-values.ll b/test/CodeGen/X86/cppeh-nonalloca-frame-values.ll
index 120df6cca8a..ebc540d66fe 100644
--- a/test/CodeGen/X86/cppeh-nonalloca-frame-values.ll
+++ b/test/CodeGen/X86/cppeh-nonalloca-frame-values.ll
@@ -59,19 +59,19 @@ $"\01??_R0H@8" = comdat any
 ; CHECK:  %frame.alloc = call i8* @llvm.frameallocate(i32 80)
 ; CHECK:  %eh.data = bitcast i8* %frame.alloc to %"struct.\01?test@@YAXXZ.ehdata"*
 ; CHECK-NOT:  %ExceptionVal = alloca [10 x i32], align 16
-; CHECK:  %NumExceptions.020.reg2mem = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 2
-; CHECK:  %i.019.reg2mem = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 4
-; CHECK:  %ExceptionVal = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 3
+; CHECK:  %NumExceptions.020.reg2mem = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata", %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 2
+; CHECK:  %i.019.reg2mem = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata", %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 4
+; CHECK:  %ExceptionVal = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata", %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 3
 ; CHECK:  %Data = alloca i64, align 8
 ; CHECK:  %tmpcast = bitcast i64* %Data to %struct.SomeData*
 ; CHECK:  %0 = bitcast [10 x i32]* %ExceptionVal to i8*
 ; CHECK:  call void @llvm.lifetime.start(i64 40, i8* %0) #1
 ; CHECK:  store i64 0, i64* %Data, align 8
-; CHECK:  %a.reg2mem = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 5
+; CHECK:  %a.reg2mem = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata", %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 5
 ; CHECK:  %a = bitcast i64* %Data to i32*
 ; CHECK:  store i32* %a, i32** %a.reg2mem
-; CHECK:  %b.reg2mem = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 6
-; CHECK:  %b = getelementptr inbounds %struct.SomeData* %tmpcast, i64 0, i32 1
+; CHECK:  %b.reg2mem = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata", %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 6
+; CHECK:  %b = getelementptr inbounds %struct.SomeData, %struct.SomeData* %tmpcast, i64 0, i32 1
 ; CHECK:  store i32* %b, i32** %b.reg2mem
 ; CHECK:  store i32 0, i32* %NumExceptions.020.reg2mem
 ; CHECK:  store i32 0, i32* %i.019.reg2mem
@@ -87,14 +87,14 @@ entry:
   call void @llvm.lifetime.start(i64 40, i8* %0) #1
   store i64 0, i64* %Data, align 8
   %a = bitcast i64* %Data to i32*
-  %b = getelementptr inbounds %struct.SomeData* %tmpcast, i64 0, i32 1
+  %b = getelementptr inbounds %struct.SomeData, %struct.SomeData* %tmpcast, i64 0, i32 1
   br label %for.body
 
 ; CHECK: for.body:
 ; CHECK-NOT:  %NumExceptions.020 = phi i32 [ 0, %entry ], [ %NumExceptions.1, %try.cont ]
 ; CHECK-NOT:  %i.019 = phi i32 [ 0, %entry ], [ %inc5, %try.cont ]
-; CHECK:  %i.019.reload = load i32* %i.019.reg2mem
-; CHECK:  %NumExceptions.020.reload = load i32* %NumExceptions.020.reg2mem
+; CHECK:  %i.019.reload = load i32, i32* %i.019.reg2mem
+; CHECK:  %NumExceptions.020.reload = load i32, i32* %NumExceptions.020.reg2mem
 for.body:                                         ; preds = %entry, %try.cont
   %NumExceptions.020 = phi i32 [ 0, %entry ], [ %NumExceptions.1, %try.cont ]
   %i.019 = phi i32 [ 0, %entry ], [ %inc5, %try.cont ]
@@ -102,17 +102,17 @@ for.body:                                         ; preds = %entry, %try.cont
           to label %invoke.cont unwind label %lpad
 
 ; CHECK: invoke.cont:                                      ; preds = %for.body
-; CHECK-NOT:  %1 = load i32* %a, align 8, !tbaa !2
+; CHECK-NOT:  %1 = load i32, i32* %a, align 8, !tbaa !2
 ; CHECK-NOT:  %add = add nsw i32 %1, %i.019
 ; CHECK-NOT:  store i32 %add, i32* %a, align 8, !tbaa !2
-; CHECK:   %a.reload3 = load volatile i32** %a.reg2mem
-; CHECK:   %1 = load i32* %a.reload3, align 8, !tbaa !2
+; CHECK:   %a.reload3 = load volatile i32*, i32** %a.reg2mem
+; CHECK:   %1 = load i32, i32* %a.reload3, align 8, !tbaa !2
 ; CHECK:   %add = add nsw i32 %1, %i.019.reload
-; CHECK:   %a.reload2 = load volatile i32** %a.reg2mem
+; CHECK:   %a.reload2 = load volatile i32*, i32** %a.reg2mem
 ; CHECK:   store i32 %add, i32* %a.reload2, align 8, !tbaa !2
 ; CHECK:   br label %try.cont
 invoke.cont:                                      ; preds = %for.body
-  %1 = load i32* %a, align 8, !tbaa !2
+  %1 = load i32, i32* %a, align 8, !tbaa !2
   %add = add nsw i32 %1, %i.019
   store i32 %add, i32* %a, align 8, !tbaa !2
   br label %try.cont
@@ -129,22 +129,22 @@ catch:                                            ; preds = %lpad
   %5 = extractvalue { i8*, i32 } %2, 0
   %6 = tail call i8* @llvm.eh.begincatch(i8* %5) #1
   %7 = bitcast i8* %6 to i32*
-  %8 = load i32* %7, align 4, !tbaa !7
+  %8 = load i32, i32* %7, align 4, !tbaa !7
   %idxprom = sext i32 %NumExceptions.020 to i64
-  %arrayidx = getelementptr inbounds [10 x i32]* %ExceptionVal, i64 0, i64 %idxprom
+  %arrayidx = getelementptr inbounds [10 x i32], [10 x i32]* %ExceptionVal, i64 0, i64 %idxprom
   store i32 %8, i32* %arrayidx, align 4, !tbaa !7
   %inc = add nsw i32 %NumExceptions.020, 1
   %cmp1 = icmp eq i32 %8, %i.019
   br i1 %cmp1, label %if.then, label %if.else
 
 if.then:                                          ; preds = %catch
-  %9 = load i32* %b, align 4, !tbaa !8
+  %9 = load i32, i32* %b, align 4, !tbaa !8
   %add2 = add nsw i32 %9, %i.019
   store i32 %add2, i32* %b, align 4, !tbaa !8
   br label %if.end
 
 if.else:                                          ; preds = %catch
-  %10 = load i32* %a, align 8, !tbaa !2
+  %10 = load i32, i32* %a, align 8, !tbaa !2
   %add4 = add nsw i32 %10, %8
   store i32 %add4, i32* %a, align 8, !tbaa !2
   br label %if.end
@@ -173,7 +173,7 @@ try.cont:                                         ; preds = %if.end, %invoke.con
 
 for.end:                                          ; preds = %try.cont
   %NumExceptions.1.lcssa = phi i32 [ %NumExceptions.1, %try.cont ]
-  %arraydecay = getelementptr inbounds [10 x i32]* %ExceptionVal, i64 0, i64 0
+  %arraydecay = getelementptr inbounds [10 x i32], [10 x i32]* %ExceptionVal, i64 0, i64 0
   call void @"\01?dump@@YAXPEAHHAEAUSomeData@@@Z"(i32* %arraydecay, i32 %NumExceptions.1.lcssa, %struct.SomeData* dereferenceable(8) %tmpcast)
   call void @llvm.lifetime.end(i64 40, i8* %0) #1
   ret void
@@ -188,34 +188,34 @@ eh.resume:                                        ; preds = %lpad
 ; CHECK: catch.entry:
 ; CHECK:   %eh.alloc = call i8* @llvm.framerecover(i8* bitcast (void ()* @"\01?test@@YAXXZ" to i8*), i8* %1)
 ; CHECK:   %eh.data = bitcast i8* %eh.alloc to %"struct.\01?test@@YAXXZ.ehdata"*
-; CHECK:   %eh.obj.ptr = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 1
-; CHECK:   %eh.obj = load i8** %eh.obj.ptr
-; CHECK:   %eh.temp.alloca = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 2
-; CHECK:   %NumExceptions.020.reload = load i32* %eh.temp.alloca
-; CHECK:   %ExceptionVal = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 3
-; CHECK:   %eh.temp.alloca1 = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 4
-; CHECK:   %i.019.reload = load i32* %eh.temp.alloca1
-; CHECK:   %eh.temp.alloca2 = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 5
-; CHECK:   %a.reload = load i32** %eh.temp.alloca2
-; CHECK:   %eh.temp.alloca3 = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 6
-; CHECK:   %b.reload = load i32** %eh.temp.alloca3
+; CHECK:   %eh.obj.ptr = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata", %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 1
+; CHECK:   %eh.obj = load i8*, i8** %eh.obj.ptr
+; CHECK:   %eh.temp.alloca = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata", %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 2
+; CHECK:   %NumExceptions.020.reload = load i32, i32* %eh.temp.alloca
+; CHECK:   %ExceptionVal = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata", %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 3
+; CHECK:   %eh.temp.alloca1 = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata", %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 4
+; CHECK:   %i.019.reload = load i32, i32* %eh.temp.alloca1
+; CHECK:   %eh.temp.alloca2 = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata", %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 5
+; CHECK:   %a.reload = load i32*, i32** %eh.temp.alloca2
+; CHECK:   %eh.temp.alloca3 = getelementptr inbounds %"struct.\01?test@@YAXXZ.ehdata", %"struct.\01?test@@YAXXZ.ehdata"* %eh.data, i32 0, i32 6
+; CHECK:   %b.reload = load i32*, i32** %eh.temp.alloca3
 ; CHECK:   %2 = bitcast i8* %eh.obj to i32*
-; CHECK:   %3 = load i32* %2, align 4, !tbaa !7
+; CHECK:   %3 = load i32, i32* %2, align 4, !tbaa !7
 ; CHECK:   %idxprom = sext i32 %NumExceptions.020.reload to i64
-; CHECK:   %arrayidx = getelementptr inbounds [10 x i32]* %ExceptionVal, i64 0, i64 %idxprom
+; CHECK:   %arrayidx = getelementptr inbounds [10 x i32], [10 x i32]* %ExceptionVal, i64 0, i64 %idxprom
 ; CHECK:   store i32 %3, i32* %arrayidx, align 4, !tbaa !7
 ; CHECK:   %inc = add nsw i32 %NumExceptions.020.reload, 1
 ; CHECK:   %cmp1 = icmp eq i32 %3, %i.019.reload
 ; CHECK:   br i1 %cmp1, label %if.then, label %if.else
 ;
 ; CHECK: if.then:                                          ; preds = %catch.entry
-; CHECK:   %4 = load i32* %b.reload, align 4, !tbaa !8
+; CHECK:   %4 = load i32, i32* %b.reload, align 4, !tbaa !8
 ; CHECK:   %add2 = add nsw i32 %4, %i.019.reload
 ; CHECK:   store i32 %add2, i32* %b.reload, align 4, !tbaa !8
 ; CHECK:   br label %if.end
 ;
 ; CHECK: if.else:                                          ; preds = %catch.entry
-; CHECK:   %5 = load i32* %a.reload, align 8, !tbaa !2
+; CHECK:   %5 = load i32, i32* %a.reload, align 8, !tbaa !2
 ; CHECK:   %add4 = add nsw i32 %5, %3
 ; CHECK:   store i32 %add4, i32* %a.reload, align 8, !tbaa !2
 ; CHECK:   br label %if.end