Changes from 3.7 merge to files not in upstream

test/Transforms/NaCl/pnacl-sjlj-eh.ll

Index: test/Transforms/NaCl/pnacl-sjlj-eh.ll
diff --git a/test/Transforms/NaCl/pnacl-sjlj-eh.ll b/test/Transforms/NaCl/pnacl-sjlj-eh.ll
index 3dc197e682d8cb57a59224678e28b04c957defb1..6e524a5b775ab16dac945697fe04cf2fb7008e73 100644
--- a/test/Transforms/NaCl/pnacl-sjlj-eh.ll
+++ b/test/Transforms/NaCl/pnacl-sjlj-eh.ll
@@ -25,16 +25,16 @@ lpad:
 ; CHECK: define i32 @invoke_test
 ; CHECK-NEXT: %invoke_result_ptr = alloca i32
 ; CHECK-NEXT: %invoke_frame = alloca %ExceptionFrame, align 8
-; CHECK-NEXT: %exc_info_ptr = getelementptr %ExceptionFrame* %invoke_frame, i32 0, i32 2
-; CHECK-NEXT: %invoke_next = getelementptr %ExceptionFrame* %invoke_frame, i32 0, i32 1
-; CHECK-NEXT: %invoke_jmp_buf = getelementptr %ExceptionFrame* %invoke_frame, i32 0, i32 0, i32 0
+; CHECK-NEXT: %exc_info_ptr = getelementptr %ExceptionFrame, %ExceptionFrame* %invoke_frame, i32 0, i32 2
+; CHECK-NEXT: %invoke_next = getelementptr %ExceptionFrame, %ExceptionFrame* %invoke_frame, i32 0, i32 1
+; CHECK-NEXT: %invoke_jmp_buf = getelementptr %ExceptionFrame, %ExceptionFrame* %invoke_frame, i32 0, i32 0, i32 0
 ; CHECK-NEXT: %pnacl_eh_stack = bitcast i8** @__pnacl_eh_stack to %ExceptionFrame**
-; CHECK-NEXT: %old_eh_stack = load %ExceptionFrame** %pnacl_eh_stack
+; CHECK-NEXT: %old_eh_stack = load %ExceptionFrame*, %ExceptionFrame** %pnacl_eh_stack
 ; CHECK-NEXT: store %ExceptionFrame* %old_eh_stack, %ExceptionFrame** %invoke_next
 ; CHECK-NEXT: store i32 {{[0-9]+}}, i32* %exc_info_ptr
 ; CHECK-NEXT: store %ExceptionFrame* %invoke_frame, %ExceptionFrame** %pnacl_eh_stack
 ; CHECK-NEXT: %invoke_is_exc = call i32 @invoke_test_setjmp_caller(i64 %arg, i32 (i64)* @external_func, i8* %invoke_jmp_buf, i32* %invoke_result_ptr)
-; CHECK-NEXT: %result = load i32* %invoke_result_ptr
+; CHECK-NEXT: %result = load i32, i32* %invoke_result_ptr
 ; CHECK-NEXT: store %ExceptionFrame* %old_eh_stack, %ExceptionFrame** %pnacl_eh_stack
 ; CHECK-NEXT: %invoke_sj_is_zero = icmp eq i32 %invoke_is_exc, 0
 ; CHECK-NEXT: br i1 %invoke_sj_is_zero, label %cont, label %lpad
@@ -42,7 +42,7 @@ lpad:
 ; CHECK-NEXT: ret i32 %result
 ; CHECK: lpad:
 ; CHECK-NEXT: %landingpad_ptr = bitcast i8* %invoke_jmp_buf to { i8*, i32 }*
-; CHECK-NEXT: %lp = load { i8*, i32 }* %landingpad_ptr
+; CHECK-NEXT: %lp = load { i8*, i32 }, { i8*, i32 }* %landingpad_ptr
 ; CHECK-NEXT: ret i32 999
 
 ; Check definition of helper function:
@@ -85,7 +85,7 @@ dead_block:
   ret i32 %lp
 }
 ; CHECK: define i32 @landingpad_before_invoke
-; CHECK: %lp = load i32* %landingpad_ptr
+; CHECK: %lp = load i32, i32* %landingpad_ptr
 
 
 ; Test the expansion of the "resume" instruction.