mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Trying to conform with #4009. Changes SemIR::LocIdAndInst construction to root out struct init cases with AddInst and related functions. I'm using templating of AddInst functions in order to avoid `AddInst(loc_id, InstName{...})` and instead have `AddInst<InstName>(loc_id, {...})` with I think similar readability results. There are a couple cases where inst construction is templated and so designated initializers couldn't be used, so this may be better for those in particular due to the extra type enforcement. This probably doesn't clean up every last case, but I was trying to get the bulk at once without bleeding over into less related changes. --------- Co-authored-by: Richard Smith <richard@metafoo.co.uk>
79 lines
3.2 KiB
C++
79 lines
3.2 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/modifiers.h"
|
|
#include "toolchain/check/name_component.h"
|
|
#include "toolchain/parse/node_ids.h"
|
|
#include "toolchain/sem_ir/ids.h"
|
|
#include "toolchain/sem_ir/typed_insts.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto HandleAliasIntroducer(Context& context,
|
|
Parse::AliasIntroducerId /*node_id*/) -> bool {
|
|
context.decl_state_stack().Push(DeclState::Alias);
|
|
context.decl_name_stack().PushScopeAndStartName();
|
|
return true;
|
|
}
|
|
|
|
auto HandleAliasInitializer(Context& /*context*/,
|
|
Parse::AliasInitializerId /*node_id*/) -> bool {
|
|
return true;
|
|
}
|
|
|
|
auto HandleAlias(Context& context, Parse::AliasId /*node_id*/) -> bool {
|
|
auto [expr_node, expr_id] = context.node_stack().PopExprWithNodeId();
|
|
|
|
auto name_context = context.decl_name_stack().FinishName(
|
|
PopNameComponentWithoutParams(context, Lex::TokenKind::Alias));
|
|
|
|
LimitModifiersOnDecl(context, KeywordModifierSet::Access,
|
|
Lex::TokenKind::Alias);
|
|
auto modifiers = context.decl_state_stack().innermost().modifier_set;
|
|
if (modifiers.HasAnyOf(KeywordModifierSet::Access)) {
|
|
context.TODO(context.decl_state_stack().innermost().modifier_node_id(
|
|
ModifierOrder::Access),
|
|
"access modifier");
|
|
}
|
|
context.decl_state_stack().Pop(DeclState::Alias);
|
|
|
|
auto bind_name_id = context.bind_names().Add(
|
|
{.name_id = name_context.name_id_for_new_inst(),
|
|
.enclosing_scope_id = name_context.enclosing_scope_id_for_new_inst(),
|
|
.bind_index = SemIR::CompileTimeBindIndex::Invalid});
|
|
|
|
auto alias_type_id = SemIR::TypeId::Invalid;
|
|
auto alias_value_id = SemIR::InstId::Invalid;
|
|
if (expr_id.is_builtin()) {
|
|
// Type (`bool`) and value (`false`) literals provided by the builtin
|
|
// structure should be turned into name references.
|
|
// TODO: Look into handling `false`, this doesn't do it right now because it
|
|
// sees a value instruction instead of a builtin.
|
|
alias_type_id = context.insts().Get(expr_id).type_id();
|
|
alias_value_id = expr_id;
|
|
} else if (auto inst = context.insts().TryGetAs<SemIR::NameRef>(expr_id)) {
|
|
// Pass through name references, albeit changing the name in use.
|
|
alias_type_id = inst->type_id;
|
|
alias_value_id = inst->value_id;
|
|
} else {
|
|
CARBON_DIAGNOSTIC(AliasRequiresNameRef, Error,
|
|
"Alias initializer must be a name reference.");
|
|
context.emitter().Emit(expr_node, AliasRequiresNameRef);
|
|
alias_type_id = SemIR::TypeId::Error;
|
|
alias_value_id = SemIR::InstId::BuiltinError;
|
|
}
|
|
auto alias_id = context.AddInst<SemIR::BindAlias>(
|
|
name_context.loc_id, {.type_id = alias_type_id,
|
|
.bind_name_id = bind_name_id,
|
|
.value_id = alias_value_id});
|
|
|
|
// Add the name of the binding to the current scope.
|
|
context.decl_name_stack().PopScope();
|
|
context.decl_name_stack().AddNameOrDiagnoseDuplicate(name_context, alias_id);
|
|
return true;
|
|
}
|
|
|
|
} // namespace Carbon::Check
|