Changes from 3.7 merge to files not in upstream

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

 ; RUN: opt %s -pnacl-sjlj-eh -S | FileCheck %s
 
 ; This must be declared for expanding "invoke" and "landingpad" instructions.
 @__pnacl_eh_stack = external thread_local global i8*
 
 ; This must be declared for expanding "resume" instructions.
 declare void @__pnacl_eh_resume(i32* %exception)
 
 declare i32 @external_func(i64 %arg)
 declare void @external_func_void()
 declare i32 @my_setjmp()
 
 
 ; CHECK: %ExceptionFrame = type { [1024 x i8], %ExceptionFrame*, i32 }
 
 define i32 @invoke_test(i64 %arg) {
   %result = invoke i32 @external_func(i64 %arg)
       to label %cont unwind label %lpad
 cont:
   ret i32 %result
 lpad:
   %lp = landingpad { i8*, i32 } personality i8* null cleanup
   ret i32 999
 }
 ; 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
 ; CHECK: cont:
 ; 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:
 ; CHECK: define internal i32 @invoke_test_setjmp_caller(i64 %arg, i32 (i64)* %func_ptr, i8* %jmp_buf, i32* %result_ptr) {
 ; CHECK-NEXT: %invoke_sj = call i32 @llvm.nacl.setjmp(i8* %jmp_buf) [[RETURNS_TWICE:#[0-9]+]]
 ; CHECK-NEXT: %invoke_sj_is_zero = icmp eq i32 %invoke_sj, 0
 ; CHECK-NEXT: br i1 %invoke_sj_is_zero, label %normal, label %exception
 ; CHECK: normal:
 ; CHECK-NEXT: %result = call i32 %func_ptr(i64 %arg)
 ; CHECK-NEXT: store i32 %result, i32* %result_ptr
@@ skipping 22 matching lines @@
 
 ; Check that the pass can handle a landingpad appearing before an invoke.
 define i32 @landingpad_before_invoke() {
   ret i32 123
 
 dead_block:
   %lp = landingpad i32 personality i8* null cleanup
   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.
 define void @test_resume({ i8*, i32 } %arg) {
   resume { i8*, i32 } %arg
 }
 ; CHECK: define void @test_resume
 ; CHECK-NEXT: %resume_exc = extractvalue { i8*, i32 } %arg, 0
 ; CHECK-NEXT: %resume_cast = bitcast i8* %resume_exc to i32*
 ; CHECK-NEXT: call void @__pnacl_eh_resume(i32* %resume_cast)
@@ skipping 65 matching lines @@
   ret void
 }
 ; CHECK: define void @invoke_setjmp()
 ; CHECK-NOT: call
 ; CHECK: %x = call i32 @my_setjmp() [[RETURNS_TWICE]]
 ; CHECK-NEXT: br label %cont
 
 
 ; CHECK: attributes [[RETURNS_TWICE]] = { returns_twice }
 ; CHECK: attributes [[NORETURN]] = { noreturn }