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

Fix usage of IDs with wrong SemIR::File. (#6670)

Browse Source 
Found by inspection; I haven't found a way to cause this to manifest,
and I'm not sure it's possible. Refactor slightly to make it harder for
this bug to recur.

Also make a CHECK a bit more informative. (Unrelated, but I was
investigating a failure of that CHECK when I found this.)
This commit is contained in:
Richard Smith
2026-01-29 22:25:40 +00:00
committed by GitHub
parent f64d084f27
commit 666cf7e10e
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/sem_ir/expr_info.cpp
+10 -7
View File
@@ -22,9 +22,8 @@ static auto AsAnyInstId(Inst::ArgAndKind arg) -> InstId {
return arg.As<SemIR::AbsoluteInstId>();
}
auto GetExprCategory(const File& file, InstId inst_id) -> ExprCategory {
const File* ir = &file;
static auto GetExprCategoryImpl(const File* ir, InstId inst_id)
-> ExprCategory {
// The overall expression category if the current instruction is a value
// expression.
ExprCategory value_category = ExprCategory::Value;
@@ -58,21 +57,21 @@ auto GetExprCategory(const File& file, InstId inst_id) -> ExprCategory {
inst_id = import_ir_inst.inst_id();
return std::nullopt;
} else if constexpr (std::same_as<TypedInstT, Call>) {
auto callee = GetCallee(file, inst.callee_id);
auto callee = GetCallee(*ir, inst.callee_id);
CARBON_KIND_SWITCH(callee) {
case CARBON_KIND(SemIR::CalleeError _): {
return ExprCategory::Error;
}
case CARBON_KIND(SemIR::CalleeFunction callee_function): {
const auto& function =
file.functions().Get(callee_function.function_id);
ir->functions().Get(callee_function.function_id);
auto return_form_id = function.GetDeclaredReturnForm(
file, callee_function.resolved_specific_id);
*ir, callee_function.resolved_specific_id);
if (!return_form_id.has_value()) {
// Treat as equivalent to `-> ()`.
return ExprCategory::Initializing;
}
auto return_form = file.insts().Get(return_form_id);
auto return_form = ir->insts().Get(return_form_id);
CARBON_KIND_SWITCH(return_form) {
case CARBON_KIND(InitForm _):
return ExprCategory::Initializing;
@@ -137,6 +136,10 @@ auto GetExprCategory(const File& file, InstId inst_id) -> ExprCategory {
}
}
auto GetExprCategory(const File& file, InstId inst_id) -> ExprCategory {
return GetExprCategoryImpl(&file, inst_id);
}
auto FindReturnSlotArgForInitializer(const File& sem_ir, InstId init_id,
bool allow_transitive) -> InstId {
while (true) {
toolchain/sem_ir/generic.cpp
+2 -2
View File
@@ -89,8 +89,8 @@ static auto GetConstantInSpecific(const File& specific_ir,
CARBON_CHECK(
specific_ir.generics().GetSelfSpecific(
specific_ir.specifics().Get(specific_id).generic_id) == specific_id,
"Queried {0} in {1} for {2} before it was resolved.", symbolic.index,
specific_id,
"Queried {0} {1} in {2} for generic {3} before it was resolved.",
symbolic.index, const_ir.insts().Get(symbolic.inst_id), specific_id,
specific_ir.insts().Get(
specific_ir.generics().Get(specific.generic_id).decl_id));
// TODO: Make sure this is the same value that we put in the self specific