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

Reduce special-casing of parameters in ParamOrArgSave. (#3001)

Browse Source 
I think this is a simpler and more efficient way of achieving the same
end result.
This commit is contained in:
Jon Ross-Perkins
2023-07-21 01:08:33 +00:00
committed by GitHub
parent 0594a1aac7
commit e51f971bce
3 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/semantics_context.cpp
+4 -13
View File
@@ -432,29 +432,20 @@ auto SemanticsContext::ParamOrArgEnd(bool for_args, ParseNodeKind start_kind)
}
auto SemanticsContext::ParamOrArgSave(bool for_args) -> void {
SemanticsNodeId param_or_arg_id = SemanticsNodeId::Invalid;
auto [entry_parse_node, entry_node_id] =
node_stack_.PopExpressionWithParseNode();
if (for_args) {
// For an argument, we add a stub reference to the expression on the top of
// the stack. There may not be anything on the IR prior to this.
auto [entry_parse_node, entry_node_id] =
node_stack_.PopExpressionWithParseNode();
param_or_arg_id = AddNode(SemanticsNode::StubReference::Make(
entry_node_id = AddNode(SemanticsNode::StubReference::Make(
entry_parse_node, semantics_ir_->GetNode(entry_node_id).type_id(),
entry_node_id));
} else {
// For a parameter, there should always be something in the IR.
node_stack_.PopAndIgnore();
auto ir_id = node_block_stack_.Peek();
CARBON_CHECK(ir_id.is_valid());
auto& ir = semantics_ir_->GetNodeBlock(ir_id);
CARBON_CHECK(!ir.empty()) << "Should have had a param";
param_or_arg_id = ir.back();
}
// Save the param or arg ID.
auto& params_or_args =
semantics_ir_->GetNodeBlock(params_or_args_stack_.PeekForAdd());
params_or_args.push_back(param_or_arg_id);
params_or_args.push_back(entry_node_id);
}
auto SemanticsContext::CanonicalizeType(SemanticsNodeId node_id)