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

Support for calling non-generic methods in a specific class. (#4156)

Browse Source 
Use the specific parameter types for checking, and the specific return
type as the type of the call.
This commit is contained in:
Richard Smith
2024-07-24 20:27:01 +00:00
committed by GitHub
parent 7ded56ef35
commit 07bad72d86
54 changed files with 1469 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/function.cpp
+23 -11
View File
@@ -21,9 +21,12 @@ auto CheckFunctionTypeMatches(Context& context,
return false;
}
auto new_return_type_id = new_function.declared_return_type(context.sem_ir());
auto prev_return_type_id =
prev_function.declared_return_type(context.sem_ir());
// TODO: Pass a specific ID for `prev_function` instead of substitutions and
// use it here.
auto new_return_type_id =
new_function.GetDeclaredReturnType(context.sem_ir());
auto prev_return_type_id = prev_function.GetDeclaredReturnType(
context.sem_ir(), SemIR::GenericInstanceId::Invalid);
if (new_return_type_id == SemIR::TypeId::Error ||
prev_return_type_id == SemIR::TypeId::Error) {
return false;
@@ -68,19 +71,23 @@ auto CheckFunctionTypeMatches(Context& context,
}
auto CheckFunctionReturnType(Context& context, SemIRLoc loc,
SemIR::Function& function) -> void {
SemIR::Function& function,
SemIR::GenericInstanceId specific_id)
-> SemIR::Function::ReturnSlot {
// If we have already checked the return type, we have nothing to do.
if (function.return_slot != SemIR::Function::ReturnSlot::NotComputed) {
return;
if (function.return_slot != SemIR::Function::ReturnSlot::NotComputed &&
!specific_id.is_valid()) {
return function.return_slot;
}
if (!function.return_storage_id.is_valid()) {
// Implicit `-> ()` has no return slot.
function.return_slot = SemIR::Function::ReturnSlot::Absent;
return;
return function.return_slot;
}
auto return_type_id = function.declared_return_type(context.sem_ir());
auto return_type_id =
function.GetDeclaredReturnType(context.sem_ir(), specific_id);
CARBON_CHECK(return_type_id.is_valid())
<< "Have return storage but no return type.";
@@ -92,18 +99,23 @@ auto CheckFunctionReturnType(Context& context, SemIRLoc loc,
return context.emitter().Build(loc, IncompleteTypeInFunctionReturnType,
return_type_id);
};
SemIR::Function::ReturnSlot result;
if (!context.TryToCompleteType(
return_type_id,
function.return_slot == SemIR::Function::ReturnSlot::Error
? std::nullopt
: std::optional(diagnose_incomplete_return_type))) {
function.return_slot = SemIR::Function::ReturnSlot::Error;
result = SemIR::Function::ReturnSlot::Error;
} else if (SemIR::GetInitRepr(context.sem_ir(), return_type_id)
.has_return_slot()) {
function.return_slot = SemIR::Function::ReturnSlot::Present;
result = SemIR::Function::ReturnSlot::Present;
} else {
function.return_slot = SemIR::Function::ReturnSlot::Absent;
result = SemIR::Function::ReturnSlot::Absent;
}
if (!specific_id.is_valid()) {
function.return_slot = result;
}
return result;
}
} // namespace Carbon::Check