mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Jon Ross-Perkins
e62973a8ef
The TODO for switching to ReusingLoc (previously Untyped) had been there for a while, so I'm trying to address it here. The intent had been to be clearer about when the construction is validated, particularly so that we aren't accidentally accepting an incorrect NodeId. Note, this does fix an incorrect use of InvalidNodeId where NoLoc should've been called. Since this changes the semantics of when `Parse::NodeId` is helpful in `typed_nodes.h`, I'm doing a pass to either refine or switch to `Parse::InvalidNodeId` where it compiles. I think most remaining `Parse::NodeId` examples are things we _should_ be able to refine with a little more work (versus before where `Parse::NodeId` also indicated `LocId` construction might be used). I'm also changing context.h to use `requires` that match what `LocIdAndInst` has, I think it makes the diagnostics a little better. And note I do add an overload for `ImportIRInstId`, also matching `LocIdAndInst`, and widely used for import refs.
43 lines
1.6 KiB
C++
43 lines
1.6 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/interface.h"
|
|
|
|
#include "toolchain/check/context.h"
|
|
#include "toolchain/sem_ir/ids.h"
|
|
#include "toolchain/sem_ir/inst.h"
|
|
#include "toolchain/sem_ir/typed_insts.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto BuildAssociatedEntity(Context& context, SemIR::InterfaceId interface_id,
|
|
SemIR::InstId decl_id) -> SemIR::InstId {
|
|
auto& interface_info = context.interfaces().Get(interface_id);
|
|
if (!interface_info.is_being_defined()) {
|
|
// This should only happen if the interface is erroneously defined more than
|
|
// once.
|
|
// TODO: Find a way to CHECK this.
|
|
return SemIR::InstId::BuiltinError;
|
|
}
|
|
|
|
// The interface type is the type of `Self`.
|
|
auto self_type_id =
|
|
context.insts().Get(interface_info.self_param_id).type_id();
|
|
|
|
// Register this declaration as declaring an associated entity.
|
|
auto index = SemIR::ElementIndex(
|
|
context.args_type_info_stack().PeekCurrentBlockContents().size());
|
|
context.args_type_info_stack().AddInstId(decl_id);
|
|
|
|
// Name lookup for the declaration's name should name the associated entity,
|
|
// not the declaration itself.
|
|
auto type_id = context.GetAssociatedEntityType(
|
|
self_type_id, context.insts().Get(decl_id).type_id());
|
|
return context.AddInstReusingLoc<SemIR::AssociatedEntity>(
|
|
context.insts().GetLocId(decl_id),
|
|
{.type_id = type_id, .index = index, .decl_id = decl_id});
|
|
}
|
|
|
|
} // namespace Carbon::Check
|