Changes from 3.7 merge to files not in upstream

test/NaCl/Bitcode/ptrtoint-elide.ll

 ; Test how we handle eliding ptrtoint instructions.
 
 ; RUN: llvm-as < %s | pnacl-freeze \
 ; RUN:              | pnacl-bcanalyzer -dump-records \
 ; RUN:              | FileCheck %s -check-prefix=PF2
 
 ; RUN: llvm-as < %s | pnacl-freeze -allow-local-symbol-tables \
 ; RUN:              | pnacl-thaw -allow-local-symbol-tables \
 ; RUN:              | llvm-dis - | FileCheck %s -check-prefix=TD2
 
@@ skipping 522 matching lines @@
 ; Show that if a phi node refers to a pointer cast, we add
 ; them at the end of the incoming block.
 define void @PhiBackwardRefs(i1) {
   %2 = alloca i8, i32 4, align 8
   %3 = bitcast i8* %2 to i32*
   %4 = alloca i8, i32 4, align 8
   %5 = ptrtoint i8* %4 to i32
   br i1 %0, label %true, label %false
 
 true:
-  %6 = load i32* %3
+  %6 = load i32, i32* %3
   br label %merge
 
 false:
-  %7 = load i32* %3
+  %7 = load i32, i32* %3
   br label %merge
 
 merge:
   %8 = phi i32 [%5, %true], [%5, %false]
   %9 = phi i32 [%6, %true], [%7, %false]
   ret void
 }
 
 ; TD2:      define void @PhiBackwardRefs(i1) {
 ; TD2-NEXT:   %2 = alloca i8, i32 4, align 8
 ; TD2-NEXT:   %3 = alloca i8, i32 4, align 8
 ; TD2-NEXT:   br i1 %0, label %true, label %false
 ; TD2:      true:
 ; TD2-NEXT:   %4 = bitcast i8* %2 to i32*
-; TD2-NEXT:   %5 = load i32* %4
+; TD2-NEXT:   %5 = load i32, i32* %4
 ; TD2-NEXT:   %6 = ptrtoint i8* %3 to i32
 ; TD2-NEXT:   br label %merge
 ; TD2:      false:
 ; TD2-NEXT:   %7 = bitcast i8* %2 to i32*
-; TD2-NEXT:   %8 = load i32* %7
+; TD2-NEXT:   %8 = load i32, i32* %7
 ; TD2-NEXT:   %9 = ptrtoint i8* %3 to i32
 ; TD2-NEXT:   br label %merge
 ; TD2:      merge:
 ; TD2-NEXT:   %10 = phi i32 [ %6, %true ], [ %9, %false ]
 ; TD2-NEXT:   %11 = phi i32 [ %5, %true ], [ %8, %false ]
 ; TD2-NEXT:   ret void
 ; TD2-NEXT: }
 
 ; PF2:        <FUNCTION_BLOCK>
 ; PF2:          </CONSTANTS_BLOCK>
@@ skipping 15 matching lines @@
 ; instructions instead of backwards references.
 define void @PhiForwardRefs(i1) {
   br label %start
 
 merge:
   %2 = phi i32 [%9, %true], [%9, %false]
   %3 = phi i32 [%4, %true], [%5, %false]
   ret void
 
 true:
-  %4 = load i32* %7
+  %4 = load i32, i32* %7
   br label %merge
 
 false:
-  %5 = load i32* %7
+  %5 = load i32, i32* %7
   br label %merge
 
 start:
   %6 = alloca i8, i32 4, align 8
   %7 = bitcast i8* %6 to i32*
   %8 = alloca i8, i32 4, align 8
   %9 = ptrtoint i8* %8 to i32
   br i1 %0, label %true, label %false
 }
 
 ; TD2:      define void @PhiForwardRefs(i1) {
 ; TD2-NEXT:   br label %start
 ; TD2:      merge
 ; TD2-NEXT:   %2 = phi i32 [ %11, %true ], [ %11, %false ]
 ; TD2-NEXT:   %3 = phi i32 [ %5, %true ], [ %7, %false ]
 ; TD2-NEXT:   ret void
 ; TD2:      true:
 ; TD2-NEXT:   %4 = inttoptr i32 %9 to i32*
-; TD2-NEXT:   %5 = load i32* %4
+; TD2-NEXT:   %5 = load i32, i32* %4
 ; TD2-NEXT:   br label %merge
 ; TD2:      false:
 ; TD2-NEXT:   %6 = inttoptr i32 %9 to i32*
-; TD2-NEXT:   %7 = load i32* %6
+; TD2-NEXT:   %7 = load i32, i32* %6
 ; TD2-NEXT:   br label %merge
 ; TD2:      start:
 ; TD2-NEXT:   %8 = alloca i8, i32 4, align 8
 ; TD2-NEXT:   %9 = ptrtoint i8* %8 to i32
 ; TD2-NEXT:   %10 = alloca i8, i32 4, align 8
 ; TD2-NEXT:   %11 = ptrtoint i8* %10 to i32
 ; TD2-NEXT:   br i1 %0, label %true, label %false
 ; TD2-NEXT: }
 
 ; PF2:        <FUNCTION_BLOCK>
