Changes from 3.7 merge to files not in upstream

test/NaCl/ARM/neon-vld1-sandboxing.ll

Index: test/NaCl/ARM/neon-vld1-sandboxing.ll
diff --git a/test/NaCl/ARM/neon-vld1-sandboxing.ll b/test/NaCl/ARM/neon-vld1-sandboxing.ll
index d33c46600b331b511288987617fe73473f9061e7..7a63d972d08aa1cd6a78a295051ddfaa70fd0bec 100644
--- a/test/NaCl/ARM/neon-vld1-sandboxing.ll
+++ b/test/NaCl/ARM/neon-vld1-sandboxing.ll
@@ -3,7 +3,7 @@
 
 define <8 x i8> @vld1i8(i8* %A) nounwind {
   %tmp1 = call <8 x i8> @llvm.arm.neon.vld1.v8i8(i8* %A, i32 16)
-; CHECK:         bic r0, r0, #3221225472
+; CHECK:         bic r0, r0, #-1073741824
 ; CHECK-NEXT:    vld1.8 {{{d[0-9]+}}}, [r0:64]
   ret <8 x i8> %tmp1
 }
@@ -11,7 +11,7 @@ define <8 x i8> @vld1i8(i8* %A) nounwind {
 define <4 x i16> @vld1i16(i16* %A) nounwind {
   %tmp0 = bitcast i16* %A to i8*
   %tmp1 = call <4 x i16> @llvm.arm.neon.vld1.v4i16(i8* %tmp0, i32 1)
-; CHECK:         bic r0, r0, #3221225472
+; CHECK:         bic r0, r0, #-1073741824
 ; CHECK-NEXT:    vld1.16 {{{d[0-9]+}}}, [r0]
   ret <4 x i16> %tmp1
 }
@@ -19,7 +19,7 @@ define <4 x i16> @vld1i16(i16* %A) nounwind {
 define <2 x i32> @vld1i32(i32* %A) nounwind {
   %tmp0 = bitcast i32* %A to i8*
   %tmp1 = call <2 x i32> @llvm.arm.neon.vld1.v2i32(i8* %tmp0, i32 1)
-; CHECK:         bic r0, r0, #3221225472
+; CHECK:         bic r0, r0, #-1073741824
 ; CHECK-NEXT:    vld1.32 {{{d[0-9]+}}}, [r0]
   ret <2 x i32> %tmp1
 }
@@ -31,14 +31,14 @@ define <1 x i64> @vld1i64(i32 %foo, i32 %bar, i32 %baz,
                           i64* %A) nounwind {
   %tmp0 = bitcast i64* %A to i8*
   %tmp1 = call <1 x i64> @llvm.arm.neon.vld1.v1i64(i8* %tmp0, i32 1)
-; CHECK:         bic r3, r3, #3221225472
+; CHECK:         bic r3, r3, #-1073741824
 ; CHECK-NEXT:    vld1.64 {{{d[0-9]+}}}, [r3]
   ret <1 x i64> %tmp1
 }
 
 define <16 x i8> @vld1Qi8(i8* %A) nounwind {
   %tmp1 = call <16 x i8> @llvm.arm.neon.vld1.v16i8(i8* %A, i32 8)
-; CHECK:         bic r0, r0, #3221225472
+; CHECK:         bic r0, r0, #-1073741824
 ; CHECK-NEXT:    vld1.8 {{{d[0-9]+}}, {{d[0-9]+}}}, [r0:64]
   ret <16 x i8> %tmp1
 }
@@ -46,7 +46,7 @@ define <16 x i8> @vld1Qi8(i8* %A) nounwind {
 define <8 x i16> @vld1Qi16(i16* %A) nounwind {
   %tmp0 = bitcast i16* %A to i8*
   %tmp1 = call <8 x i16> @llvm.arm.neon.vld1.v8i16(i8* %tmp0, i32 32)
-; CHECK:         bic r0, r0, #3221225472
+; CHECK:         bic r0, r0, #-1073741824
 ; CHECK-NEXT:    vld1.16 {{{d[0-9]+}}, {{d[0-9]+}}}, [r0:128]
   ret <8 x i16> %tmp1
 }
@@ -54,7 +54,7 @@ define <8 x i16> @vld1Qi16(i16* %A) nounwind {
 define <4 x i32> @vld1Qi32(i32* %A) nounwind {
   %tmp0 = bitcast i32* %A to i8*
   %tmp1 = call <4 x i32> @llvm.arm.neon.vld1.v4i32(i8* %tmp0, i32 1)
-; CHECK:         bic r0, r0, #3221225472
+; CHECK:         bic r0, r0, #-1073741824
 ; CHECK-NEXT:    vld1.32 {{{d[0-9]+}}, {{d[0-9]+}}}, [r0]
   ret <4 x i32> %tmp1
 }
@@ -62,7 +62,7 @@ define <4 x i32> @vld1Qi32(i32* %A) nounwind {
 define <2 x i64> @vld1Qi64(i64* %A) nounwind {
   %tmp0 = bitcast i64* %A to i8*
   %tmp1 = call <2 x i64> @llvm.arm.neon.vld1.v2i64(i8* %tmp0, i32 1)
-; CHECK:         bic r0, r0, #3221225472
+; CHECK:         bic r0, r0, #-1073741824
 ; CHECK-NEXT:    vld1.64 {{{d[0-9]+}}, {{d[0-9]+}}}, [r0]
   ret <2 x i64> %tmp1
 }
@@ -80,33 +80,33 @@ declare <4 x float> @llvm.arm.neon.vld1.v4f32(i8*, i32) nounwind readonly
 declare <2 x i64> @llvm.arm.neon.vld1.v2i64(i8*, i32) nounwind readonly
 
 define <16 x i8> @vld1Qi8_update(i8** %ptr) nounwind {
-  %A = load i8** %ptr
+  %A = load i8*, i8** %ptr
   %tmp1 = call <16 x i8> @llvm.arm.neon.vld1.v16i8(i8* %A, i32 8)
-; CHECK:         bic r1, r1, #3221225472
+; CHECK:         bic r1, r1, #-1073741824
 ; CHECK-NEXT:    vld1.8 {{{d[0-9]+}}, {{d[0-9]+}}}, [r1:64]!
-  %tmp2 = getelementptr i8* %A, i32 16
+  %tmp2 = getelementptr i8, i8* %A, i32 16
   store i8* %tmp2, i8** %ptr
   ret <16 x i8> %tmp1
 }
 
 define <4 x i16> @vld1i16_update(i16** %ptr) nounwind {
-  %A = load i16** %ptr
+  %A = load i16*, i16** %ptr
   %tmp0 = bitcast i16* %A to i8*
   %tmp1 = call <4 x i16> @llvm.arm.neon.vld1.v4i16(i8* %tmp0, i32 1)
-; CHECK:         bic r1, r1, #3221225472
+; CHECK:         bic r1, r1, #-1073741824
 ; CHECK-NEXT:    vld1.16 {{{d[0-9]+}}}, [r1]!
-  %tmp2 = getelementptr i16* %A, i32 4
+  %tmp2 = getelementptr i16, i16* %A, i32 4
          store i16* %tmp2, i16** %ptr
   ret <4 x i16> %tmp1
 }
 
 define <2 x i32> @vld1i32_update(i32** %ptr, i32 %inc) nounwind {
-  %A = load i32** %ptr
+  %A = load i32*, i32** %ptr
   %tmp0 = bitcast i32* %A to i8*
   %tmp1 = call <2 x i32> @llvm.arm.neon.vld1.v2i32(i8* %tmp0, i32 1)
-; CHECK:         bic r2, r2, #3221225472
+; CHECK:         bic r2, r2, #-1073741824
 ; CHECK-NEXT:    vld1.32 {{{d[0-9]+}}}, [r2], r1
-  %tmp2 = getelementptr i32* %A, i32 %inc
+  %tmp2 = getelementptr i32, i32* %A, i32 %inc
   store i32* %tmp2, i32** %ptr
   ret <2 x i32> %tmp1
 }