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

Add value store to be shared across compile stages. (#3311)

Browse Source 
This updates lexing to use the data. I'll do checking separately, just
to split changes.

Note the ValueStore structure is also set up such that SemIR::File can
use it for other fields.

---------

Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
Jon Ross-Perkins
2023-10-20 15:00:53 +00:00
committed by GitHub
co-authored by Richard Smith
parent 629c63c7d1
commit d13f76e001
26 changed files with 389 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/driver/driver.cpp
+10 -5
View File
@@ -383,9 +383,11 @@ auto Driver::ValidateCompileOptions(const CompileOptions& options) const
// Ties together information for a file being compiled.
class Driver::CompilationUnit {
public:
explicit CompilationUnit(Driver* driver, const CompileOptions& options,
explicit CompilationUnit(Driver* driver, SharedValueStores* value_stores,
const CompileOptions& options,
llvm::StringRef input_file_name)
: driver_(driver),
value_stores_(value_stores),
options_(options),
input_file_name_(input_file_name),
vlog_stream_(driver_->vlog_stream_),
@@ -410,8 +412,9 @@ class Driver::CompilationUnit {
CARBON_VLOG() << "*** SourceBuffer ***\n```\n"
<< source_->text() << "\n```\n";
LogCall("Lex::TokenizedBuffer::Lex",
[&] { tokens_ = Lex::TokenizedBuffer::Lex(*source_, *consumer_); });
LogCall("Lex::TokenizedBuffer::Lex", [&] {
tokens_ = Lex::TokenizedBuffer::Lex(*value_stores_, *source_, *consumer_);
});
if (options_.dump_tokens) {
consumer_->Flush();
driver_->output_stream_ << tokens_;
@@ -570,6 +573,7 @@ class Driver::CompilationUnit {
}
Driver* driver_;
SharedValueStores* value_stores_;
const CompileOptions& options_;
llvm::StringRef input_file_name_;
@@ -595,6 +599,7 @@ auto Driver::Compile(const CompileOptions& options) -> bool {
return false;
}
SharedValueStores value_stores;
llvm::SmallVector<std::unique_ptr<CompilationUnit>> units;
auto flush = llvm::make_scope_exit([&]() {
// The diagnostics consumer must be flushed before compilation artifacts are
@@ -605,8 +610,8 @@ auto Driver::Compile(const CompileOptions& options) -> bool {
}
});
for (const auto& input_file_name : options.input_file_names) {
units.push_back(
std::make_unique<CompilationUnit>(this, options, input_file_name));
units.push_back(std::make_unique<CompilationUnit>(
this, &value_stores, options, input_file_name));
}
// Lex.