Changes from 3.7 merge to files not in upstream

test/Transforms/NaCl/expand-varargs-struct.ll

Index: test/Transforms/NaCl/expand-varargs-struct.ll
diff --git a/test/Transforms/NaCl/expand-varargs-struct.ll b/test/Transforms/NaCl/expand-varargs-struct.ll
index a21ff282e10f8303e732d1ca790e4ca9678f4aed..755c9e81021f7beb7afb93877c7e8c5e9b5f924e 100644
--- a/test/Transforms/NaCl/expand-varargs-struct.ll
+++ b/test/Transforms/NaCl/expand-varargs-struct.ll
@@ -7,11 +7,11 @@ declare i32 @varargs_func(i32 %arg, ...)
 
 ; Test passing a struct by value.
 define i32 @varargs_call_struct(%MyStruct* %ptr) {
-  %result = call i32 (i32, ...)* @varargs_func(i32 111, i64 222, %MyStruct* byval %ptr)
+  %result = call i32 (i32, ...) @varargs_func(i32 111, i64 222, %MyStruct* byval %ptr)
   ret i32 %result
 }
 ; CHECK-LABEL: @varargs_call_struct(
-; CHECK: %vararg_ptr1 = getelementptr inbounds { i64, %MyStruct }* %vararg_buffer, i32 0, i32 1
+; CHECK: %vararg_ptr1 = getelementptr inbounds { i64, %MyStruct }, { i64, %MyStruct }* %vararg_buffer, i32 0, i32 1
 ; CHECK: %1 = bitcast %MyStruct* %vararg_ptr1 to i8*
 ; CHECK: %2 = bitcast %MyStruct* %ptr to i8*
 ; CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* %1, i8* %2, i64 16, i32 1, i1 false)