carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-04 18:41:03 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Create a Call instruction directly when building a thunk call. (#6276)

Browse Source 
Don't go through the `PerformCall` machinery a second recursive time --
this is redundant, creates additional unnecessary temporaries, and is in
theory wrong because `PerformCall` takes a syntactic argument list (one
argument per callee parameter pattern), but we have a call argument list
(one argument per callee parameter).

---------

Co-authored-by: David Blaikie <dblaikie@gmail.com>
This commit is contained in:
Richard Smith
2025-10-27 21:22:24 +00:00
committed by GitHub
co-authored by David Blaikie
parent 1aade74693
commit f022e91e45
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/cpp/thunk.cpp
+17 -1
View File
@@ -669,9 +669,25 @@ auto PerformCppThunkCall(Context& context, SemIR::LocId loc_id,
context.insts().Get(return_slot_id).type_id())),
.lvalue_id = return_slot_id});
thunk_arg_ids.push_back(arg_id);
} else if (return_slot_id.has_value()) {
thunk_arg_ids.push_back(return_slot_id);
}
auto result_id = PerformCall(context, loc_id, thunk_callee_id, thunk_arg_ids);
// Compute the return type of the call to the thunk.
auto thunk_return_type_id =
thunk_function.GetDeclaredReturnType(context.sem_ir());
if (!thunk_return_type_id.has_value()) {
CARBON_CHECK(thunk_takes_return_address || !return_type_id.has_value());
thunk_return_type_id = GetTupleType(context, {});
} else {
CARBON_CHECK(thunk_return_type_id == return_type_id);
}
auto result_id = GetOrAddInst<SemIR::Call>(
context, loc_id,
{.type_id = thunk_return_type_id,
.callee_id = thunk_callee_id,
.args_id = context.inst_blocks().Add(thunk_arg_ids)});
// Produce the result of the call, taking the value from the return storage.
if (thunk_takes_return_address) {