mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-18 19:06:44 +00:00
Code Issues Projects Releases Wiki Activity

[LLD][COFF] Check machine types in ICF::equalsConstant. (#88140)

Browse Source 
Avoid replacing replacing a chunk with one from a different type. It's
mostly a concern for ARM64X, where we don't want to merge aarch64 and
arm64ec chunks, but it may also in theory happen between arm64ec and
 x86_64 chunks.
This commit is contained in:
Jacek Caban 2024-04-10 14:37:18 +02:00 committed by GitHub
parent 94ed57dab6
commit a2bdbc6f0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/COFF/ICF.cpp
View File

@ -178,7 +178,7 @@ bool ICF::equalsConstant(const SectionChunk *a, const SectionChunk *b) {
a->getSectionName() == b->getSectionName() &&
a->header->SizeOfRawData == b->header->SizeOfRawData &&
a->checksum == b->checksum && a->getContents() == b->getContents() &&
assocEquals(a, b);
a->getMachine() == b->getMachine() && assocEquals(a, b);
}
// Compare "moving" part of two sections, namely relocation targets.

37
lld/test/COFF/arm64x-icf.s Normal file
View File

@ -0,0 +1,37 @@
// REQUIRES: aarch64
// RUN: split-file %s %t.dir && cd %t.dir
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows func-arm64ec.s -o func-arm64ec.obj
// RUN: llvm-mc -filetype=obj -triple=aarch64-windows func-arm64.s -o func-arm64.obj
// RUN: lld-link -machine:arm64x -dll -noentry -out:out.dll func-arm64ec.obj func-arm64.obj
// RUN: llvm-objdump -d out.dll | FileCheck %s
// CHECK: 0000000180001000 <.text>:
// CHECK-NEXT: 180001000: 52800020 mov w0, #0x1 // =1
// CHECK-NEXT: 180001004: d65f03c0 ret
// CHECK-NEXT: ...
// CHECK-NEXT: 180002000: 52800020 mov w0, #0x1 // =1
// CHECK-NEXT: 180002004: d65f03c0 ret
#--- func-arm64.s
.section .text,"xr",discard,func
.globl func
.p2align 2
func:
mov w0, #1
ret
.data
.rva func
#--- func-arm64ec.s
.section .text,"xr",discard,"#func"
.globl "#func"
.p2align 2
"#func":
mov w0, #1
ret
.data
.rva "#func"