Skip to content

codegen: Use emit_static_roots for "allroots" case #60656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
topolarity merged 1 commit into from
Jan 14, 2026
Merged

codegen: Use emit_static_roots for "allroots" case #60656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/codegen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5273,7 +5273,11 @@ static jl_cgval_t emit_call_specfun_other(jl_codectx_t &ctx, bool is_opaque_clos
AllocaInst *result = nullptr;

if (returninfo.cc == jl_returninfo_t::SRet || returninfo.cc == jl_returninfo_t::Union) {
result = emit_static_alloca(ctx, returninfo.union_bytes, Align(returninfo.union_align));
if (returninfo.all_roots) {
result = emit_static_roots(ctx, returninfo.union_bytes / sizeof(void *));
} else {
result = emit_static_alloca(ctx, returninfo.union_bytes, Align(returninfo.union_align));
}
setName(ctx.emission_context, result, "sret_box");
argvals[idx] = result;
idx++;
Expand Down Expand Up @@ -8179,7 +8183,6 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
Type *rt = NULL;
Type *srt = NULL;
Type *T_prjlvalue = PointerType::get(M->getContext(), AddressSpace::Tracked);
bool all_roots = false;
uint64_t tracked_count = 0;
if (jlrettype == (jl_value_t*)jl_bottom_type) {
rt = getVoidTy(M->getContext());
Expand All @@ -8199,8 +8202,8 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
// convert all_roots to only union_bytes
props.union_bytes = return_roots * sizeof(void*);
props.union_minalign = props.union_align = sizeof(void*);
//props.all_roots = true;
//return_roots = 0;
//all_roots = true;
}
props.return_roots = (int) return_roots;
if (props.union_bytes) {
Expand All @@ -8225,7 +8228,6 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
if (rt != getVoidTy(M->getContext()) && deserves_sret(jlrettype, rt)) {
auto tracked = CountTrackedPointers(rt, true);
assert(!tracked.derived);
all_roots = tracked.all;
tracked_count = tracked.count;
if (tracked.count && !tracked.all) {
props.return_roots = tracked.count;
Expand All @@ -8234,6 +8236,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
props.cc = jl_returninfo_t::SRet;
props.union_bytes = jl_datatype_size(jlrettype);
props.union_align = props.union_minalign = julia_alignment(jlrettype);
props.all_roots = tracked.all;
// sret is always passed from alloca
assert(M);
fsig.push_back(PointerType::get(M->getContext(), M->getDataLayout().getAllocaAddrSpace()));
Expand All @@ -8254,7 +8257,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
assert(srt);
AttrBuilder param(M->getContext());
param.addStructRetAttr(srt);
if (all_roots) {
if (props.all_roots) {
assert(!props.return_roots);
param.addAttribute("julia.return_roots", std::to_string(tracked_count));
}
Expand All @@ -8266,7 +8269,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
}
if (props.cc == jl_returninfo_t::Union) {
AttrBuilder param(M->getContext());
if (all_roots) {
if (props.all_roots) {
assert(!props.return_roots);
param.addAttribute("julia.return_roots", std::to_string(tracked_count));
}
Expand Down
1 change: 1 addition & 0 deletions src/jitlayers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ struct jl_returninfo_t {
size_t union_align;
size_t union_minalign;
unsigned return_roots;
bool all_roots;
};

struct jl_codegen_call_target_t {
Expand Down