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

Skip vptr when performing object initialization (#4490)

Browse Source 
The cehck for vptr could be done differently (is this class dynamic and
its base class non-dynamic), and if we change the layout (to put the
vptr after any base) then this code will break (could add an assertion
that the vptr isn't present apart from at the start of the field list if
that'd seem worthwhile).

There's still later issues with lowering (if this patch causes crashes
in lowering, do they result in fuzz failures/need to be avoided before
this change is submitted?)
This commit is contained in:
David Blaikie
2024-11-06 18:27:40 +00:00
committed by GitHub
parent fcabeb6725
commit d79a374ad4
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/convert.cpp
+15 -4
View File
@@ -392,6 +392,12 @@ static auto ConvertStructToStructOrClass(Context& context,
auto& sem_ir = context.sem_ir();
auto src_elem_fields = sem_ir.inst_blocks().Get(src_type.fields_id);
auto dest_elem_fields = sem_ir.inst_blocks().Get(dest_type.fields_id);
bool dest_has_vptr =
!dest_elem_fields.empty() &&
sem_ir.insts()
.GetAs<SemIR::StructTypeField>(dest_elem_fields.front())
.name_id == SemIR::NameId::Vptr;
auto dest_elem_fields_size = dest_elem_fields.size() - dest_has_vptr;
auto value = sem_ir.insts().Get(value_id);
auto value_loc_id = sem_ir.insts().GetLocId(value_id);
@@ -411,14 +417,14 @@ static auto ConvertStructToStructOrClass(Context& context,
// Check that the structs are the same size.
// TODO: If not, include the name of the first source field that doesn't
// exist in the destination or vice versa in the diagnostic.
if (src_elem_fields.size() != dest_elem_fields.size()) {
if (src_elem_fields.size() != dest_elem_fields_size) {
CARBON_DIAGNOSTIC(
StructInitElementCountMismatch, Error,
"cannot initialize {0:class|struct} with {1} field{1:s} from struct "
"with {2} field{2:s}",
BoolAsSelect, IntAsSelect, IntAsSelect);
context.emitter().Emit(value_loc_id, StructInitElementCountMismatch,
ToClass, dest_elem_fields.size(),
ToClass, dest_elem_fields_size,
src_elem_fields.size());
return SemIR::InstId::BuiltinError;
}
@@ -449,14 +455,19 @@ static auto ConvertStructToStructOrClass(Context& context,
// of the source.
// TODO: Annotate diagnostics coming from here with the element index.
auto new_block =
literal_elems_id.is_valid()
literal_elems_id.is_valid() && !dest_has_vptr
? SemIR::CopyOnWriteInstBlock(sem_ir, literal_elems_id)
: SemIR::CopyOnWriteInstBlock(
sem_ir, SemIR::CopyOnWriteInstBlock::UninitializedBlock{
src_elem_fields.size()});
dest_elem_fields.size()});
for (auto [i, dest_field_id] : llvm::enumerate(dest_elem_fields)) {
auto dest_field =
sem_ir.insts().GetAs<SemIR::StructTypeField>(dest_field_id);
if (dest_field.name_id == SemIR::NameId::Vptr) {
// TODO: Initialize the vptr to point to a vtable.
new_block.Set(i, SemIR::InstId::BuiltinError);
continue;
}
// Find the matching source field.
auto src_field_index = i;