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

Change EvalContext.context_ from reference to pointer (#5203)

Browse Source 
Per [the style
guide](https://github.com/carbon-language/carbon-lang/blob/trunk/docs/project/cpp_style_guide.md#syntax-and-formatting):
* If it is captured and must outlive the call expression itself, use a
pointer and document that it must not be null (unless it is also
optional).
* When storing an object's address as a non-owned member, prefer storing
a pointer.
This commit is contained in:
Boaz Brickner
2025-03-28 14:48:18 +00:00
committed by GitHub
parent e7e52a14ba
commit 181c7b9290
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/eval.cpp
+9 -8
View File
@@ -35,10 +35,11 @@ struct SpecificEvalInfo {
};
// Information about the context within which we are performing evaluation.
// `context` must not be null.
class EvalContext {
public:
explicit EvalContext(
Context& context, SemIRLoc fallback_loc,
Context* context, SemIRLoc fallback_loc,
SemIR::SpecificId specific_id = SemIR::SpecificId::None,
std::optional<SpecificEvalInfo> specific_eval_info = std::nullopt)
: context_(context),
@@ -58,7 +59,7 @@ class EvalContext {
auto GetDiagnosticLoc(llvm::ArrayRef<SemIR::InstId> inst_ids) -> SemIRLoc {
for (auto inst_id : inst_ids) {
if (inst_id.has_value() &&
context_.insts().GetLocId(inst_id).has_value()) {
context_->insts().GetLocId(inst_id).has_value()) {
return inst_id;
}
}
@@ -183,7 +184,7 @@ class EvalContext {
// caution.
auto types() -> const SemIR::TypeStore& { return sem_ir().types(); }
auto context() -> Context& { return context_; }
auto context() -> Context& { return *context_; }
auto sem_ir() -> SemIR::File& { return context().sem_ir(); }
@@ -191,7 +192,7 @@ class EvalContext {
private:
// The type-checking context in which we're performing evaluation.
Context& context_;
Context* context_;
// The location to use for diagnostics when a better location isn't available.
SemIRLoc fallback_loc_;
// The specific that we are evaluating within.
@@ -1596,7 +1597,7 @@ static auto MakeConstantForCall(EvalContext& eval_context, SemIRLoc loc,
// Given an instruction, compute its phase based on its operands.
static auto ComputeInstPhase(Context& context, SemIR::Inst inst) -> Phase {
EvalContext eval_context(context, SemIR::InstId::None);
EvalContext eval_context(&context, SemIR::InstId::None);
auto phase = GetPhase(context.constant_values(),
context.types().GetConstantId(inst.type_id()));
@@ -1861,13 +1862,13 @@ static auto TryEvalInstInContext(EvalContext& eval_context,
auto TryEvalInst(Context& context, SemIR::LocId loc_id, SemIR::InstId inst_id,
SemIR::Inst inst) -> SemIR::ConstantId {
EvalContext eval_context(context, loc_id);
EvalContext eval_context(&context, loc_id);
return TryEvalInstInContext(eval_context, inst_id, inst);
}
auto TryEvalInst(Context& context, SemIR::InstId inst_id, SemIR::Inst inst)
-> SemIR::ConstantId {
EvalContext eval_context(context, inst_id);
EvalContext eval_context(&context, inst_id);
return TryEvalInstInContext(eval_context, inst_id, inst);
}
@@ -1882,7 +1883,7 @@ auto TryEvalBlockForSpecific(Context& context, SemIRLoc loc,
llvm::SmallVector<SemIR::InstId> result;
result.resize(eval_block.size(), SemIR::InstId::None);
EvalContext eval_context(context, loc, specific_id,
EvalContext eval_context(&context, loc, specific_id,
SpecificEvalInfo{
.region = region,
.values = result,