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

Remove return_type_id from Function. (#4051)

Browse Source 
Instead of redundantly storing both the `return_type_id` and
`return_storage_id`, where the declared return type is just the type of
the return storage, store only the `return_storage_id`.

Add a convenience property to get the declared return type of the
function.

In addition to avoiding storing redundant information, this is a
preparatory step for an upcoming change for generics support that will
make it more expensive and awkward to store `TypeId`s in places other
than the type of an instruction.
This commit is contained in:
Richard Smith
2024-06-13 22:01:21 +00:00
committed by GitHub
parent d18584c6c2
commit e3c15edb92
12 changed files with 68 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/function.cpp
+20 -13
View File
@@ -19,15 +19,18 @@ auto CheckFunctionTypeMatches(Context& context,
return false;
}
if (new_function.return_type_id == SemIR::TypeId::Error ||
prev_function.return_type_id == SemIR::TypeId::Error) {
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());
if (new_return_type_id == SemIR::TypeId::Error ||
prev_return_type_id == SemIR::TypeId::Error) {
return false;
}
auto prev_return_type_id =
prev_function.return_type_id.is_valid()
? SubstType(context, prev_function.return_type_id, substitutions)
: SemIR::TypeId::Invalid;
if (new_function.return_type_id != prev_return_type_id) {
if (prev_return_type_id.is_valid()) {
prev_return_type_id =
SubstType(context, prev_return_type_id, substitutions);
}
if (new_return_type_id != prev_return_type_id) {
CARBON_DIAGNOSTIC(
FunctionRedeclReturnTypeDiffers, Error,
"Function redeclaration differs because return type is `{0}`.",
@@ -36,10 +39,10 @@ auto CheckFunctionTypeMatches(Context& context,
FunctionRedeclReturnTypeDiffersNoReturn, Error,
"Function redeclaration differs because no return type is provided.");
auto diag =
new_function.return_type_id.is_valid()
new_return_type_id.is_valid()
? context.emitter().Build(new_function.decl_id,
FunctionRedeclReturnTypeDiffers,
new_function.return_type_id)
new_return_type_id)
: context.emitter().Build(new_function.decl_id,
FunctionRedeclReturnTypeDiffersNoReturn);
if (prev_return_type_id.is_valid()) {
@@ -68,27 +71,31 @@ auto CheckFunctionReturnType(Context& context, SemIRLoc loc,
return;
}
if (!function.return_type_id.is_valid()) {
if (!function.return_storage_id.is_valid()) {
// Implicit `-> ()` has no return slot.
function.return_slot = SemIR::Function::ReturnSlot::Absent;
return;
}
auto return_type_id = function.declared_return_type(context.sem_ir());
CARBON_CHECK(return_type_id.is_valid())
<< "Have return storage but no return type.";
// Check the return type is complete. Only diagnose incompleteness if we've
// not already done so.
auto diagnose_incomplete_return_type = [&] {
CARBON_DIAGNOSTIC(IncompleteTypeInFunctionReturnType, Error,
"Function returns incomplete type `{0}`.", SemIR::TypeId);
return context.emitter().Build(loc, IncompleteTypeInFunctionReturnType,
function.return_type_id);
return_type_id);
};
if (!context.TryToCompleteType(
function.return_type_id,
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;
} else if (SemIR::GetInitRepr(context.sem_ir(), function.return_type_id)
} else if (SemIR::GetInitRepr(context.sem_ir(), return_type_id)
.has_return_slot()) {
function.return_slot = SemIR::Function::ReturnSlot::Present;
} else {