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

Fix crash if initializing Clang fails. (#7248)

Browse Source 
Flush diagnostics before destroying Clang. If we see an `inline Cpp` and
`Cpp` initialization failed, recover by skipping the inline code rather
than CHECK-failing.
This commit is contained in:
Richard Smith
2026-05-21 21:21:50 +00:00
committed by GitHub
parent ad97b9e3a5
commit 805b3eebce
3 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_inline_decl.cpp
+14 -4
View File
@@ -30,12 +30,22 @@ auto HandleParseNode(Context& context, Parse::InlineCppDeclId node_id) -> bool {
// TODO: It'd be nice to produce a clearer error saying to insert an `import
// Cpp` in a file that uses `inline Cpp` and doesn't otherwise import anything
// from package `Cpp`.
if (context.constant_values().Get(
context.node_stack().Pop<Parse::NodeKind::CppNameExpr>()) ==
SemIR::ErrorInst::ConstantId) {
auto cpp_id = context.constant_values().Get(
context.node_stack().Pop<Parse::NodeKind::CppNameExpr>());
if (cpp_id == SemIR::ErrorInst::ConstantId) {
return true;
}
// If Clang initialization catastrophically failed, skip the inline fragment.
if (!context.cpp_context()) {
// We should have already diagnosed an error initializing Clang.
auto cpp_scope_id = context.constant_values()
.GetInstAs<SemIR::Namespace>(cpp_id)
.name_scope_id;
CARBON_CHECK(context.name_scopes().Get(cpp_scope_id).has_error(),
"Have valid `Cpp` scope but no Cpp context");
return true;
}
CARBON_CHECK(context.cpp_context(), "Have `Cpp` name but no Cpp context");
auto string_token = context.parse_tree().node_token(body_id);
auto string_value_id = context.tokens().GetStringLiteralValue(string_token);