Subzero: Fix new issues after the LLVM 3.5 merge.

tests_lit/llvm2ice_tests/64bit.pnacl.ll

 ; This tries to be a comprehensive test of i64 operations, in
 ; particular the patterns for lowering i64 operations into constituent
 ; i32 operations on x86-32.
 
-; TODO(jvoung): fix extra "CALLTARGETS" run. The llvm-objdump symbolizer
-; doesn't know how to symbolize non-section-local functions.
-; The newer LLVM 3.6 one does work, but watch out for other bugs.
-
-; RUN: %p2i -i %s --args -O2 --verbose none \
-; RUN:   | FileCheck --check-prefix=CALLTARGETS %s
 ; RUN: %p2i -i %s --args -O2 --verbose none \
 ; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
 ; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - | FileCheck %s
 ; RUN: %p2i -i %s --args -Om1 --verbose none \
 ; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
 ; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - \
 ; RUN:   | FileCheck --check-prefix=OPTM1 %s
 
 @__init_array_start = internal constant [0 x i8] zeroinitializer, align 4
 @__fini_array_start = internal constant [0 x i8] zeroinitializer, align 4
 @__tls_template_start = internal constant [0 x i8] zeroinitializer, align 8
 @__tls_template_alignment = internal constant [4 x i8] c"\01\00\00\00", align 4
 
 define internal i32 @ignore64BitArg(i64 %a, i32 %b, i64 %c) {
 entry:
   ret i32 %b
 }
 
 define internal i32 @pass64BitArg(i64 %a, i64 %b, i64 %c, i64 %d, i64 %e, i64 %f) {
 entry:
   %call = call i32 @ignore64BitArgNoInline(i64 %a, i32 123, i64 %b)
   %call1 = call i32 @ignore64BitArgNoInline(i64 %c, i32 123, i64 %d)
   %call2 = call i32 @ignore64BitArgNoInline(i64 %e, i32 123, i64 %f)
   %add = add i32 %call1, %call
   %add3 = add i32 %add, %call2
   ret i32 %add3
 }
 ; CHECK-LABEL: pass64BitArg
-; CALLTARGETS-LABEL: pass64BitArg
 ; CHECK:      sub     esp
 ; CHECK:      mov     dword ptr [esp + 4]
 ; CHECK:      mov     dword ptr [esp]
 ; CHECK:      mov     dword ptr [esp + 8], 123
 ; CHECK:      mov     dword ptr [esp + 16]
 ; CHECK:      mov     dword ptr [esp + 12]
-; CHECK:      call    -4
-; CALLTARGETS: .long ignore64BitArgNoInline
+; CHECK:      call    ignore64BitArgNoInline
 ; CHECK:      sub     esp
 ; CHECK:      mov     dword ptr [esp + 4]
 ; CHECK:      mov     dword ptr [esp]
 ; CHECK:      mov     dword ptr [esp + 8], 123
 ; CHECK:      mov     dword ptr [esp + 16]
 ; CHECK:      mov     dword ptr [esp + 12]
-; CHECK:      call    -4
-; CALLTARGETS: .long ignore64BitArgNoInline
+; CHECK:      call    ignore64BitArgNoInline
 ; CHECK:      sub     esp
 ; CHECK:      mov     dword ptr [esp + 4]
 ; CHECK:      mov     dword ptr [esp]
 ; CHECK:      mov     dword ptr [esp + 8], 123
 ; CHECK:      mov     dword ptr [esp + 16]
 ; CHECK:      mov     dword ptr [esp + 12]
-; CHECK:      call    -4
-; CALLTARGETS: .long ignore64BitArgNoInline
+; CHECK:      call    ignore64BitArgNoInline
 ;
 ; OPTM1-LABEL: pass64BitArg
 ; OPTM1:      sub     esp
 ; OPTM1:      mov     dword ptr [esp + 4]
 ; OPTM1:      mov     dword ptr [esp]
 ; OPTM1:      mov     dword ptr [esp + 8], 123
 ; OPTM1:      mov     dword ptr [esp + 16]
 ; OPTM1:      mov     dword ptr [esp + 12]
-; OPTM1:      call    -4
+; OPTM1:      call    ignore64BitArgNoInline
 ; OPTM1:      sub     esp
 ; OPTM1:      mov     dword ptr [esp + 4]
 ; OPTM1:      mov     dword ptr [esp]
 ; OPTM1:      mov     dword ptr [esp + 8], 123
 ; OPTM1:      mov     dword ptr [esp + 16]
 ; OPTM1:      mov     dword ptr [esp + 12]
-; OPTM1:      call    -4
+; OPTM1:      call    ignore64BitArgNoInline
 ; OPTM1:      sub     esp
 ; OPTM1:      mov     dword ptr [esp + 4]
 ; OPTM1:      mov     dword ptr [esp]
 ; OPTM1:      mov     dword ptr [esp + 8], 123
 ; OPTM1:      mov     dword ptr [esp + 16]
 ; OPTM1:      mov     dword ptr [esp + 12]
-; OPTM1:      call    -4
+; OPTM1:      call    ignore64BitArgNoInline
 
 declare i32 @ignore64BitArgNoInline(i64, i32, i64)
 
 define internal i32 @pass64BitConstArg(i64 %a, i64 %b) {
 entry:
   %call = call i32 @ignore64BitArgNoInline(i64 %a, i32 123, i64 -2401053092306725256)
   ret i32 %call
 }
 ; CHECK-LABEL: pass64BitConstArg
