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

Improve source location in an import error. (#5887)

Browse Source 
When attempting to import a definition of a class with virtual bases,
diagnose the point of use instead of the point of definition of the
class.

---------

Co-authored-by: Chandler Carruth <chandlerc@gmail.com>
This commit is contained in:
Richard Smith
2025-07-31 00:45:38 +00:00
committed by GitHub
co-authored by Chandler Carruth
parent 7f96069b95
commit b320ea77ec
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/import_cpp.cpp
+13 -9
View File
@@ -620,15 +620,8 @@ static auto ImportClassObjectRepr(Context& context, SemIR::ClassId class_id,
// Import bases.
for (const auto& base : clang_def->bases()) {
if (base.isVirtual()) {
// TODO: Handle virtual bases. We don't actually know where they go in the
// layout. We may also want to use a different size in the layout for
// `partial C`, excluding the virtual base. It's also not entirely safe to
// just skip over the virtual base, as the type we would construct would
// have a misleading size.
context.TODO(import_ir_inst_id, "class with virtual bases");
return SemIR::ErrorInst::TypeInstId;
}
CARBON_CHECK(!base.isVirtual(),
"Should not import definition for class with a virtual base");
auto [base_type_inst_id, base_type_id] =
MapType(context, import_ir_inst_id, base.getType());
@@ -810,6 +803,17 @@ auto ImportCppClassDefinition(Context& context, SemIR::LocId loc_id,
clang::CXXRecordDecl* clang_def = clang_decl->getDefinition();
CARBON_CHECK(clang_def, "Complete type has no definition");
if (clang_def->getNumVBases()) {
// TODO: Handle virtual bases. We don't actually know where they go in the
// layout. We may also want to use a different size in the layout for
// `partial C`, excluding the virtual base. It's also not entirely safe to
// just skip over the virtual base, as the type we would construct would
// have a misleading size. For now, treat a C++ class with vbases as
// incomplete in Carbon.
context.TODO(loc_id, "class with virtual bases");
return false;
}
auto import_ir_inst_id =
context.insts().GetCanonicalLocId(class_inst_id).import_ir_inst_id();
BuildClassDefinition(context, import_ir_inst_id, class_id, class_inst_id,