Skip to content

Commit aef2ad3

Browse files
committed
Make it not a safepoint for codegen
1 parent 6c28030 commit aef2ad3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/llvm-late-gc-lowering.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,7 @@ State LateLowerGCFrame::LocalScan(Function &F) {
16211621
callee == pgcstack_getter || callee->getName() == XSTR(jl_egal__unboxed) ||
16221622
callee->getName() == XSTR(jl_lock_value) || callee->getName() == XSTR(jl_unlock_value) ||
16231623
callee->getName() == XSTR(jl_lock_field) || callee->getName() == XSTR(jl_unlock_field) ||
1624-
callee == write_barrier_func || callee == gc_loaded_func ||
1624+
callee == write_barrier_func || callee == gc_loaded_func || callee == pop_handler_noexcept_func ||
16251625
callee->getName() == "memcmp") {
16261626
continue;
16271627
}

src/llvm-pass-helpers.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ JuliaPassContext::JuliaPassContext()
2727
pgcstack_getter(nullptr), adoptthread_func(nullptr), gc_flush_func(nullptr),
2828
gc_preserve_begin_func(nullptr), gc_preserve_end_func(nullptr),
2929
pointer_from_objref_func(nullptr), gc_loaded_func(nullptr), alloc_obj_func(nullptr),
30-
typeof_func(nullptr), write_barrier_func(nullptr), pop_handler_noexcept(nullptr),
30+
typeof_func(nullptr), write_barrier_func(nullptr), pop_handler_noexcept_func(nullptr),
3131
call_func(nullptr), call2_func(nullptr), call3_func(nullptr), module(nullptr)
3232
{
3333
}
@@ -53,7 +53,7 @@ void JuliaPassContext::initFunctions(Module &M)
5353
typeof_func = M.getFunction("julia.typeof");
5454
write_barrier_func = M.getFunction("julia.write_barrier");
5555
alloc_obj_func = M.getFunction("julia.gc_alloc_obj");
56-
pop_handler_noexcept = M.getFunction(XSTR(jl_pop_handler_noexcept));
56+
pop_handler_noexcept_func = M.getFunction(XSTR(jl_pop_handler_noexcept));
5757
call_func = M.getFunction("julia.call");
5858
call2_func = M.getFunction("julia.call2");
5959
call3_func = M.getFunction("julia.call3");

src/llvm-pass-helpers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ struct JuliaPassContext {
6060
llvm::Function *alloc_obj_func;
6161
llvm::Function *typeof_func;
6262
llvm::Function *write_barrier_func;
63-
llvm::Function *pop_handler_noexcept;
63+
llvm::Function *pop_handler_noexcept_func;
6464
llvm::Function *call_func;
6565
llvm::Function *call2_func;
6666
llvm::Function *call3_func;

0 commit comments

Comments
 (0)