[lld] r327571 - [COFF] Fix LLD COFF tests as a follow-up to r327563

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Wed Mar 14 13:41:39 2018
New Revision: 327571

URL: http://llvm.org/viewvc/llvm-project?rev=327571&view=rev
Log:
[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.

Modified:
    lld/trunk/test/COFF/dll.test
    lld/trunk/test/COFF/lto-comdat.ll
    lld/trunk/test/COFF/lto-parallel.ll
    lld/trunk/test/COFF/weak-external.test
    lld/trunk/test/COFF/weak-external3.test

Modified: lld/trunk/test/COFF/dll.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/dll.test?rev=327571&r1=327570&r2=327571&view=diff
==============================================================================
--- lld/trunk/test/COFF/dll.test (original)
+++ lld/trunk/test/COFF/dll.test Wed Mar 14 13:41:39 2018
@@ -26,7 +26,7 @@ EXPORT2-NEXT:       1   0x1010  exportfn
 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:

Modified: lld/trunk/test/COFF/lto-comdat.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/lto-comdat.ll?rev=327571&r1=327570&r2=327571&view=diff
==============================================================================
--- lld/trunk/test/COFF/lto-comdat.ll (original)
+++ lld/trunk/test/COFF/lto-comdat.ll Wed Mar 14 13:41:39 2018
@@ -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

Modified: lld/trunk/test/COFF/lto-parallel.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/lto-parallel.ll?rev=327571&r1=327570&r2=327571&view=diff
==============================================================================
--- lld/trunk/test/COFF/lto-parallel.ll (original)
+++ lld/trunk/test/COFF/lto-parallel.ll Wed Mar 14 13:41:39 2018
@@ -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()

Modified: lld/trunk/test/COFF/weak-external.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/weak-external.test?rev=327571&r1=327570&r2=327571&view=diff
==============================================================================
--- lld/trunk/test/COFF/weak-external.test (original)
+++ lld/trunk/test/COFF/weak-external.test Wed Mar 14 13:41:39 2018
@@ -5,6 +5,7 @@
 # RUN: FileCheck %s < %t2.map
 
 # CHECK: lto.tmp
+# CHECK-NEXT: lto.tmp
 # CHECK-NEXT: 0 g
 
 --- !COFF

Modified: lld/trunk/test/COFF/weak-external3.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/weak-external3.test?rev=327571&r1=327570&r2=327571&view=diff
==============================================================================
--- lld/trunk/test/COFF/weak-external3.test (original)
+++ lld/trunk/test/COFF/weak-external3.test Wed Mar 14 13:41:39 2018
@@ -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