Changes from 3.7 merge to files not in upstream

test/NaCl/Bitcode/dump.ll

 ; Simple tests on dump flags for pnacl-bcanalyzer.
 
 @bytes = internal global [4 x i8] c"abcd"
 
 @ptr_to_ptr = internal global i32 ptrtoint (i32* @ptr to i32)
 
 @ptr = internal global i32 ptrtoint ([4 x i8]* @bytes to i32)
 
 declare i32 @bar(i32)
 
 define void @AllocCastSimple() {
   %1 = alloca i8, i32 4, align 8
   %2 = ptrtoint i8* %1 to i32
   %3 = bitcast [4 x i8]* @bytes to i32*
   store i32 %2, i32* %3, align 1
   ret void
 }
 
 define void @PhiBackwardRefs(i1) {
   %2 = alloca i8, i32 4, align 8
   %3 = alloca i8, i32 4, align 8
   br i1 %0, label %true, label %false
 
 true:                                             ; preds = %1
   %4 = bitcast i8* %2 to i32*
-  %5 = load i32* %4
+  %5 = load i32, i32* %4
   %6 = ptrtoint i8* %3 to i32
   br label %merge
 
 false:                                            ; preds = %1
   %7 = bitcast i8* %2 to i32*
-  %8 = load i32* %7
+  %8 = load i32, i32* %7
   %9 = ptrtoint i8* %3 to i32
   br label %merge
 
 merge:                                            ; preds = %false, %true
   %10 = phi i32 [ %6, %true ], [ %9, %false ]
   %11 = phi i32 [ %5, %true ], [ %8, %false ]
   ret void
 }
 
 ; -------------------------------------------------
@@ skipping 195 matching lines @@
 ; DRWD:     <INST_BR abbrev='UNABBREVIATED' op0=3/>
 ; DRWD:     <INST_LOAD abbrev=4 op0=3 op1=0 op2=0/>
 ; DRWD:     <INST_BR abbrev='UNABBREVIATED' op0=3/>
 ; DRWD:     <INST_PHI abbrev='UNABBREVIATED' op0=0 op1=6 op2=1
 ; DRWD:               op3=6 op4=2/>
 ; DRWD:     <INST_PHI abbrev='UNABBREVIATED' op0=0 op1=6 op2=1
 ; DRWD:               op3=4 op4=2/>
 ; DRWD:     <INST_RET abbrev=7/>
 ; DRWD:   </FUNCTION_BLOCK abbrev='END_BLOCK'>
 ; DRWD: </MODULE_BLOCK abbrev='END_BLOCK'>