mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-29 22:02:42 +01:00
The parse nodes are still tracked as part of the same value store interface in order to ensure parity, but they're split out from Inst itself in order to reduce the size of Inst -- the expectation is that they don't need to be passed around quite as much. This change doesn't actually reduce the passing very much, although there are hints of it: AddInstAndPush doesn't typically need a separate parse node from the one on the Inst itself, for example. In a couple spots I changed code to rely a little more on the InstId until the ParseNode is needed, but it's very low hanging fruit where done. I think convert could do more to not eagerly fetch the parse node before its use, but more cleanup felt it would be easier to handle separately. I'm currently viewing this as making such cleanup _possible_ rather than executing on it up-front. But also, I want to make sure there's a consensus to head in this direction before pulling the trigger. We speculated that this would result in the parse node being passed around less, and I do think that's the case, although it's a bit fuzzy in the change. --------- Co-authored-by: Richard Smith <richard@metafoo.co.uk>
141 lines
5.1 KiB
C++
141 lines
5.1 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "toolchain/check/context.h"
|
|
#include "toolchain/check/convert.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto HandleStructLiteralOrStructTypeLiteralStart(
|
|
Context& context, Parse::StructLiteralOrStructTypeLiteralStartId parse_node)
|
|
-> bool {
|
|
context.PushScope();
|
|
context.node_stack().Push(parse_node);
|
|
// At this point we aren't sure whether this will be a value or type literal,
|
|
// so we push onto args irrespective. It just won't be used for a type
|
|
// literal.
|
|
context.args_type_info_stack().Push();
|
|
context.ParamOrArgStart();
|
|
return true;
|
|
}
|
|
|
|
auto HandleStructFieldDesignator(Context& context,
|
|
Parse::StructFieldDesignatorId /*parse_node*/)
|
|
-> bool {
|
|
// This leaves the designated name on top because the `.` isn't interesting.
|
|
CARBON_CHECK(context.node_stack().PeekIsName());
|
|
return true;
|
|
}
|
|
|
|
auto HandleStructComma(Context& context, Parse::StructCommaId /*parse_node*/)
|
|
-> bool {
|
|
context.ParamOrArgComma();
|
|
return true;
|
|
}
|
|
|
|
auto HandleStructFieldValue(Context& context,
|
|
Parse::StructFieldValueId parse_node) -> bool {
|
|
auto value_inst_id = context.node_stack().PopExpr();
|
|
auto [name_node, name_id] = context.node_stack().PopNameWithParseNode();
|
|
|
|
// Store the name for the type.
|
|
context.args_type_info_stack().AddInst(
|
|
{name_node, SemIR::StructTypeField{
|
|
name_id, context.insts().Get(value_inst_id).type_id()}});
|
|
|
|
// Push the value back on the stack as an argument.
|
|
context.node_stack().Push(parse_node, value_inst_id);
|
|
return true;
|
|
}
|
|
|
|
auto HandleStructFieldType(Context& context,
|
|
Parse::StructFieldTypeId parse_node) -> bool {
|
|
auto [type_node, type_id] = context.node_stack().PopExprWithParseNode();
|
|
SemIR::TypeId cast_type_id = ExprAsType(context, type_node, type_id);
|
|
|
|
auto [name_node, name_id] = context.node_stack().PopNameWithParseNode();
|
|
|
|
auto inst_id = context.AddInst(
|
|
{name_node, SemIR::StructTypeField{name_id, cast_type_id}});
|
|
context.node_stack().Push(parse_node, inst_id);
|
|
return true;
|
|
}
|
|
|
|
static auto DiagnoseDuplicateNames(Context& context,
|
|
SemIR::InstBlockId type_block_id,
|
|
llvm::StringRef construct) -> bool {
|
|
auto& sem_ir = context.sem_ir();
|
|
auto fields = sem_ir.inst_blocks().Get(type_block_id);
|
|
llvm::SmallDenseMap<SemIR::NameId, SemIR::InstId> names;
|
|
auto& insts = sem_ir.insts();
|
|
for (SemIR::InstId field_inst_id : fields) {
|
|
auto field_inst = insts.GetAs<SemIR::StructTypeField>(field_inst_id);
|
|
auto [it, added] = names.insert({field_inst.name_id, field_inst_id});
|
|
if (!added) {
|
|
CARBON_DIAGNOSTIC(StructNameDuplicate, Error,
|
|
"Duplicated field name `{1}` in {0}.", std::string,
|
|
std::string);
|
|
CARBON_DIAGNOSTIC(StructNamePrevious, Note,
|
|
"Field with the same name here.");
|
|
context.emitter()
|
|
.Build(context.insts().GetParseNode(field_inst_id),
|
|
StructNameDuplicate, construct.str(),
|
|
sem_ir.names().GetFormatted(field_inst.name_id).str())
|
|
.Note(context.insts().GetParseNode(it->second), StructNamePrevious)
|
|
.Emit();
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
auto HandleStructLiteral(Context& context, Parse::StructLiteralId parse_node)
|
|
-> bool {
|
|
auto refs_id = context.ParamOrArgEnd(
|
|
Parse::NodeKind::StructLiteralOrStructTypeLiteralStart);
|
|
|
|
context.PopScope();
|
|
context.node_stack()
|
|
.PopAndDiscardSoloParseNode<
|
|
Parse::NodeKind::StructLiteralOrStructTypeLiteralStart>();
|
|
auto type_block_id = context.args_type_info_stack().Pop();
|
|
if (DiagnoseDuplicateNames(context, type_block_id, "struct literal")) {
|
|
context.node_stack().Push(parse_node, SemIR::InstId::BuiltinError);
|
|
return true;
|
|
}
|
|
|
|
auto type_id = context.CanonicalizeStructType(parse_node, type_block_id);
|
|
|
|
auto value_id =
|
|
context.AddInst({parse_node, SemIR::StructLiteral{type_id, refs_id}});
|
|
context.node_stack().Push(parse_node, value_id);
|
|
return true;
|
|
}
|
|
|
|
auto HandleStructTypeLiteral(Context& context,
|
|
Parse::StructTypeLiteralId parse_node) -> bool {
|
|
auto refs_id = context.ParamOrArgEnd(
|
|
Parse::NodeKind::StructLiteralOrStructTypeLiteralStart);
|
|
|
|
context.PopScope();
|
|
context.node_stack()
|
|
.PopAndDiscardSoloParseNode<
|
|
Parse::NodeKind::StructLiteralOrStructTypeLiteralStart>();
|
|
// This is only used for value literals.
|
|
context.args_type_info_stack().Pop();
|
|
|
|
CARBON_CHECK(refs_id != SemIR::InstBlockId::Empty)
|
|
<< "{} is handled by StructLiteral.";
|
|
|
|
if (DiagnoseDuplicateNames(context, refs_id, "struct type literal")) {
|
|
context.node_stack().Push(parse_node, SemIR::InstId::BuiltinError);
|
|
return true;
|
|
}
|
|
context.AddInstAndPush(
|
|
{parse_node, SemIR::StructType{SemIR::TypeId::TypeType, refs_id}});
|
|
return true;
|
|
}
|
|
|
|
} // namespace Carbon::Check
|