aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFangrui Song <i@maskray.me>2024-06-19 15:11:25 -0700
committerFangrui Song <i@maskray.me>2024-06-19 15:11:25 -0700
commit86eb6bf6715c87425284902fe9e2e41e86937f23 (patch)
treebe7fc43863e4ab14870183dd11206623643a62aa
parent61e62ce2ebde23937af3e4ca2d84195bb00dbe05 (diff)
downloadllvm-86eb6bf6715c87425284902fe9e2e41e86937f23.zip
llvm-86eb6bf6715c87425284902fe9e2e41e86937f23.tar.gz
llvm-86eb6bf6715c87425284902fe9e2e41e86937f23.tar.bz2
[LowerTypeTests] Use MapVector to stabilize iteration order
Otherwise llvm/test/LTO/X86/cfi_jt_aliases.ll could fail when DenseMapInfo<StringRef> changes.
-rw-r--r--llvm/lib/Transforms/IPO/LowerTypeTests.cpp2
-rw-r--r--llvm/test/LTO/X86/cfi_jt_aliases.ll10
2 files changed, 6 insertions, 6 deletions
diff --git a/llvm/lib/Transforms/IPO/LowerTypeTests.cpp b/llvm/lib/Transforms/IPO/LowerTypeTests.cpp
index f86f217..9a78c77 100644
--- a/llvm/lib/Transforms/IPO/LowerTypeTests.cpp
+++ b/llvm/lib/Transforms/IPO/LowerTypeTests.cpp
@@ -2074,7 +2074,7 @@ bool LowerTypeTestsModule::lower() {
CfiFunctionLinkage Linkage;
MDNode *FuncMD; // {name, linkage, type[, type...]}
};
- DenseMap<StringRef, ExportedFunctionInfo> ExportedFunctions;
+ MapVector<StringRef, ExportedFunctionInfo> ExportedFunctions;
if (ExportSummary) {
// A set of all functions that are address taken by a live global object.
DenseSet<GlobalValue::GUID> AddressTaken;
diff --git a/llvm/test/LTO/X86/cfi_jt_aliases.ll b/llvm/test/LTO/X86/cfi_jt_aliases.ll
index 9d114f4..c58d2cc 100644
--- a/llvm/test/LTO/X86/cfi_jt_aliases.ll
+++ b/llvm/test/LTO/X86/cfi_jt_aliases.ll
@@ -22,9 +22,9 @@
; CHECK-FULL-RE-NEXT: FUNC LOCAL DEFAULT {{[0-9]+}} b.cfi_jt
; CHECK-FULL-RE-NEXT: FUNC LOCAL DEFAULT {{[0-9]+}} c.cfi_jt
-; CHECK-THIN-RE: FUNC GLOBAL HIDDEN {{[0-9]+}} b.cfi_jt
+; CHECK-THIN-RE: FUNC GLOBAL HIDDEN {{[0-9]+}} a.cfi_jt
+; CHECK-THIN-RE-NEXT: FUNC GLOBAL HIDDEN {{[0-9]+}} b.cfi_jt
; CHECK-THIN-RE-NEXT: FUNC GLOBAL HIDDEN {{[0-9]+}} c.cfi_jt
-; CHECK-THIN-RE-NEXT: FUNC GLOBAL HIDDEN {{[0-9]+}} a.cfi_jt
; CHECK-FULL-OD: a.cfi_jt>:
; CHECK-FULL-OD: jmp {{.*}} <a.cfi_jt
@@ -36,15 +36,15 @@
; CHECK-FULL-OD: jmp {{.*}} <c.cfi_jt
; CHECK-FULL-OD-NEXT: R_X86_64_PLT32 .Lc$local
+; CHECK-THIN-OD: a.cfi_jt>:
+; CHECK-THIN-OD: jmp {{.*}} <a.cfi_jt
+; CHECK-THIN-OD-NEXT: R_X86_64_PLT32 a
; CHECK-THIN-OD: b.cfi_jt>:
; CHECK-THIN-OD: jmp {{.*}} <b.cfi_jt
; CHECK-THIN-OD-NEXT: R_X86_64_PLT32 b
; CHECK-THIN-OD: c.cfi_jt>:
; CHECK-THIN-OD: jmp {{.*}} <c.cfi_jt
; CHECK-THIN-OD-NEXT: R_X86_64_PLT32 c
-; CHECK-THIN-OD: a.cfi_jt>:
-; CHECK-THIN-OD: jmp {{.*}} <a.cfi_jt
-; CHECK-THIN-OD-NEXT: R_X86_64_PLT32 a
; CHECK-USED: @llvm.used = appending global [3 x ptr] [ptr @a.cfi_jt, ptr @b.cfi_jt, ptr @c.cfi_jt], section "llvm.metadata"