Switch compile functions to use options structs (#5742)

I've been mulling this mainly for the parameter complexity of
check/lower, but doing lex/parse for symmetry.

I'm motivated by the plan to move dumping for all of them into the
respective functions, because of discussion about llvm-verifier. That
basically would add another bool parameter (or more) to each of these.
My instinct is we're going to probably accrue a little more over time,
so I'm suggesting this as maybe adding the boundary a little simpler
and/or easier to read.

Note it may make sense to refactor a little further, e.g. maybe
Lower::Context could receive the full set of options and pick out what
it wants, but I figured creating the struct itself would be a decent
start.

I'm trying to put things into options when we can produce a reasonable
default if the user doesn't assign a value. I'm using an explicit
constructor so that values can be added without affecting every caller.

A different factoring would be to pass in everything through the param
struct, but that just felt weird when I was trying it out.

Removing `inst_namer` and `module_name` from `LowerToLLVM` params --
both of these can be inferred from `sem_ir`, and I'm not seeing a
particular reason to maintain them at the call site.
This commit is contained in:
Jon Ross-Perkins
2025-06-27 22:08:47 +00:00
committed by GitHub
parent 0722dab0ef
commit 2de746e83c
16 changed files with 149 additions and 67 deletions
+14 -6
View File
@@ -131,10 +131,16 @@ auto Context::File::SetText(Context& context, std::optional<int64_t> version,
}
source_ = std::make_unique<SourceBuffer>(std::move(*source));
value_stores_ = std::make_unique<SharedValueStores>();
Lex::LexOptions lex_options;
lex_options.consumer = &consumer;
tokens_ = std::make_unique<Lex::TokenizedBuffer>(
Lex::Lex(*value_stores_, *source_, consumer));
tree_ = std::make_unique<Parse::Tree>(
Parse::Parse(*tokens_, consumer, context.vlog_stream()));
Lex::Lex(*value_stores_, *source_, lex_options));
Parse::ParseOptions parse_options;
parse_options.consumer = &consumer;
parse_options.vlog_stream = context.vlog_stream();
tree_ = std::make_unique<Parse::Tree>(Parse::Parse(*tokens_, parse_options));
tree_and_subtrees_ =
std::make_unique<Parse::TreeAndSubtrees>(*tokens_, *tree_);
@@ -153,11 +159,13 @@ auto Context::File::SetText(Context& context, std::optional<int64_t> version,
};
llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> fs =
new llvm::vfs::InMemoryFileSystem;
// TODO: Include the prelude.
Check::CheckParseTreesOptions check_options;
check_options.vlog_stream = context.vlog_stream();
Check::CheckParseTrees(
units, llvm::ArrayRef<Parse::GetTreeAndSubtreesFn>(getter),
/*prelude_import=*/false, fs, llvm::sys::getDefaultTargetTriple(),
context.vlog_stream(), /*fuzzing=*/false);
units, llvm::ArrayRef<Parse::GetTreeAndSubtreesFn>(getter), fs,
llvm::sys::getDefaultTargetTriple(), check_options);
// Note we need to publish diagnostics even when empty.
// TODO: Consider caching previously published diagnostics and only publishing