Changes from 3.7 merge to files not in upstream

test/NaCl/PNaClABI/abi-stripped-pointers.ll

 ; RUN: not pnacl-abicheck < %s | FileCheck %s
 
 ; This test checks that the PNaCl ABI verifier enforces the normal
 ; form introduced by the ReplacePtrsWithInts pass.
 
 
 @var = global [4 x i8] c"xxxx"
 @ptr = global i32 ptrtoint ([4 x i8]* @var to i32)
 
 declare i8* @llvm.nacl.read.tp()
@@ skipping 18 matching lines @@
 }
 
 
 define internal void @allowed_cases(i32 %arg) {
   inttoptr i32 123 to i8*
 
   ptrtoint [4 x i8]* @var to i32
 
   %alloc = alloca i8
   ptrtoint i8* %alloc to i32
-  load i8* %alloc, align 1
+  load i8, i8* %alloc, align 1
 
   ; These instructions may use a NormalizedPtr, which may be a global.
-  load i32* @ptr, align 1
+  load i32, i32* @ptr, align 1
   store i32 123, i32* @ptr, align 1
 
   ; A NormalizedPtr may be a bitcast.
   %ptr_bitcast = bitcast [4 x i8]* @var to i32*
-  load i32* %ptr_bitcast, align 1
+  load i32, i32* %ptr_bitcast, align 1
 
   ; A NormalizedPtr may be an inttoptr.
   %ptr_from_int = inttoptr i32 123 to i32*
-  load i32* %ptr_from_int, align 1
+  load i32, i32* %ptr_from_int, align 1
 
   ; Check direct and indirect function calls.
   %func_as_int = ptrtoint void ()* @func to i32
   %func_ptr = inttoptr i32 %func_as_int to void ()*
   call void %func_ptr()
   call void @func()
   call void @func_with_arg(i32 123)
 
   ; Intrinsic calls may return pointers.
   %thread_ptr = call i8* @llvm.nacl.read.tp()
@@ skipping 67 matching lines @@
   ret void
 }
 
 ; CHECK-NOT: disallowed
 
 
 ; This stops the verifier from complaining about the lack of an entry point.
 define void @_start(i32 %arg) {
   ret void
 }