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

Properly dump SemIR for inline C++ imports (#6001)

Browse Source 
Dumping SemIR crashed on inline C++ imports and this outputs `import Cpp
inline` instead.
Followup of #5904.
This commit is contained in:
Boaz Brickner
2025-08-29 21:36:10 +00:00
committed by GitHub
parent 8adb3570ac
commit b5d86fdb6f
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/interop/cpp/inline.carbon
Vendored
+16
View File
@@ -14,12 +14,14 @@
library "[[@TEST_NAME]]";
//@dump-sem-ir-begin
import Cpp inline '''
// A C++ function.
inline void func() {}
''';
//@dump-sem-ir-end
fn Run() {
//@dump-sem-ir-begin
@@ -31,12 +33,14 @@ fn Run() {
library "[[@TEST_NAME]]";
//@dump-sem-ir-begin
import Cpp inline '''c++
// A C++ function.
inline void another_func() {}
''';
//@dump-sem-ir-end
fn Run() {
//@dump-sem-ir-begin
@@ -60,6 +64,12 @@ fn Run() {
// CHECK:STDOUT: %func.decl: %func.type = fn_decl @func [concrete = constants.%func] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Cpp.import_cpp = import_cpp {
// CHECK:STDOUT: import Cpp inline
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @Run() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %Cpp.ref: <namespace> = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp]
@@ -84,6 +94,12 @@ fn Run() {
// CHECK:STDOUT: %another_func.decl: %another_func.type = fn_decl @another_func [concrete = constants.%another_func] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: %Cpp.import_cpp = import_cpp {
// CHECK:STDOUT: import Cpp inline
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @Run() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %Cpp.ref: <namespace> = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp]
toolchain/sem_ir/formatter.cpp
+10 -4
View File
@@ -1210,10 +1210,16 @@ auto Formatter::FormatImportCppDeclRhs() -> void {
OpenBrace();
for (ImportCpp import_cpp : sem_ir_->import_cpps().values()) {
Indent();
out_ << "import Cpp \""
<< FormatEscaped(
sem_ir_->string_literal_values().Get(import_cpp.library_id))
<< "\"\n";
out_ << "import Cpp ";
if (import_cpp.library_id.has_value()) {
out_ << "\""
<< FormatEscaped(
sem_ir_->string_literal_values().Get(import_cpp.library_id))
<< "\"";
} else {
out_ << "inline";
}
out_ << "\n";
}
CloseBrace();
}