Skip to content

Commit a31263b

Browse files
MaskRayAlexisPerry
authored andcommitted
[LowerTypeTests] Use MapVector to stabilize iteration order
Otherwise llvm/test/LTO/X86/cfi_jt_aliases.ll could fail when DenseMapInfo<StringRef> changes.
1 parent ed1bd3c commit a31263b

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

llvm/lib/Transforms/IPO/LowerTypeTests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2074,7 +2074,7 @@ bool LowerTypeTestsModule::lower() {
20742074
CfiFunctionLinkage Linkage;
20752075
MDNode *FuncMD; // {name, linkage, type[, type...]}
20762076
};
2077-
DenseMap<StringRef, ExportedFunctionInfo> ExportedFunctions;
2077+
MapVector<StringRef, ExportedFunctionInfo> ExportedFunctions;
20782078
if (ExportSummary) {
20792079
// A set of all functions that are address taken by a live global object.
20802080
DenseSet<GlobalValue::GUID> AddressTaken;

llvm/test/LTO/X86/cfi_jt_aliases.ll

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
; CHECK-FULL-RE-NEXT: FUNC LOCAL DEFAULT {{[0-9]+}} b.cfi_jt
2323
; CHECK-FULL-RE-NEXT: FUNC LOCAL DEFAULT {{[0-9]+}} c.cfi_jt
2424

25-
; CHECK-THIN-RE: FUNC GLOBAL HIDDEN {{[0-9]+}} b.cfi_jt
25+
; CHECK-THIN-RE: FUNC GLOBAL HIDDEN {{[0-9]+}} a.cfi_jt
26+
; CHECK-THIN-RE-NEXT: FUNC GLOBAL HIDDEN {{[0-9]+}} b.cfi_jt
2627
; CHECK-THIN-RE-NEXT: FUNC GLOBAL HIDDEN {{[0-9]+}} c.cfi_jt
27-
; CHECK-THIN-RE-NEXT: FUNC GLOBAL HIDDEN {{[0-9]+}} a.cfi_jt
2828

2929
; CHECK-FULL-OD: a.cfi_jt>:
3030
; CHECK-FULL-OD: jmp {{.*}} <a.cfi_jt
@@ -36,15 +36,15 @@
3636
; CHECK-FULL-OD: jmp {{.*}} <c.cfi_jt
3737
; CHECK-FULL-OD-NEXT: R_X86_64_PLT32 .Lc$local
3838

39+
; CHECK-THIN-OD: a.cfi_jt>:
40+
; CHECK-THIN-OD: jmp {{.*}} <a.cfi_jt
41+
; CHECK-THIN-OD-NEXT: R_X86_64_PLT32 a
3942
; CHECK-THIN-OD: b.cfi_jt>:
4043
; CHECK-THIN-OD: jmp {{.*}} <b.cfi_jt
4144
; CHECK-THIN-OD-NEXT: R_X86_64_PLT32 b
4245
; CHECK-THIN-OD: c.cfi_jt>:
4346
; CHECK-THIN-OD: jmp {{.*}} <c.cfi_jt
4447
; CHECK-THIN-OD-NEXT: R_X86_64_PLT32 c
45-
; CHECK-THIN-OD: a.cfi_jt>:
46-
; CHECK-THIN-OD: jmp {{.*}} <a.cfi_jt
47-
; CHECK-THIN-OD-NEXT: R_X86_64_PLT32 a
4848

4949
; CHECK-USED: @llvm.used = appending global [3 x ptr] [ptr @a.cfi_jt, ptr @b.cfi_jt, ptr @c.cfi_jt], section "llvm.metadata"
5050

0 commit comments

Comments
 (0)