Changes from 3.7 merge to files not in upstream

test/NaCl/PNaClABI/abi-i1-operations.ll

 ; RUN: not pnacl-abicheck < %s | FileCheck %s
 
 ; Most arithmetic operations are not very useful on i1, so use of i1
 ; is restricted to a subset of operations.
 
 
 ; i1 is allowed on these bitwise operations because:
 ;  * These operations never overflow.
 ;  * They do get generated in practice for combining conditions.
 define internal void @allowed_cases() {
@@ skipping 17 matching lines @@
 ; CHECK-NOT: disallowed
 
 
 define internal void @rejected_cases(i32 %ptr) {
   ; Loads and stores of i1 are disallowed.  This is done by rejecting
   ; i1* as a pointer type.
   %ptr.p = inttoptr i32 %ptr to i1*
 ; CHECK: disallowed: bad result type: i1* %ptr.p = inttoptr
   %vptr.p = inttoptr i32 %ptr to <4 x i1>*
 ; CHECK: disallowed: bad result type: <4 x i1>* %vptr.p = inttoptr
-  load i1* %ptr.p, align 1
-; CHECK-NEXT: disallowed: bad pointer: {{.*}} load i1*
-  load <4 x i1>* %vptr.p, align 4
-; CHECK-NEXT: disallowed: bad pointer: {{.*}} load <4 x i1>*
+  load i1, i1* %ptr.p, align 1
+; CHECK-NEXT: disallowed: bad pointer: {{.*}} load i1, i1*
+  load <4 x i1>, <4 x i1>* %vptr.p, align 4
+; CHECK-NEXT: disallowed: bad pointer: {{.*}} load <4 x i1>, <4 x i1>*
 
   ; Check that we don't allow weird sizes.
   add i31 0, 0
 ; CHECK-NEXT:  disallowed: Invalid integer arithmetic type: {{.*}} add i31
 
   ; i1 arithmetic is of dubious usefulness, so it is rejected.
   add i1 0, 0
 ; CHECK-NEXT: disallowed: Invalid integer arithmetic type: {{.*}} add i1
   sub i1 0, 0
 ; CHECK-NEXT: disallowed: Invalid integer arithmetic type: {{.*}} sub i1
@@ skipping 103 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
 }