Changes from 3.7 merge to files not in upstream

test/Transforms/NaCl/expand-tls-constexpr.ll

Index: test/Transforms/NaCl/expand-tls-constexpr.ll
diff --git a/test/Transforms/NaCl/expand-tls-constexpr.ll b/test/Transforms/NaCl/expand-tls-constexpr.ll
index b7ab25369208b994227313322edd9dbedd0acec3..fc441d354c3fc88605a3feb08643e10b25867baa 100644
--- a/test/Transforms/NaCl/expand-tls-constexpr.ll
+++ b/test/Transforms/NaCl/expand-tls-constexpr.ll
@@ -50,28 +50,28 @@ define i8* @test_converting_bitcast() {
 
 define i32* @test_converting_getelementptr() {
   ; Use an index >1 to ensure that "inbounds" is not added automatically.
-  ret i32* getelementptr (i32* @tvar, i32 2)
+  ret i32* getelementptr (i32, i32* @tvar, i32 2)
 }
 ; CHECK: define i32* @test_converting_getelementptr()
-; CHECK: %expanded = getelementptr i32* @tvar, i32 2
+; CHECK: %expanded = getelementptr i32, i32* @tvar, i32 2
 ; CHECK: ret i32* %expanded
 
 
 ; This is identical to @test_converting_getelementptr().
 ; We need to check that both copies of getelementptr are fixed.
 define i32* @test_converting_getelementptr_copy() {
-  ret i32* getelementptr (i32* @tvar, i32 2)
+  ret i32* getelementptr (i32, i32* @tvar, i32 2)
 }
 ; CHECK: define i32* @test_converting_getelementptr_copy()
-; CHECK: %expanded = getelementptr i32* @tvar, i32 2
+; CHECK: %expanded = getelementptr i32, i32* @tvar, i32 2
 ; CHECK: ret i32* %expanded
 
 
 define i32* @test_converting_getelementptr_inbounds() {
-  ret i32* getelementptr inbounds (i32* @tvar, i32 2)
+  ret i32* getelementptr inbounds (i32, i32* @tvar, i32 2)
 }
 ; CHECK: define i32* @test_converting_getelementptr_inbounds()
-; CHECK: %expanded = getelementptr inbounds i32* @tvar, i32 2
+; CHECK: %expanded = getelementptr inbounds i32, i32* @tvar, i32 2
 ; CHECK: ret i32* %expanded
 
 
@@ -83,14 +83,14 @@ else:
   br label %return
 
 return:
-  %result = phi i32* [ getelementptr (i32* @tvar, i32 1), %entry ], [ null, %else ]
+  %result = phi i32* [ getelementptr (i32, i32* @tvar, i32 1), %entry ], [ null, %else ]
   ret i32* %result
 }
 ; The converted ConstantExprs get pushed back into the PHI node's
 ; incoming block, which might be suboptimal but works in all cases.
 ; CHECK: define i32* @test_converting_phi(i1 %cmp)
 ; CHECK: entry:
-; CHECK: %expanded = getelementptr inbounds i32* @tvar, i32 1
+; CHECK: %expanded = getelementptr inbounds i32, i32* @tvar, i32 1
 ; CHECK: else:
 ; CHECK: return:
 ; CHECK: %result = phi i32* [ %expanded, %entry ], [ null, %else ]
@@ -106,12 +106,12 @@ else:
   br label %return
 
 return:
-  %result = phi i32* [ getelementptr (i32* @tvar, i32 1), %entry ], [ null, %else ]
+  %result = phi i32* [ getelementptr (i32, i32* @tvar, i32 1), %entry ], [ null, %else ]
   ret i32* %result
 }
 ; CHECK: define i32* @test_converting_phi_with_indirectbr(i8* %addr)
 ; CHECK: entry:
-; CHECK: %expanded = getelementptr inbounds i32* @tvar, i32 1
+; CHECK: %expanded = getelementptr inbounds i32, i32* @tvar, i32 1
 ; CHECK: return:
 ; CHECK: %result = phi i32* [ %expanded, %entry ], [ null, %else ]