Changes from 3.7 merge to files not in upstream

test/CodeGen/JS/aliases.ll

Index: test/CodeGen/JS/aliases.ll
diff --git a/test/CodeGen/JS/aliases.ll b/test/CodeGen/JS/aliases.ll
index 2ad1478e76f5ea51bd54dc395e09ac449b528577..f58a1fe9b1f82229361a593aeb6c8dd502d80f92 100644
--- a/test/CodeGen/JS/aliases.ll
+++ b/test/CodeGen/JS/aliases.ll
@@ -19,7 +19,7 @@ target triple = "asmjs-unknown-emscripten"
 @value3 = alias i32* @value
 
 define internal void @doit(i32 %x) {
-  %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([18 x i8]* @.str, i32 0, i32 0), i32 %x) ; [#uses=0 type=i32]
+  %call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([18 x i8], [18 x i8]* @.str, i32 0, i32 0), i32 %x) ; [#uses=0 type=i32]
   ret void
 }
 
@@ -29,22 +29,22 @@ define internal void @doit(i32 %x) {
 
 define i32 @main() {
 entry:
-  call void ()* @othername4()
+  call void () @othername4()
   %fp = ptrtoint void ()* @othername4 to i32
   %fp1 = add i32 %fp, 0
   %pf = inttoptr i32 %fp1 to void (i32)*
-  %x = load i32* @value3
-  call void (i32)* %pf(i32 %x)
-  %x1 = load i32* @value2
-  call void (i32)* @othername3(i32 %x1)
-  %x2 = load i32* @value
-  call void (i32)* @othername2(i32 %x2)
+  %x = load i32, i32* @value3
+  call void (i32) %pf(i32 %x)
+  %x1 = load i32, i32* @value2
+  call void (i32) @othername3(i32 %x1)
+  %x2 = load i32, i32* @value
+  call void (i32) @othername2(i32 %x2)
   store i32 18, i32* @value
-  %x3 = load i32* @value
-  call void (i32)* @othername(i32 %x3)
+  %x3 = load i32, i32* @value
+  call void (i32) @othername(i32 %x3)
   store i32 19, i32* @value3
-  %x4 = load i32* @value3
-  call void (i32)* @doit(i32 %x4)
+  %x4 = load i32, i32* @value3
+  call void (i32) @doit(i32 %x4)
   ret i32 1
 }