Files
carbon-lang/toolchain/check/handle_array.cpp
T
Jon Ross-Perkins 4923445e3a Drop Singleton from ErrorInst::SingletonInstId and similar (#5304)
We frequently want to operate on singletons. Per discussion, drop
`Singleton` to make the code shorter.

This started off as wanting to write `inst_id.is_error()`, but the
dependency relationship between ids.h and singleton_insts.h would
require some kind of delayed evaluation to allow the implementation to
remain in headers (which I suspect is helpful to have for inlining). I
could have added something like `IsErrorInst`, forward declared in ids.h
and defined in singleton_insts.h (which would always be included by
typed_insts.h), but the template approach felt like a decent balance
between (a) removing the boilerplate `::SingletonInstId`, (b)
understandability, (c) still visually mirroring if we immediately return
a singleton, and (d) flexibility for more than just `ErrorInst`. But TBH
I'd probably still have written `is_error()` if it didn't require
addressing the cross-header cycle.

Then I tried `SemIR::InstId::Is<SemIR::ErrorInst>`, which generally
worked with types but generated the complaint that it didn't shorten
*all* singleton uses. So pulling back on `::Is`, and instead just
dropping `Singleton`.
2025-04-15 22:40:29 +00:00

62 lines
2.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"
#include "toolchain/check/handle.h"
#include "toolchain/check/inst.h"
#include "toolchain/check/type.h"
#include "toolchain/parse/node_kind.h"
namespace Carbon::Check {
auto HandleParseNode(Context& /*context*/,
Parse::ArrayExprOpenParenId /*node_id*/) -> bool {
return true;
}
auto HandleParseNode(Context& /*context*/,
Parse::ArrayExprKeywordId /*node_id*/) -> bool {
return true;
}
auto HandleParseNode(Context& /*context*/, Parse::ArrayExprCommaId /*node_id*/)
-> bool {
return true;
}
auto HandleParseNode(Context& context, Parse::ArrayExprId node_id) -> bool {
auto bound_inst_id = context.node_stack().PopExpr();
auto [element_type_node_id, element_type_inst_id] =
context.node_stack().PopExprWithNodeId();
auto element_type =
ExprAsType(context, element_type_node_id, element_type_inst_id);
// The array bound must be a constant. Diagnose this prior to conversion
// because conversion to `IntLiteral` will produce a generic "non-constant
// call to compile-time-only function" error.
//
// TODO: Should we support runtime-phase bounds in cases such as:
// comptime fn F(n: i32) -> type { return array(i32; n); }
if (!context.constant_values().Get(bound_inst_id).is_constant()) {
CARBON_DIAGNOSTIC(InvalidArrayExpr, Error, "array bound is not a constant");
context.emitter().Emit(bound_inst_id, InvalidArrayExpr);
context.node_stack().Push(node_id, SemIR::ErrorInst::InstId);
return true;
}
bound_inst_id = ConvertToValueOfType(
context, context.insts().GetLocId(bound_inst_id), bound_inst_id,
GetSingletonType(context, SemIR::IntLiteralType::InstId));
AddInstAndPush<SemIR::ArrayType>(
context, node_id,
{.type_id = SemIR::TypeType::TypeId,
.bound_id = bound_inst_id,
.element_type_inst_id = element_type.inst_id});
return true;
}
} // namespace Carbon::Check