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

Change TypeCompleter.context_ from reference to pointer (#5206)

Browse Source 
Per [the style
guide](https://github.com/carbon-language/carbon-lang/blob/trunk/docs/project/cpp_style_guide.md#syntax-and-formatting):
* If it is captured and must outlive the call expression itself, use a
pointer and document that it must not be null (unless it is also
optional).
* When storing an object's address as a non-owned member, prefer storing
a pointer.
This commit is contained in:
Boaz Brickner
2025-03-28 15:29:02 +00:00
committed by GitHub
parent afe034f9f4
commit 624ebbd805
1 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/type_completion.cpp
+45 -41
View File
@@ -29,7 +29,8 @@ namespace {
// its nested types are complete, and marks the type as complete.
class TypeCompleter {
public:
TypeCompleter(Context& context, SemIRLoc loc,
// `context` mut not be null.
TypeCompleter(Context* context, SemIRLoc loc,
MakeDiagnosticBuilderFn diagnoser)
: context_(context), loc_(loc), diagnoser_(diagnoser) {}
@@ -158,7 +159,7 @@ class TypeCompleter {
auto BuildInfo(SemIR::TypeId type_id, SemIR::Inst inst) const
-> SemIR::CompleteTypeInfo;
Context& context_;
Context* context_;
llvm::SmallVector<WorkItem> work_list_;
SemIRLoc loc_;
MakeDiagnosticBuilderFn diagnoser_;
@@ -176,7 +177,7 @@ auto TypeCompleter::Complete(SemIR::TypeId type_id) -> bool {
}
auto TypeCompleter::Push(SemIR::TypeId type_id) -> void {
if (!context_.types().IsComplete(type_id)) {
if (!context_->types().IsComplete(type_id)) {
work_list_.push_back(
{.type_id = type_id, .phase = Phase::AddNestedIncompleteTypes});
}
@@ -187,13 +188,13 @@ auto TypeCompleter::ProcessStep() -> bool {
// We might have enqueued the same type more than once. Just skip the
// type if it's already complete.
if (context_.types().IsComplete(type_id)) {
if (context_->types().IsComplete(type_id)) {
work_list_.pop_back();
return true;
}
auto inst_id = context_.types().GetInstId(type_id);
auto inst = context_.insts().Get(inst_id);
auto inst_id = context_->types().GetInstId(type_id);
auto inst = context_->insts().Get(inst_id);
auto old_work_list_size = work_list_.size();
switch (phase) {
@@ -208,7 +209,7 @@ auto TypeCompleter::ProcessStep() -> bool {
case Phase::BuildInfo: {
auto info = BuildInfo(type_id, inst);
context_.types().SetComplete(type_id, info);
context_->types().SetComplete(type_id, info);
CARBON_CHECK(old_work_list_size == work_list_.size(),
"BuildInfo should not change work items");
work_list_.pop_back();
@@ -216,7 +217,7 @@ auto TypeCompleter::ProcessStep() -> bool {
// Also complete the value representation type, if necessary. This
// should never fail: the value representation shouldn't require any
// additional nested types to be complete.
if (!context_.types().IsComplete(info.value_repr.type_id)) {
if (!context_->types().IsComplete(info.value_repr.type_id)) {
work_list_.push_back(
{.type_id = info.value_repr.type_id, .phase = Phase::BuildInfo});
}
@@ -226,8 +227,8 @@ auto TypeCompleter::ProcessStep() -> bool {
break;
}
auto pointee_type_id =
context_.sem_ir().GetPointeeType(info.value_repr.type_id);
if (!context_.types().IsComplete(pointee_type_id)) {
context_->sem_ir().GetPointeeType(info.value_repr.type_id);
if (!context_->types().IsComplete(pointee_type_id)) {
work_list_.push_back(
{.type_id = pointee_type_id, .phase = Phase::BuildInfo});
}
@@ -246,37 +247,37 @@ auto TypeCompleter::AddNestedIncompleteTypes(SemIR::Inst type_inst) -> bool {
break;
}
case CARBON_KIND(SemIR::StructType inst): {
for (auto field : context_.struct_type_fields().Get(inst.fields_id)) {
for (auto field : context_->struct_type_fields().Get(inst.fields_id)) {
Push(field.type_id);
}
break;
}
case CARBON_KIND(SemIR::TupleType inst): {
for (auto element_type_id :
context_.type_blocks().Get(inst.elements_id)) {
context_->type_blocks().Get(inst.elements_id)) {
Push(element_type_id);
}
break;
}
case CARBON_KIND(SemIR::ClassType inst): {
auto& class_info = context_.classes().Get(inst.class_id);
auto& class_info = context_->classes().Get(inst.class_id);
if (!class_info.is_complete()) {
if (diagnoser_) {
auto builder = diagnoser_();
NoteIncompleteClass(context_, inst.class_id, builder);
NoteIncompleteClass(*context_, inst.class_id, builder);
builder.Emit();
}
return false;
}
if (inst.specific_id.has_value()) {
ResolveSpecificDefinition(context_, loc_, inst.specific_id);
ResolveSpecificDefinition(*context_, loc_, inst.specific_id);
}
if (auto adapted_type_id =
class_info.GetAdaptedType(context_.sem_ir(), inst.specific_id);
class_info.GetAdaptedType(context_->sem_ir(), inst.specific_id);
adapted_type_id.has_value()) {
Push(adapted_type_id);
} else {
Push(class_info.GetObjectRepr(context_.sem_ir(), inst.specific_id));
Push(class_info.GetObjectRepr(context_->sem_ir(), inst.specific_id));
}
break;
}
@@ -285,13 +286,13 @@ auto TypeCompleter::AddNestedIncompleteTypes(SemIR::Inst type_inst) -> bool {
break;
}
case CARBON_KIND(SemIR::FacetType inst): {
if (context_.complete_facet_types()
if (context_->complete_facet_types()
.TryGetId(inst.facet_type_id)
.has_value()) {
break;
}
const auto& facet_type_info =
context_.facet_types().Get(inst.facet_type_id);
context_->facet_types().Get(inst.facet_type_id);
SemIR::CompleteFacetType result;
result.required_interfaces.reserve(
@@ -300,18 +301,19 @@ auto TypeCompleter::AddNestedIncompleteTypes(SemIR::Inst type_inst) -> bool {
for (auto impl_interface : facet_type_info.impls_constraints) {
// TODO: expand named constraints
auto interface_id = impl_interface.interface_id;
const auto& interface = context_.interfaces().Get(interface_id);
const auto& interface = context_->interfaces().Get(interface_id);
if (!interface.is_complete()) {
if (diagnoser_) {
auto builder = diagnoser_();
NoteIncompleteInterface(context_, interface_id, builder);
NoteIncompleteInterface(*context_, interface_id, builder);
builder.Emit();
}
return false;
}
if (impl_interface.specific_id.has_value()) {
ResolveSpecificDefinition(context_, loc_, impl_interface.specific_id);
ResolveSpecificDefinition(*context_, loc_,
impl_interface.specific_id);
}
result.required_interfaces.push_back(
{.interface_id = interface_id,
@@ -324,7 +326,7 @@ auto TypeCompleter::AddNestedIncompleteTypes(SemIR::Inst type_inst) -> bool {
result.num_to_impl = result.required_interfaces.size();
// TODO: Process other kinds of requirements.
context_.complete_facet_types().Add(inst.facet_type_id, result);
context_->complete_facet_types().Add(inst.facet_type_id, result);
break;
}
@@ -337,7 +339,7 @@ auto TypeCompleter::AddNestedIncompleteTypes(SemIR::Inst type_inst) -> bool {
auto TypeCompleter::MakeEmptyValueRepr() const -> SemIR::ValueRepr {
return {.kind = SemIR::ValueRepr::None,
.type_id = GetTupleType(context_, {})};
.type_id = GetTupleType(*context_, {})};
}
auto TypeCompleter::MakeCopyValueRepr(
@@ -354,14 +356,14 @@ auto TypeCompleter::MakePointerValueRepr(
// TODO: Should we add `const` qualification to `pointee_id`?
return {.kind = SemIR::ValueRepr::Pointer,
.aggregate_kind = aggregate_kind,
.type_id = GetPointerType(context_, pointee_id)};
.type_id = GetPointerType(*context_, pointee_id)};
}
auto TypeCompleter::GetNestedInfo(SemIR::TypeId nested_type_id) const
-> SemIR::CompleteTypeInfo {
CARBON_CHECK(context_.types().IsComplete(nested_type_id),
CARBON_CHECK(context_->types().IsComplete(nested_type_id),
"Nested type should already be complete");
auto info = context_.types().GetCompleteTypeInfo(nested_type_id);
auto info = context_->types().GetCompleteTypeInfo(nested_type_id);
CARBON_CHECK(info.value_repr.kind != SemIR::ValueRepr::Unknown,
"Complete type should have a value representation");
return info;
@@ -400,7 +402,7 @@ auto TypeCompleter::BuildStructOrTupleValueRepr(size_t num_elements,
auto TypeCompleter::BuildInfoForInst(SemIR::TypeId type_id,
SemIR::StructType struct_type) const
-> SemIR::CompleteTypeInfo {
auto fields = context_.struct_type_fields().Get(struct_type.fields_id);
auto fields = context_->struct_type_fields().Get(struct_type.fields_id);
if (fields.empty()) {
return {.value_repr = MakeEmptyValueRepr()};
}
@@ -413,7 +415,7 @@ auto TypeCompleter::BuildInfoForInst(SemIR::TypeId type_id,
SemIR::ClassId abstract_class_id = SemIR::ClassId::None;
for (auto field : fields) {
auto field_info = GetNestedInfo(field.type_id);
if (!field_info.value_repr.IsCopyOfObjectRepr(context_.sem_ir(),
if (!field_info.value_repr.IsCopyOfObjectRepr(context_->sem_ir(),
field.type_id)) {
same_as_object_rep = false;
field.type_id = field_info.value_repr.type_id;
@@ -429,8 +431,9 @@ auto TypeCompleter::BuildInfoForInst(SemIR::TypeId type_id,
auto value_rep =
same_as_object_rep
? type_id
: GetStructType(context_, context_.struct_type_fields().AddCanonical(
value_rep_fields));
: GetStructType(
*context_,
context_->struct_type_fields().AddCanonical(value_rep_fields));
return {.value_repr = BuildStructOrTupleValueRepr(fields.size(), value_rep,
same_as_object_rep),
.abstract_class_id = abstract_class_id};
@@ -440,7 +443,7 @@ auto TypeCompleter::BuildInfoForInst(SemIR::TypeId type_id,
SemIR::TupleType tuple_type) const
-> SemIR::CompleteTypeInfo {
// TODO: Share more code with structs.
auto elements = context_.type_blocks().Get(tuple_type.elements_id);
auto elements = context_->type_blocks().Get(tuple_type.elements_id);
if (elements.empty()) {
return {.value_repr = MakeEmptyValueRepr()};
}
@@ -453,7 +456,7 @@ auto TypeCompleter::BuildInfoForInst(SemIR::TypeId type_id,
SemIR::ClassId abstract_class_id = SemIR::ClassId::None;
for (auto element_type_id : elements) {
auto element_info = GetNestedInfo(element_type_id);
if (!element_info.value_repr.IsCopyOfObjectRepr(context_.sem_ir(),
if (!element_info.value_repr.IsCopyOfObjectRepr(context_->sem_ir(),
element_type_id)) {
same_as_object_rep = false;
}
@@ -465,8 +468,9 @@ auto TypeCompleter::BuildInfoForInst(SemIR::TypeId type_id,
}
}
auto value_rep =
same_as_object_rep ? type_id : GetTupleType(context_, value_rep_elements);
auto value_rep = same_as_object_rep
? type_id
: GetTupleType(*context_, value_rep_elements);
return {.value_repr = BuildStructOrTupleValueRepr(elements.size(), value_rep,
same_as_object_rep),
.abstract_class_id = abstract_class_id};
@@ -485,7 +489,7 @@ auto TypeCompleter::BuildInfoForInst(SemIR::TypeId type_id,
auto TypeCompleter::BuildInfoForInst(SemIR::TypeId /*type_id*/,
SemIR::ClassType inst) const
-> SemIR::CompleteTypeInfo {
auto& class_info = context_.classes().Get(inst.class_id);
auto& class_info = context_->classes().Get(inst.class_id);
auto abstract_class_id =
class_info.inheritance_kind == SemIR::Class::InheritanceKind::Abstract
? inst.class_id
@@ -494,7 +498,7 @@ auto TypeCompleter::BuildInfoForInst(SemIR::TypeId /*type_id*/,
// The value representation of an adapter is the value representation of
// its adapted type.
if (auto adapted_type_id =
class_info.GetAdaptedType(context_.sem_ir(), inst.specific_id);
class_info.GetAdaptedType(context_->sem_ir(), inst.specific_id);
adapted_type_id.has_value()) {
auto info = GetNestedInfo(adapted_type_id);
info.abstract_class_id = abstract_class_id;
@@ -505,7 +509,7 @@ auto TypeCompleter::BuildInfoForInst(SemIR::TypeId /*type_id*/,
// TODO: Support customized value representations for classes.
// TODO: Pick a better value representation when possible.
return {.value_repr = MakePointerValueRepr(
class_info.GetObjectRepr(context_.sem_ir(), inst.specific_id),
class_info.GetObjectRepr(context_->sem_ir(), inst.specific_id),
SemIR::ValueRepr::ObjectAggregate),
.abstract_class_id = abstract_class_id};
}
@@ -535,12 +539,12 @@ auto TypeCompleter::BuildInfo(SemIR::TypeId type_id, SemIR::Inst inst) const
auto TryToCompleteType(Context& context, SemIR::TypeId type_id, SemIRLoc loc,
MakeDiagnosticBuilderFn diagnoser) -> bool {
return TypeCompleter(context, loc, diagnoser).Complete(type_id);
return TypeCompleter(&context, loc, diagnoser).Complete(type_id);
}
auto CompleteTypeOrCheckFail(Context& context, SemIR::TypeId type_id) -> void {
bool complete =
TypeCompleter(context, SemIR::LocId::None, nullptr).Complete(type_id);
TypeCompleter(&context, SemIR::LocId::None, nullptr).Complete(type_id);
CARBON_CHECK(complete, "Expected {0} to be a complete type",
context.types().GetAsInst(type_id));
}
@@ -550,7 +554,7 @@ auto RequireCompleteType(Context& context, SemIR::TypeId type_id,
-> bool {
CARBON_CHECK(diagnoser);
if (!TypeCompleter(context, loc_id, diagnoser).Complete(type_id)) {
if (!TypeCompleter(&context, loc_id, diagnoser).Complete(type_id)) {
return false;
}