carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 19:20:13 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactors PerformCppOverloadResolution to take CppOverloadSet (#6829)

Browse Source 
`PerformCppOverloadResolution` computes an overload set from a
`CppOverloadSetId`, but the compiler sometimes needs to synthesise a
local overload set for witnesses. `PerformCppOverloadResolution` now
requires callers to produce the `CppOverloadSet` to address this
problem.
This commit is contained in:
Christopher Di Bella
2026-03-04 19:02:33 +00:00
committed by GitHub
parent 1c7a4030ab
commit b28e899a8c
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/cpp/call.cpp
+3 -3
View File
@@ -57,9 +57,9 @@ auto PerformCallToCppFunction(Context& context, SemIR::LocId loc_id,
bool is_operator_syntax) -> SemIR::InstId {
auto [template_arg_ids, function_arg_ids] =
SplitCallArgumentList(context, arg_ids);
auto callee_id =
PerformCppOverloadResolution(context, loc_id, overload_set_id,
template_arg_ids, self_id, function_arg_ids);
auto callee_id = PerformCppOverloadResolution(
context, loc_id, context.cpp_overload_sets().Get(overload_set_id),
template_arg_ids, self_id, function_arg_ids);
SemIR::Callee callee = GetCallee(context.sem_ir(), callee_id);
CARBON_KIND_SWITCH(callee) {
case CARBON_KIND(SemIR::CalleeError _): {
toolchain/check/cpp/overload_resolution.cpp
+1 -4
View File
@@ -132,7 +132,7 @@ auto CheckCppOverloadAccess(
auto PerformCppOverloadResolution(
Context& context, SemIR::LocId loc_id,
SemIR::CppOverloadSetId overload_set_id,
const SemIR::CppOverloadSet& overload_set,
llvm::ArrayRef<SemIR::InstId> template_arg_ids, SemIR::InstId self_id,
llvm::ArrayRef<SemIR::InstId> arg_ids) -> SemIR::InstId {
// Register an annotation scope to flush any Clang diagnostics when we return.
@@ -155,9 +155,6 @@ auto PerformCppOverloadResolution(
}
auto& arg_exprs = *maybe_arg_exprs;
const SemIR::CppOverloadSet& overload_set =
context.cpp_overload_sets().Get(overload_set_id);
clang::SourceLocation loc = GetCppLocation(context, loc_id);
// Add candidate functions from the name lookup.
toolchain/check/cpp/overload_resolution.h
+1 -1
View File
@@ -31,7 +31,7 @@ auto CheckCppOverloadAccess(
// migrations so that the migrated callers from C++ remain valid.
auto PerformCppOverloadResolution(
Context& context, SemIR::LocId loc_id,
SemIR::CppOverloadSetId overload_set_id,
const SemIR::CppOverloadSet& overload_set,
llvm::ArrayRef<SemIR::InstId> template_arg_ids, SemIR::InstId self_id,
llvm::ArrayRef<SemIR::InstId> arg_ids) -> SemIR::InstId;