Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Track the type as written in BaseDecl and AdaptDecl. #4564

Merged
merged 13 commits into from
Nov 27, 2024
Merged

Track the type as written in BaseDecl and AdaptDecl. #4564

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0296bb5
Allow classes whose object representation is an integer type to be us…
zygoloid Nov 21, 2024
cbe5eb7
Support generic adapters, bases and import better.
zygoloid Nov 21, 2024
a066c41
Support for generic adapters.
zygoloid Nov 21, 2024
2c1c938
Fix importing of adapters
zygoloid Nov 21, 2024
ecd787e
clang-format
zygoloid Nov 21, 2024
79c0d6b
Improve comments.
zygoloid Nov 23, 2024
d2abf71
Simplify.
zygoloid Nov 23, 2024
9bb62e9
Factor out shared handling of adapt and base declarations.
zygoloid Nov 25, 2024
ce28fbf
Fix test.
zygoloid Nov 26, 2024
705f201
Merge branch 'trunk' into toolchain-refactor-typestore
zygoloid Nov 27, 2024
8bdc0ea
Rename file and add TODO comment describing the intent.
zygoloid Nov 27, 2024
114f8fb
Merge branch 'trunk' into toolchain-refactor-typestore
zygoloid Nov 27, 2024
a838158
Autoupdate.
zygoloid Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions toolchain/check/handle_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,7 @@ auto HandleParseNode(Context& context, Parse::BaseDeclId node_id) -> bool {
class_info.base_id = context.AddInst<SemIR::BaseDecl>(
node_id, {.type_id = field_type_id,
.base_type_inst_id = base_info.inst_id,
.index = SemIR::ElementIndex(
context.struct_type_fields_stack().PeekArray().size())});
.index = SemIR::ElementIndex::Invalid});

if (base_info.type_id != SemIR::TypeId::Error) {
auto base_class_info = context.classes().Get(
Expand Down Expand Up @@ -622,6 +621,7 @@ static auto CheckCompleteAdapterClassType(Context& context,
{.type_id = context.GetBuiltinType(SemIR::BuiltinInstKind::WitnessType),
.object_repr_id = object_repr_id});
}

static auto AddStructTypeFields(
Context& context,
llvm::SmallVector<SemIR::StructTypeField>& struct_type_fields)
Expand Down Expand Up @@ -657,10 +657,10 @@ static auto CheckCompleteClassType(Context& context, Parse::NodeId node_id,
return CheckCompleteAdapterClassType(context, node_id, class_id);
}

bool defining_vtable_ptr = class_info.is_dynamic;
if (auto base_type_id =
class_info.GetBaseType(context.sem_ir(), SemIR::SpecificId::Invalid);
base_type_id.is_valid()) {
bool defining_vptr = class_info.is_dynamic;
auto base_type_id =
class_info.GetBaseType(context.sem_ir(), SemIR::SpecificId::Invalid);
if (base_type_id.is_valid()) {
// TODO: If the base class is template dependent, we will need to decide
// whether to add a vptr as part of instantiation.
if (auto* base_class_info = TryGetAsClass(context, base_type_id);
Expand All @@ -679,16 +679,13 @@ static auto CheckCompleteClassType(Context& context, Parse::NodeId node_id,
.type_id = context.GetPointerType(
context.GetBuiltinType(SemIR::BuiltinInstKind::VtableType))});
}
if (class_info.base_id.is_valid()) {
if (base_type_id.is_valid()) {
auto base_decl = context.insts().GetAs<SemIR::BaseDecl>(class_info.base_id);
base_decl.index =
SemIR::ElementIndex{static_cast<int>(struct_type_fields.size())};
context.ReplaceInstPreservingConstantValue(class_info.base_id, base_decl);
struct_type_fields.push_back(
{.name_id = SemIR::NameId::Base,
.type_id = context.insts()
.GetAs<SemIR::BaseDecl>(class_info.base_id)
.base_type_id});
{.name_id = SemIR::NameId::Base, .type_id = base_type_id});
}

return context.AddInst<SemIR::CompleteTypeWitness>(
Expand Down
Loading