[lld] [LLD][COFF] Check machine types in ICF::equalsConstant. (PR #88140)
via llvm-commits
llvm-commits at lists.llvm.org
Tue Apr 9 08:50:08 PDT 2024
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-lld-coff
@llvm/pr-subscribers-lld
Author: Jacek Caban (cjacek)
<details>
<summary>Changes</summary>
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 on pure ARM64EC between arm64ec and x86_64 chunks.
---
Full diff: https://github.com/llvm/llvm-project/pull/88140.diff
2 Files Affected:
- (modified) lld/COFF/ICF.cpp (+1-1)
- (added) lld/test/COFF/arm64x-icf.s (+37)
``````````diff
diff --git a/lld/COFF/ICF.cpp b/lld/COFF/ICF.cpp
index 013ffcfb3d5d1a..b899a25324239d 100644
--- a/lld/COFF/ICF.cpp
+++ b/lld/COFF/ICF.cpp
@@ -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.
diff --git a/lld/test/COFF/arm64x-icf.s b/lld/test/COFF/arm64x-icf.s
new file mode 100644
index 00000000000000..c8df21d3e49699
--- /dev/null
+++ b/lld/test/COFF/arm64x-icf.s
@@ -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"
``````````
</details>
https://github.com/llvm/llvm-project/pull/88140
More information about the llvm-commits
mailing list