carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 07:24:42 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Switch constexpr factory functions to constexpr values. (#2581)

Browse Source 
Using the same const/constexpr done in EnumBase, adds Invalid and Builtin* values to replace Make functions that produced the same. This should make it clearer at call sites what the cost actually is, and reduces the syntactic overhead for MakeBuiltinReference in particular.

Really, this is that MakeBuiltinReference has been feeling pretty verbose, so I did that, and then one MakeInvalid is right next to it, and then obviously I should replace the other MakeInvalid for consistency...
This commit is contained in:
Jon Ross-Perkins
2023-02-06 15:57:33 -08:00
committed by GitHub
parent 1a8a41a5a6
commit 5a0613283b
4 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/semantics_node.h
+20 -15
View File
@@ -17,15 +17,14 @@ namespace Carbon {
// Type-safe storage of Node IDs.
struct SemanticsNodeId : public IndexBase {
// Uses the cross-reference node ID for a builtin. This relies on SemanticsIR
// guarantees for builtin cross-reference placement.
static auto MakeBuiltinReference(SemanticsBuiltinKind kind)
-> SemanticsNodeId {
return SemanticsNodeId(kind.AsInt());
}
// An explicitly invalid node ID.
// NOLINTNEXTLINE(readability-identifier-naming)
static const SemanticsNodeId Invalid;
// Constructs an explicitly invalid instance.
static auto MakeInvalid() -> SemanticsNodeId { return SemanticsNodeId(); }
// Builtin node IDs.
#define CARBON_SEMANTICS_BUILTIN_KIND(Name) \
static const SemanticsNodeId Builtin##Name;
#include "toolchain/semantics/semantics_builtin_kind.def"
using IndexBase::IndexBase;
auto Print(llvm::raw_ostream& out) const -> void {
@@ -34,6 +33,15 @@ struct SemanticsNodeId : public IndexBase {
}
};
constexpr SemanticsNodeId SemanticsNodeId::Invalid = SemanticsNodeId();
// Uses the cross-reference node ID for a builtin. This relies on SemanticsIR
// guarantees for builtin cross-reference placement.
#define CARBON_SEMANTICS_BUILTIN_KIND(Name) \
constexpr SemanticsNodeId SemanticsNodeId::Builtin##Name = \
SemanticsNodeId(SemanticsBuiltinKind::Name.AsInt());
#include "toolchain/semantics/semantics_builtin_kind.def"
// The ID of a callable, such as a function.
struct SemanticsCallableId : public IndexBase {
using IndexBase::IndexBase;
@@ -157,7 +165,7 @@ class SemanticsNode {
static auto MakeCrossReference(SemanticsNodeId type,
SemanticsCrossReferenceIRId ir,
SemanticsNodeId node) -> SemanticsNode {
return SemanticsNode(ParseTree::Node::MakeInvalid(),
return SemanticsNode(ParseTree::Node::Invalid,
SemanticsNodeKind::CrossReference, type, ir.index,
node.index);
}
@@ -196,9 +204,7 @@ class SemanticsNode {
SemanticsIntegerLiteralId integer)
-> SemanticsNode {
return SemanticsNode(parse_node, SemanticsNodeKind::IntegerLiteral,
SemanticsNodeId::MakeBuiltinReference(
SemanticsBuiltinKind::IntegerType),
integer.index);
SemanticsNodeId::BuiltinIntegerType, integer.index);
}
auto GetAsIntegerLiteral() const -> SemanticsIntegerLiteralId {
CARBON_CHECK(kind_ == SemanticsNodeKind::IntegerLiteral);
@@ -206,9 +212,8 @@ class SemanticsNode {
}
static auto MakeRealLiteral(ParseTree::Node parse_node) -> SemanticsNode {
return SemanticsNode(
parse_node, SemanticsNodeKind::RealLiteral,
SemanticsNodeId::MakeBuiltinReference(SemanticsBuiltinKind::RealType));
return SemanticsNode(parse_node, SemanticsNodeKind::RealLiteral,
SemanticsNodeId::BuiltinRealType);
}
auto GetAsRealLiteral() const -> NoArgs {
CARBON_CHECK(kind_ == SemanticsNodeKind::RealLiteral);