Subzero: Changes needed for LLVM 3.7 integration.

tests_lit/llvm2ice_tests/phi.ll

 ; This tests some of the subtleties of Phi lowering.  In particular,
 ; it tests that it does the right thing when it tries to enable
 ; compare/branch fusing.
 
 ; RUN: %p2i -i %s --filetype=obj --disassemble --args -O2 --phi-edge-split=0 \
 ; RUN:   | FileCheck %s
 ; RUN: %p2i -i %s --filetype=obj --disassemble --args -O2 --phi-edge-split=1 \
 ; RUN:   | FileCheck --check-prefix=SPLIT %s
 
 define internal i32 @testPhi1(i32 %arg) {
@@ skipping 41 matching lines @@
 define internal i32 @testPhi3(i32 %arg) {
 entry:
   br label %body
 body:
   %merge = phi i32 [ %arg, %entry ], [ %elt, %body ]
   %interior = add i32 %merge, 1000
   ; Trick to make a basic block local copy of interior for
   ; addressing mode optimization.
   %interior__4 = add i32 %interior, 0
   %__4 = inttoptr i32 %interior__4 to i32*
-  %elt = load i32* %__4, align 1
+  %elt = load i32, i32* %__4, align 1
   %cmp = icmp eq i32 %elt, 0
   br i1 %cmp, label %exit, label %body
 exit:
   ; Same trick (making a basic block local copy).
   %interior__6 = add i32 %interior, 0
   %__6 = inttoptr i32 %interior__6 to i32*
   store i32 %arg, i32* %__6, align 1
   ret i32 %arg
 }
 ; I can't figure out how to reliably test this for correctness, so I
@@ skipping 75 matching lines @@
   %cmp = icmp eq i32 %cond, 0
   br i1 %cmp, label %eq, label %exit
 eq:
   br label %exit
 exit:
   %merge = phi float [ %arg, %entry ], [ undef, %eq ]
   ret float %merge
 }
 ; SPLIT-LABEL: test_split_undef_float_scalar
 ; SPLIT: movss {{.*}},DWORD PTR