@@ skipping 21 matching lines @@
 ; we use it instead of adding one at the end of the block. In this
 ; example, we reuse instruction %7 in block true for phi node %10.
 define void @PhiMergeCast(i1) {
   %2 = alloca i8, i32 4, align 8
   %3 = bitcast i8* %2 to i32*
   %4 = alloca i8, i32 4, align 8
   %5 = ptrtoint i8* %4 to i32
   br i1 %0, label %true, label %false
 
 true:
-  %6 = load i32* %3
+  %6 = load i32, i32* %3
   %7 = ptrtoint i8* %4 to i32
   %8 = add i32 %6, %7
   br label %merge
 
 false:
-  %9 = load i32* %3
+  %9 = load i32, i32* %3
   br label %merge
 
 merge:
   %10 = phi i32 [%5, %true], [%5, %false]
   %11 = phi i32 [%6, %true], [%9, %false]
   ret void
 }
 
 ; TD2:      define void @PhiMergeCast(i1) {
 ; TD2-NEXT:   %2 = alloca i8, i32 4, align 8
 ; TD2-NEXT:   %3 = alloca i8, i32 4, align 8
 ; TD2-NEXT:   br i1 %0, label %true, label %false
 ; TD2:      true:
 ; TD2-NEXT:   %4 = bitcast i8* %2 to i32*
-; TD2-NEXT:   %5 = load i32* %4
+; TD2-NEXT:   %5 = load i32, i32* %4
 ; TD2-NEXT:   %6 = ptrtoint i8* %3 to i32
 ; TD2-NEXT:   %7 = add i32 %5, %6
 ; TD2-NEXT:   br label %merge
 ; TD2:      false:
 ; TD2-NEXT:   %8 = bitcast i8* %2 to i32*
-; TD2-NEXT:   %9 = load i32* %8
+; TD2-NEXT:   %9 = load i32, i32* %8
 ; TD2-NEXT:   %10 = ptrtoint i8* %3 to i32
 ; TD2-NEXT:   br label %merge
 ; TD2:      merge:
 ; TD2-NEXT:   %11 = phi i32 [ %6, %true ], [ %10, %false ]
 ; TD2-NEXT:   %12 = phi i32 [ %5, %true ], [ %9, %false ]
 ; TD2-NEXT:   ret void
 ; TD2-NEXT: }
 
 ; PF2:        <FUNCTION_BLOCK>
 ; PF2:          </CONSTANTS_BLOCK>
@@ skipping 92 matching lines @@
 ; PF2-NEXT:     <INST_STORE op0=4 op1=1 op2=1/>
 ; PF2-NEXT:     <INST_STORE op0=4 op1=1 op2=1/>
 ; PF2-NEXT:     <INST_RET/>
 ; PF2-NEXT:     <INST_STORE op0=4 op1=1 op2=1/>
 ; PF2-NEXT:     <INST_STORE op0=4 op1=1 op2=1/>
 ; PF2-NEXT:     <INST_RET/>
 ; PF2-NEXT:     <INST_STORE op0=4 op1=1 op2=1/>
 ; PF2-NEXT:     <INST_STORE op0=4 op1=1 op2=1/>
 ; PF2-NEXT:     <INST_RET/>
 ; PF2:        </FUNCTION_BLOCK>