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

Adjust handling of values in calls and structs (#2824)

Browse Source 
Previously, IR for arguments in calls and struct values was separated out. This merges it back in. Additionally, parameters for functions and struct types had their own IR; the block is still there, but there's a TODO to decide what to do with it.

In the LLVM IR, this has the consequence of emitting expressions that are inputs to a call or struct value within the scope of the function, which is pretty much where it should be. Importantly it happens before the call is encountered.

This change also tinkers with the int and real literal lowering. I'm pretty sure both are still wrong, but was having trouble figuring out a "better" way to do it, and this seems like it'll work for now.
This commit is contained in:
Jon Ross-Perkins
2023-05-18 11:42:03 -07:00
committed by GitHub
parent 4a5d925974
commit e73207429f
76 changed files with 304 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/semantics_handle_struct.cpp
+8 -9
View File
@@ -67,7 +67,7 @@ auto SemanticsHandleStructFieldValue(SemanticsContext& context,
auto SemanticsHandleStructLiteral(SemanticsContext& context,
ParseTree::Node parse_node) -> bool {
auto [ir_id, refs_id] = context.ParamOrArgEnd(
auto refs_id = context.ParamOrArgEnd(
/*for_args=*/true, ParseNodeKind::StructLiteralOrStructTypeLiteralStart);
context.PopScope();
@@ -81,14 +81,13 @@ auto SemanticsHandleStructLiteral(SemanticsContext& context,
return true;
}
// Construct a type for the literal. Each field is one node, so ir_id and
// refs_id match.
// Construct a type for the literal.
auto refs = context.semantics().GetNodeBlock(refs_id);
auto type_id = context.AddNode(SemanticsNode::StructType::Make(
parse_node, type_block_id, type_block_id));
auto type_id = context.AddNode(
SemanticsNode::StructType::Make(parse_node, type_block_id));
auto value_id = context.AddNode(
SemanticsNode::StructValue::Make(parse_node, type_id, ir_id, refs_id));
SemanticsNode::StructValue::Make(parse_node, type_id, refs_id));
context.node_stack().Push(parse_node, value_id);
return true;
}
@@ -107,7 +106,7 @@ auto SemanticsHandleStructLiteralOrStructTypeLiteralStart(
auto SemanticsHandleStructTypeLiteral(SemanticsContext& context,
ParseTree::Node parse_node) -> bool {
auto [ir_id, refs_id] = context.ParamOrArgEnd(
auto refs_id = context.ParamOrArgEnd(
/*for_args=*/false, ParseNodeKind::StructLiteralOrStructTypeLiteralStart);
context.PopScope();
@@ -119,8 +118,8 @@ auto SemanticsHandleStructTypeLiteral(SemanticsContext& context,
CARBON_CHECK(refs_id != SemanticsNodeBlockId::Empty)
<< "{} is handled by StructLiteral.";
auto type_id = context.AddNode(
SemanticsNode::StructType::Make(parse_node, ir_id, refs_id));
auto type_id =
context.AddNode(SemanticsNode::StructType::Make(parse_node, refs_id));
context.node_stack().Push(parse_node, type_id);
return true;
}