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

Fix C++ code generation in --share-cpp-ast mode (#7605)

Browse Source 
Instead of creating a CodeGenerator per CppDomain, and then crashing in
lowering when we try to consume the same llvm Module multiple times,
create a CodeGenerator for each CppFile within the domain.

For now, we mulitplex all of Clang's ASTConsumer output to all code
generators, which means that any strong external definitions within a
Carbon file (for example, in an inline `Cpp` fragment) will be emitted
to all output files in the same `CppDomain`, resulting in link errors
due to symbol redefinitions. This will be addressed later. But this
should be sufficient for Carbon compilations in which such symbols are
not defined.

We also don't yet attempt to classify which compilations will need C++
code generation, and instead create a clang `CodeGenerator` for every
Carbon file that has C++ imports. For `carbom compile`, only one Carbon
file will need code generation, and yet we still build multiple
`CodeGenerator` objects in general. Fixing this requires more plumbing
from the driver, and this will also be handled in a follow-up.

Assisted-by: Gemini via Antigravity
This commit is contained in:
Richard Smith
2026-08-04 17:59:06 +00:00
committed by GitHub
parent a9cc7bf490
commit 34a2e270f4
32 changed files with 641 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/driver/compile_driver.cpp
+12 -16
View File
@@ -40,13 +40,11 @@
namespace Carbon {
CompilationUnit::CompilationUnit(SemIR::CheckIRId check_ir_id,
int total_ir_count, DriverEnv* driver_env,
const CompileOptions* options,
Diagnostics::Consumer* consumer,
llvm::StringRef input_filename,
std::string output_filename,
const llvm::Target* target)
CompilationUnit::CompilationUnit(
SemIR::CheckIRId check_ir_id, int total_ir_count, DriverEnv* driver_env,
const CompileOptions* options, Diagnostics::Consumer* consumer,
llvm::StringRef input_filename, std::string output_filename,
const llvm::Target* target, llvm::LLVMContext* llvm_context)
: check_ir_id_(check_ir_id),
total_ir_count_(total_ir_count),
driver_env_(driver_env),
@@ -54,7 +52,8 @@ CompilationUnit::CompilationUnit(SemIR::CheckIRId check_ir_id,
target_(target),
input_filename_(input_filename),
output_filename_(std::move(output_filename)),
vlog_stream_(driver_env_->vlog_stream) {
vlog_stream_(driver_env_->vlog_stream),
llvm_context_(llvm_context) {
if (vlog_stream_ != nullptr || options_->stream_errors) {
consumer_ = consumer;
} else {
@@ -150,14 +149,11 @@ auto CompilationUnit::GetCheckUnit() -> Check::Unit {
};
sem_ir_.emplace(&*parse_tree_, check_ir_id_, parse_tree_->packaging_decl(),
value_stores_, input_filename_);
if (!llvm_context_) {
llvm_context_ = std::make_unique<llvm::LLVMContext>();
}
return {.consumer = consumer_,
.value_stores = &value_stores_,
.timings = timings_ ? &*timings_ : nullptr,
.sem_ir = &*sem_ir_,
.llvm_context = llvm_context_.get(),
.llvm_context = llvm_context_,
.total_ir_count = total_ir_count_};
}
@@ -180,9 +176,6 @@ auto CompilationUnit::PostCheck() -> void {
auto CompilationUnit::RunLower() -> void {
LogCall("Lower::LowerToLLVM", "lower", [&] {
if (!llvm_context_) {
llvm_context_ = std::make_unique<llvm::LLVMContext>();
}
Lower::LowerToLLVMOptions options;
options.llvm_verifier_stream =
options_->run_llvm_verifier ? driver_env_->error_stream : nullptr;
@@ -498,6 +491,8 @@ auto CompileDriver::Initialize(
}
}
llvm_context_ = std::make_unique<llvm::LLVMContext>();
// Prepare CompilationUnits before building scope exit handlers.
int unit_index = -1;
int total_unit_count =
@@ -506,7 +501,8 @@ auto CompileDriver::Initialize(
++unit_index;
return std::make_unique<CompilationUnit>(
SemIR::CheckIRId(unit_index), total_unit_count, &driver_env, options_,
driver_env.consumer, filename, map_input(filename), target);
driver_env.consumer, filename, map_input(filename), target,
llvm_context_.get());
};
llvm::append_range(units_, llvm::map_range(prelude, unit_builder));
llvm::append_range(units_, llvm::map_range(core_library, unit_builder));