-; CALLTARGETS-LABEL: pass64BitConstArg
 ; CHECK:      sub     esp
 ; CHECK:      mov     dword ptr [esp + 4]
 ; CHECK-NEXT: mov     dword ptr [esp]
 ; CHECK-NEXT: mov     dword ptr [esp + 8], 123
 ; Bundle padding might be added (so not using -NEXT).
 ; CHECK:      mov     dword ptr [esp + 16], 3735928559
 ; CHECK-NEXT: mov     dword ptr [esp + 12], 305419896
 ; Bundle padding will push the call down.
 ; CHECK-NOT:  mov
-; CHECK:      call    -4
-; CALLTARGETS: .long ignore64BitArgNoInline
+; CHECK:      call    ignore64BitArgNoInline
 ;
 ; OPTM1-LABEL: pass64BitConstArg
 ; OPTM1:      sub     esp
 ; OPTM1:      mov     dword ptr [esp + 4]
 ; OPTM1-NEXT: mov     dword ptr [esp]
 ; OPTM1-NEXT: mov     dword ptr [esp + 8], 123
 ; Bundle padding might be added (so not using -NEXT).
 ; OPTM1:      mov     dword ptr [esp + 16], 3735928559
 ; OPTM1-NEXT: mov     dword ptr [esp + 12], 305419896
 ; OPTM1-NOT:  mov
-; OPTM1:      call    -4
+; OPTM1:      call    ignore64BitArgNoInline
 
 define internal i64 @return64BitArg(i64 %a) {
 entry:
   ret i64 %a
 }
 ; CHECK-LABEL: return64BitArg
 ; CHECK: mov     {{.*}}, dword ptr [esp + 4]
 ; CHECK: mov     {{.*}}, dword ptr [esp + 8]
 ;
 ; OPTM1-LABEL: return64BitArg
@@ skipping 101 matching lines @@
 ; OPTM1: mul
 ; OPTM1: add
 ; OPTM1: add
 
 define internal i64 @div64BitSigned(i64 %a, i64 %b) {
 entry:
   %div = sdiv i64 %a, %b
   ret i64 %div
 }
 ; CHECK-LABEL: div64BitSigned
-; CALLTARGETS-LABEL: div64BitSigned
-; CHECK: call    -4
-; CALLTARGETS: .long __divdi3
+; CHECK: call    __divdi3
 
 ; OPTM1-LABEL: div64BitSigned
-; OPTM1: call    -4
+; OPTM1: call    __divdi3
 
 define internal i64 @div64BitSignedConst(i64 %a) {
 entry:
   %div = sdiv i64 %a, 12345678901234
   ret i64 %div
 }
 ; CHECK-LABEL: div64BitSignedConst
-; CALLTARGETS-LABEL: div64BitSignedConst
 ; CHECK: mov     dword ptr [esp + 12], 2874
 ; CHECK: mov     dword ptr [esp + 8],  1942892530
-; CHECK: call    -4
-; CALLTARGETS: .long __divdi3
+; CHECK: call    __divdi3
 ;
 ; OPTM1-LABEL: div64BitSignedConst
 ; OPTM1: mov     dword ptr [esp + 12], 2874
 ; OPTM1: mov     dword ptr [esp + 8],  1942892530
-; OPTM1: call    -4
+; OPTM1: call    __divdi3
 
 define internal i64 @div64BitUnsigned(i64 %a, i64 %b) {
 entry:
   %div = udiv i64 %a, %b
   ret i64 %div
 }
 ; CHECK-LABEL: div64BitUnsigned
-; CALLTARGETS-LABEL: div64BitUnsigned
-; CHECK: call    -4
-; CALLTARGETS: .long __udivdi3
+; CHECK: call    __udivdi3
 ;
 ; OPTM1-LABEL: div64BitUnsigned
-; OPTM1: call    -4
+; OPTM1: call    __udivdi3
 
 define internal i64 @rem64BitSigned(i64 %a, i64 %b) {
 entry:
   %rem = srem i64 %a, %b
   ret i64 %rem
 }
 ; CHECK-LABEL: rem64BitSigned
-; CALLTARGETS-LABEL: rem64BitSigned
-; CHECK: call    -4
-; CALLTARGETS: .long __moddi3
+; CHECK: call    __moddi3
 ;
 ; OPTM1-LABEL: rem64BitSigned
-; OPTM1: call    -4
+; OPTM1: call    __moddi3
 
 define internal i64 @rem64BitUnsigned(i64 %a, i64 %b) {
 entry:
   %rem = urem i64 %a, %b
   ret i64 %rem
 }
 ; CHECK-LABEL: rem64BitUnsigned
-; CALLTARGETS-LABEL: rem64BitUnsigned
-; CHECK: call    -4
-; CALLTARGETS: .long __umoddi3
+; CHECK: call    __umoddi3
 ;
 ; OPTM1-LABEL: rem64BitUnsigned
-; OPTM1: call    -4
+; OPTM1: call    __umoddi3
 
 define internal i64 @shl64BitSigned(i64 %a, i64 %b) {
 entry:
   %shl = shl i64 %a, %b
   ret i64 %shl
 }
 ; CHECK-LABEL: shl64BitSigned
 ; CHECK: shld
 ; CHECK: shl e
 ; CHECK: test {{.*}}, 32
@@ skipping 1008 matching lines @@
 
 if.end3:                                          ; preds = %if.then2, %if.end
   ret void
 }
 ; The following checks are not strictly necessary since one of the RUN
 ; lines actually runs the output through the assembler.
 ; CHECK-LABEL: icmpLt64Imm
 ; CHECK-NOT: cmp {{[0-9]+}},
 ; OPTM1-LABEL: icmpLt64Imm
 ; OPTM1-NOT: cmp {{[0-9]+}},