diff options
| author | Reid Kleckner <rnk@google.com> | 2018-03-14 20:41:39 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2018-03-14 20:41:39 +0000 |
| commit | 19454f1a9d6acef43e37a769a45ff6d55f70b826 (patch) | |
| tree | 4f2a1683e7ddd6a6864ef5686aa20108cbab6e50 | |
| parent | 25fb15a08fa6f21430cbd4bbed985d0a431ffb58 (diff) | |
| download | bcm5719-llvm-19454f1a9d6acef43e37a769a45ff6d55f70b826.tar.gz bcm5719-llvm-19454f1a9d6acef43e37a769a45ff6d55f70b826.zip | |
[COFF] Fix LLD COFF tests as a follow-up to r327563
I definitely didn't run the tests before committing :(
Most of these tests failed because the LLD map file output changed,
moving the functions from the main text section to a new per-function
section.
ICF also started to fire in a few cases, leading to new layouts.
llvm-svn: 327571
| -rw-r--r-- | lld/test/COFF/dll.test | 2 | ||||
| -rw-r--r-- | lld/test/COFF/lto-comdat.ll | 11 | ||||
| -rw-r--r-- | lld/test/COFF/lto-parallel.ll | 4 | ||||
| -rw-r--r-- | lld/test/COFF/weak-external.test | 1 | ||||
| -rw-r--r-- | lld/test/COFF/weak-external3.test | 1 |
5 files changed, 11 insertions, 8 deletions
diff --git a/lld/test/COFF/dll.test b/lld/test/COFF/dll.test index abd39f4eeb2..9bd86980319 100644 --- a/lld/test/COFF/dll.test +++ b/lld/test/COFF/dll.test @@ -26,7 +26,7 @@ EXPORT2-NEXT: 1 0x1010 exportfn3 EXPORT2-NEXT: 2 0x101c mangled2 # RUN: llvm-as -o %t.lto.obj %p/Inputs/export.ll -# RUN: lld-link /out:%t.lto.dll /dll %t.lto.obj /export:exportfn1 /export:exportfn2 +# RUN: lld-link -opt:noicf /out:%t.lto.dll /dll %t.lto.obj /export:exportfn1 /export:exportfn2 # RUN: llvm-objdump -p %t.lto.dll | FileCheck -check-prefix=EXPORT-LTO %s EXPORT-LTO: Export Table: diff --git a/lld/test/COFF/lto-comdat.ll b/lld/test/COFF/lto-comdat.ll index b255f69d1ab..9594d30f705 100644 --- a/lld/test/COFF/lto-comdat.ll +++ b/lld/test/COFF/lto-comdat.ll @@ -49,18 +49,17 @@ ; TEXT-01: Disassembly of section .text: ; TEXT-01-NEXT: .text: ; TEXT-01-NEXT: subq $40, %rsp -; TEXT-01-NEXT: callq 39 -; TEXT-01-NEXT: callq 50 +; TEXT-01-NEXT: callq 23 +; TEXT-01-NEXT: callq 18 ; TEXT-01-NEXT: callq 13 ; TEXT-01-NEXT: xorl %eax, %eax ; TEXT-01-NEXT: addq $40, %rsp ; TEXT-01: retq ; TEXT-01-NOT: callq ; TEXT-01: retq -; TEXT-01-NOT: callq -; TEXT-01: retq -; TEXT-01-NOT: callq -; TEXT-01: retq +; TEXT-01: int3 +; TEXT-01: int3 +; TEXT-01: int3 ; TEXT-01-NOT: {{.}} ; HEADERS-10: AddressOfEntryPoint: 0x2020 diff --git a/lld/test/COFF/lto-parallel.ll b/lld/test/COFF/lto-parallel.ll index 449e3a01a85..df0dc25cdfc 100644 --- a/lld/test/COFF/lto-parallel.ll +++ b/lld/test/COFF/lto-parallel.ll @@ -1,11 +1,12 @@ ; RUN: llvm-as -o %t.obj %s -; RUN: lld-link /out:%t.exe /entry:foo /include:bar /opt:lldltopartitions=2 /subsystem:console /lldmap:%t.map %t.obj +; RUN: lld-link -opt:noicf /out:%t.exe /entry:foo /include:bar /opt:lldltopartitions=2 /subsystem:console /lldmap:%t.map %t.obj ; RUN: FileCheck %s < %t.map target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-pc-windows-msvc" ; CHECK: lto.tmp +; CHECK: lto.tmp ; CHECK-NEXT: foo define void @foo() { call void @bar() @@ -13,6 +14,7 @@ define void @foo() { } ; CHECK: lto.tmp +; CHECK: lto.tmp ; CHECK: bar define void @bar() { call void @foo() diff --git a/lld/test/COFF/weak-external.test b/lld/test/COFF/weak-external.test index 7bdadd9b1c9..141d5ed68e1 100644 --- a/lld/test/COFF/weak-external.test +++ b/lld/test/COFF/weak-external.test @@ -5,6 +5,7 @@ # RUN: FileCheck %s < %t2.map # CHECK: lto.tmp +# CHECK-NEXT: lto.tmp # CHECK-NEXT: 0 g --- !COFF diff --git a/lld/test/COFF/weak-external3.test b/lld/test/COFF/weak-external3.test index a06ce48a61a..8d2bde2a40e 100644 --- a/lld/test/COFF/weak-external3.test +++ b/lld/test/COFF/weak-external3.test @@ -6,6 +6,7 @@ # RUN: FileCheck --check-prefix=CHECK2 %s < %t2.map # CHECK1: lto.tmp +# CHECK1: lto.tmp # CHECK1-NEXT: 0 g # CHECK2: weak-external3.test.tmp.obj |
