Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-12-24 17:01:07 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[ORC] Fix sorting of contructors by priority

Browse Source 
The code was incorrectly sorting by the function address.

Differential Revision: https://reviews.llvm.org/D123311
This commit is contained in:
Jonas Hahnfeld 2022-04-07 16:19:11 +02:00
parent 85285be9c3
commit e451d55234
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/ExecutionEngine/Orc/LLJIT.cpp
View File

@ -524,7 +524,7 @@ GlobalCtorDtorScraper::operator()(ThreadSafeModule TSM,
llvm::sort(InitsOrDeInits, llvm::sort(InitsOrDeInits,
[](const std::pair<Function *, unsigned> &LHS, [](const std::pair<Function *, unsigned> &LHS,
const std::pair<Function *, unsigned> &RHS) { const std::pair<Function *, unsigned> &RHS) {
return LHS.first < RHS.first; return LHS.second < RHS.second;
}); });
auto *InitOrDeInitFuncEntryBlock = auto *InitOrDeInitFuncEntryBlock =

10
llvm/test/ExecutionEngine/OrcLazy/global-ctors-and-dtors.ll
View File

@ -8,6 +8,7 @@
; RUN: lli -jit-kind=orc-lazy -orc-lazy-debug=funcs-to-stdout \ ; RUN: lli -jit-kind=orc-lazy -orc-lazy-debug=funcs-to-stdout \
; RUN: -jd extra -extra-module %s -jd main %S/Inputs/noop-main.ll | FileCheck %s ; RUN: -jd extra -extra-module %s -jd main %S/Inputs/noop-main.ll | FileCheck %s
; ;
; CHECK: Hello from constructor
; CHECK: Hello ; CHECK: Hello
; CHECK: [ {{.*}}main{{.*}} ] ; CHECK: [ {{.*}}main{{.*}} ]
; CHECK: Goodbye ; CHECK: Goodbye
@ -17,11 +18,12 @@
@f = global %class.Foo zeroinitializer, align 1 @f = global %class.Foo zeroinitializer, align 1
@__dso_handle = external global i8 @__dso_handle = external global i8
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_hello.cpp, i8* null }] @llvm.global_ctors = appending global [2 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_hello.cpp, i8* null }, { i32, void ()*, i8* } { i32 1024, void ()* @constructor, i8* null }]
@llvm.global_dtors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @printf_wrapper, i8* null }] @llvm.global_dtors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @printf_wrapper, i8* null }]
@str = private unnamed_addr constant [6 x i8] c"Hello\00" @str = private unnamed_addr constant [6 x i8] c"Hello\00"
@str2 = private unnamed_addr constant [8 x i8] c"Goodbye\00" @str2 = private unnamed_addr constant [8 x i8] c"Goodbye\00"
@str3 = global [14 x i8] c"Goodbye again\00" @str3 = global [14 x i8] c"Goodbye again\00"
@str4 = private unnamed_addr constant [23 x i8] c"Hello from constructor\00"
define linkonce_odr void @_ZN3FooD1Ev(%class.Foo* nocapture readnone %this) unnamed_addr align 2 { define linkonce_odr void @_ZN3FooD1Ev(%class.Foo* nocapture readnone %this) unnamed_addr align 2 {
entry: entry:
@ -45,3 +47,9 @@ entry:
} }
declare i32 @puts(i8* nocapture readonly) declare i32 @puts(i8* nocapture readonly)
define void @constructor() {
entry:
%0 = tail call i32 @puts(i8* getelementptr inbounds ([23 x i8], [23 x i8]* @str4, i64 0, i64 0))
ret void
}