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

Track complete types required by a generic. (#4652)

Browse Source 
When a generic requires a symbolic type to be complete, add a new
`require_complete_type` instruction to the generic eval block. During
monomorphization of such an instruction, require that type to be
complete.
This commit is contained in:
Richard Smith
2024-12-10 03:00:28 +00:00
committed by GitHub
parent e75ef34591
commit eabe9f117a
107 changed files with 1357 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/context.cpp
+28 -16
View File
@@ -498,7 +498,7 @@ struct ProhibitedAccessInfo {
};
auto Context::AppendLookupScopesForConstant(
SemIRLoc loc, SemIR::ConstantId base_const_id,
SemIR::LocId loc_id, SemIR::ConstantId base_const_id,
llvm::SmallVector<LookupScope>* scopes) -> bool {
auto base_id = constant_values().GetInstId(base_const_id);
auto base = insts().Get(base_id);
@@ -509,11 +509,12 @@ auto Context::AppendLookupScopesForConstant(
return true;
}
if (auto base_as_class = base.TryAs<SemIR::ClassType>()) {
TryToDefineType(GetTypeIdForTypeConstant(base_const_id), [&] {
TryToDefineType(GetTypeIdForTypeConstant(base_const_id), loc_id, [&] {
CARBON_DIAGNOSTIC(QualifiedExprInIncompleteClassScope, Error,
"member access into incomplete class {0}",
InstIdAsType);
return emitter().Build(loc, QualifiedExprInIncompleteClassScope, base_id);
return emitter().Build(loc_id, QualifiedExprInIncompleteClassScope,
base_id);
});
auto& class_info = classes().Get(base_as_class->class_id);
scopes->push_back(LookupScope{.name_scope_id = class_info.scope_id,
@@ -521,11 +522,11 @@ auto Context::AppendLookupScopesForConstant(
return true;
}
if (auto base_as_facet_type = base.TryAs<SemIR::FacetType>()) {
TryToDefineType(GetTypeIdForTypeConstant(base_const_id), [&] {
TryToDefineType(GetTypeIdForTypeConstant(base_const_id), loc_id, [&] {
CARBON_DIAGNOSTIC(QualifiedExprInUndefinedInterfaceScope, Error,
"member access into undefined interface {0}",
InstIdAsType);
return emitter().Build(loc, QualifiedExprInUndefinedInterfaceScope,
return emitter().Build(loc_id, QualifiedExprInUndefinedInterfaceScope,
base_id);
});
const auto& facet_type_info =
@@ -550,7 +551,7 @@ auto Context::AppendLookupScopesForConstant(
return false;
}
auto Context::LookupQualifiedName(SemIRLoc loc, SemIR::NameId name_id,
auto Context::LookupQualifiedName(SemIR::LocId loc_id, SemIR::NameId name_id,
llvm::ArrayRef<LookupScope> lookup_scopes,
bool required,
std::optional<AccessInfo> access_info)
@@ -576,7 +577,7 @@ auto Context::LookupQualifiedName(SemIRLoc loc, SemIR::NameId name_id,
has_error |= name_scope.has_error();
auto [scope_result_id, access_kind] =
LookupNameInExactScope(loc, name_id, scope_id, name_scope);
LookupNameInExactScope(loc_id, name_id, scope_id, name_scope);
auto is_access_prohibited =
IsAccessProhibited(access_info, access_kind, is_parent_access);
@@ -610,7 +611,7 @@ auto Context::LookupQualifiedName(SemIRLoc loc, SemIR::NameId name_id,
"declared as an extended scope here");
builder.Note(extended_id, FromExtendHere);
});
if (!AppendLookupScopesForConstant(loc, const_id, &scopes)) {
if (!AppendLookupScopesForConstant(loc_id, const_id, &scopes)) {
// TODO: Handle case where we have a symbolic type and instead should
// look in its type.
}
@@ -625,7 +626,7 @@ auto Context::LookupQualifiedName(SemIRLoc loc, SemIR::NameId name_id,
NameAmbiguousDueToExtend, Error,
"ambiguous use of name `{0}` found in multiple extended scopes",
SemIR::NameId);
emitter_->Emit(loc, NameAmbiguousDueToExtend, name_id);
emitter_->Emit(loc_id, NameAmbiguousDueToExtend, name_id);
// TODO: Add notes pointing to the scopes.
return {.specific_id = SemIR::SpecificId::Invalid,
.inst_id = SemIR::ErrorInst::SingletonInstId};
@@ -638,7 +639,7 @@ auto Context::LookupQualifiedName(SemIRLoc loc, SemIR::NameId name_id,
if (required && !result.inst_id.is_valid()) {
if (!has_error) {
if (prohibited_accesses.empty()) {
DiagnoseMemberNameNotFound(loc, name_id, lookup_scopes);
DiagnoseMemberNameNotFound(loc_id, name_id, lookup_scopes);
} else {
// TODO: We should report multiple prohibited accesses in case we don't
// find a valid lookup. Reporting the last one should suffice for now.
@@ -647,9 +648,9 @@ auto Context::LookupQualifiedName(SemIRLoc loc, SemIR::NameId name_id,
// Note, `access_info` is guaranteed to have a value here, since
// `prohibited_accesses` is non-empty.
DiagnoseInvalidQualifiedNameAccess(*this, loc, scope_result_id, name_id,
access_kind, is_parent_access,
*access_info);
DiagnoseInvalidQualifiedNameAccess(*this, loc_id, scope_result_id,
name_id, access_kind,
is_parent_access, *access_info);
}
}
@@ -1278,13 +1279,24 @@ class TypeCompleter {
};
} // namespace
auto Context::TryToCompleteType(SemIR::TypeId type_id,
auto Context::TryToCompleteType(SemIR::TypeId type_id, SemIR::LocId loc_id,
BuildDiagnosticFn diagnoser,
BuildDiagnosticFn abstract_diagnoser) -> bool {
if (!TypeCompleter(*this, diagnoser).Complete(type_id)) {
return false;
}
// For a symbolic type, create an instruction to require the corresponding
// specific type to be complete.
if (diagnoser && type_id.AsConstantId().is_symbolic()) {
// TODO: Deduplicate these.
AddInstInNoBlock(SemIR::LocIdAndInst(
loc_id,
SemIR::RequireCompleteType{
.type_id = GetSingletonType(SemIR::WitnessType::SingletonInstId),
.complete_type_id = type_id}));
}
if (!abstract_diagnoser) {
return true;
}
@@ -1308,9 +1320,9 @@ auto Context::TryToCompleteType(SemIR::TypeId type_id,
return true;
}
auto Context::TryToDefineType(SemIR::TypeId type_id,
auto Context::TryToDefineType(SemIR::TypeId type_id, SemIR::LocId loc_id,
BuildDiagnosticFn diagnoser) -> bool {
if (!TryToCompleteType(type_id, diagnoser)) {
if (!TryToCompleteType(type_id, loc_id, diagnoser)) {
return false;
}