The INCLUDE-FILE option is only used in the toolchain tests for now. If specified in a file test, the given file path is added to the test's arguments. For toolchain tests this makes the file's package available to the test. The `--custom-core` command line flag is added to the driver, which avoids adding the production `Core` package to the command line. Together, these allow a test to provide their own minimal `Core` package. For example, this would replace `Core` with the package and prelude in `facet_types.carbon`. ``` // INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon // EXTRA-ARGS: --custom-core ``` To support this: * //testing knows how to parse INCLUDE-FILE out of the header of a test file. * //testing adds the file to the virtual file system, and includes it in the test's arguments. * //toolchain/driver grows the --custom-core command line flag to avoid loading the production `Core` package. Tests that were creating their own minimal prelude to define BitAnd on types are now pointed to toolchain/testing/min_prelude/facet_types.carbon as the prelude. They no longer need to `import Core` in each test as a result. Such tests are no longer `no_prelude`, but instead have their own prelude. So they are moved to a `min_prelude` subdirectory. Closes #5076
24 KiB
Adding features
Table of contents
Lex
New lexed tokens must be added to
token_kind.def. CARBON_SYMBOL_TOKEN and
CARBON_KEYWORD_TOKEN both provide some built-in lexing logic, while
CARBON_TOKEN requires custom lexing support.
TokenizedBuffer::Lex is the main dispatch for lexing, and calls that need to do custom lexing will be dispatched there.
Parse
A parser feature will have state transitions that produce new parse nodes.
The resulting parse nodes are in
parse/node_kind.def and
typed_nodes.h. When choosing node structure,
consider how semantics will process it in post-order; this will rule out some
designs. Adding a parse node kind will also require a handler in the Check
step.
The state transitions are in parse/state.def. Each
CARBON_PARSER_STATE defines a distinct state and has comments for state
transitions. If several states should share handling, name them
FeatureAsVariant.
Adding a state requires adding a Handle<name> function in an appropriate
parse/handle_*.cpp file, possibly a new file. The macros are used to generate
declarations in the header, so only extra helper functions should be added
there. Every state handler pops the state from the stack before any other
processing.
Typed parse node metadata implementation
As of #3534:
TODO: Convert this chart to Mermaid.
-
common/enum_base.h defines the
EnumBaseCRTP class extendingPrintablefrom common/ostream.h, along withCARBON_ENUMmacros for making enumerations -
parse/node_kind.h includes common/enum_base.h and defines an enumeration
NodeKind, along with bitmask enumNodeCategory.-
The
NodeKindenumeration is populated with the list of all parse node kinds using parse/node_kind.def (using the .def file idiom) declared in this file using a macro from common/enum_base.h -
NodeKindhas a member typeNodeKind::Definitionthat extendsNodeKindand adds aNodeCategoryfield (and others in the future). -
NodeKindhas a methodDefinefor creating aNodeKind::Definitionwith the same enumerant value, plus values for the other fields. -
HasKindMember<T>at the bottom of parse/node_kind.h uses field detection to determine if the typeThas aNodeKind::Definition Kindstatic constant member.- Note: both the type and name of these fields must match exactly.
-
Note that additional information is needed to define the
category()method (and other methods in the future) ofNodeKind. This information comes from the typed parse node definitions in parse/typed_nodes.h (described below).
-
-
parse/node_ids.h defines a number of types that store a node id that identifies a node in the parse tree
-
NodeIdstores a node id with no restrictions -
NodeIdForKind<Kind>inherits fromNodeIdand stores the id of a node that must have the specifiedNodeKind"Kind". Note that this is not used directly, instead aliasesFooIdforNodeIdForKind<NodeKind::Foo>are defined for every node kind using parse/node_kind.def (using the .def file idiom). -
NodeIdInCategory<Category>inherits fromNodeIdand stores the id of a node that must overlap the specifiedNodeCategory"Category". Note that this is not typically used directly, instead this file defines aliasesAnyDeclId,AnyExprId, ...,AnyStatementId. -
Similarly
NodeIdOneOf<T, U>andNodeIdNot<V>inherit fromNodeIdand stores the id of a node restricted to either matchingT::KindorU::Kindor not matchingV::Kind. -
In addition to the node id type definitions above, the struct
NodeForId<T>is declared but not defined.
-
-
parse/typed_nodes.h defines a typed parse node struct type for each kind of parse node.
-
Each one defines a static constant named
Kindthat is set using a call toDefine()on the corresponding enumerant member ofNodeKindfrom parse/node_kind.h (which is included by this file). -
The fields of these types specify the children of the parse node using the types from parse/node_ids.h.
-
The struct
NodeForId<T>that is declared in parse/node_ids.h is defined in this file such thatNodeForId<FooId>::TypedNodeis theFootyped parse node struct type. -
This file will fail to compile unless every kind of parse node kind defined in parse/node_kind.def has a corresponding struct type in this file.
-
-
parse/node_kind.cpp includes both parse/node_kind.h and parse/typed_nodes.h
-
Uses the macro from common/enum_base.h, the enumerants of
NodeKindare defined using the list of parse node kinds from parse/node_kind.def (using the .def file idiom). -
NodeKind::definition()is defined. It has a static table ofconst NodeKind::Definition*indexed by the enum value, populated by taking the address of theKindmember of each typed parse node struct type, using the list from parse/node_kind.def. -
NodeKind::category()is defined usingNodeKind::definition(). -
Tested assumption: the tables built in this file are indexed by the enum values. We rely on the fact that we get the parse node kinds in the same order by consistently using parse/node_kind.def.
-
-
parse/tree.h includes parse/node_ids.h. It does not depend on parse/typed_nodes.h to reduce compilation time in those files that don't use the typed parse node struct types.
-
Defines
Tree::Extract... functions that take a node id and return a typed parse node struct type from parse/typed_nodes.h. -
Uses
HasKindMember<T>to restrict callingExtractAsexcept on typed nodes defined in parse/typed_nodes.h. -
Tree::ExtractusesNodeForId<T>to get the corresponding typed parse node struct type for aFooIdtype defined in parse/node_ids.h.- Note that this is done without a dependency on the typed parse node
struct types by using the forward declaration of
NodeForId<T>from parse/node_ids.h.
- Note that this is done without a dependency on the typed parse node
struct types by using the forward declaration of
-
The
Tree::Extract... functions ultimately callTree::TryExtractNodeFromChildren<T>, which is a templated function only declared in this file. Its definition is in parse/extract.cpp.
-
-
parse/extract.cpp includes parse/tree.h and parse/typed_nodes.h
-
Defines struct
Extractable<T>that defines how to extract a field of typeTfrom aTree::SiblingIteratorpointing at the corresponding child node. -
Extractable<T>is defined for the node id types defined in parse/node_ids.h. -
In addition,
Extractable<T>is defined for standard typesstd::optional<U>andllvm::SmallVector<V>, to support optional and repeated children. -
Uses struct reflection to support aggregate struct types containing extractable fields. This is used to support typed parse node struct types as well as struct fields that they contain.
-
Uses
HasKindMember<Foo>to detect accidental uses of a parse node type directly as fields of typed parse node struct types -- in those placesFooIdshould be used instead. -
Defines
Tree::TryExtractNodeFromChildren<T>and explicitly instantiates it for every typed parse node struct type defined in parse/typed_nodes.h using parse/node_kind.def (using the .def file idiom). By explicitly instantiating this function only in this file, we avoid redundant compilation work, which reduces build times, and allow us to keep all the extraction machinery as a private implementation detail of this file.
-
-
parse/typed_nodes_test.cpp validates that each typed parse node struct type has a static
Kindmember that defines the correct correspondingNodeKind, and that thecategory()function agrees between theNodeKindandNodeKind::Definition.
Note: this is broadly similar to SemIR typed instruction metadata implementation.
Check
Each parse node kind requires adding a Handle<kind> function in a
check/handle_*.cpp file.
Adding a new SemIR instruction
If the resulting SemIR needs a new instruction:
-
Add a new kind to sem_ir/inst_kind.def.
- Add a
CARBON_SEM_IR_INST_KIND(NewInstKindName)line in alphabetical order
- Add a
-
Add a new struct definition to sem_ir/typed_insts.h, such as:
struct NewInstKindName { static constexpr auto Kind = // `Parse::SomeId` should be one of: // - A node ID from `parse/node_ids.h`, // specifying the kind of parse nodes for this instruction. // This could be a node kind from `parse/node_kind.def` // suffixed by `Id`, or one of the `Any`...`Id` alias // declarations that match multiple kinds of parse nodes. // - `Parse::NodeId` if it can be any kind of parse node. // - `Parse::InvalidNodeId` if no associated parse node. InstKind::NewInstKindName.Define<Parse::SomeId>( // The name used in textual IR: {.ir_name = "new_inst_kind_name"} // Other parameters have defaults. ); // Optional: Include if this instruction produces a value used in // an expression. TypeId type_id; // 0-2 id fields, with types from sem_ir/ids.h or // sem_ir/builtin_kind.h. For example, fields would look like: StringId name_id; InstId value_id; };-
sem_ir/inst_kind.hdocuments the different options when defining a new instruction, as well as their defaults, seeInstKind::DefinitionInfo. -
If an instruction always produces a type:
-
Set
.is_type = InstIsType::Alwaysin itsKinddefinition. -
When constructing instructions of this kind, pass
SemIR::TypeType::SingletonTypeIdin as the value of thetype_idfield, as in:SemIR::InstId inst_id = AddInst<SemIR::NewInstKindName>(context, node_id, {.type_id = SemIR::TypeType::SingletonTypeId, ...});
-
-
Although most instructions have distinct types represented by instructions like
ClassType, we also have builtin types for cases where types don't need to be distinct per-entity. This is rare, but used, for example, when an expression implicitly uses a value as part of SemIR evaluation or as part of desugaring. We have builtin types for bound methods, namespaces, witnesses, among others. These are constructed as a special-case inFileconstruction. To get a type id for one of these builtin types, use something likeGetSingletonType(context,SemIR::WitnessType::SingletonInstId), as in:SemIR::TypeId witness_type_id = GetSingletonType(context, SemIR::WitnessType::SingletonInstId); SemIR::InstId inst_id = AddInst<SemIR::NewInstKindName>( context, node_id, {.type_id = witness_type_id, ...}); -
Instructions without types may still be used as arguments to instructions.
-
Once those are added, a rebuild will give errors showing what needs to be updated. The updates needed, can depend on whether the instruction produces a type. Look to the comments on those functions for instructions on what is needed.
Instructions won't be given a name unless
InstNamer::CollectNamesInBlock is called
on the InstBlockId they are a member of. As of this writing,
InstNamer::CollectNamesInBlock should only be called once per InstBlockId.
To accomplish this, there should be one instruction kind that "owns" the
instruction block, and will have a case in InstNamer::CollectNamesInBlock that
visits the InstBlockId. That instruction kind will typically use
FormatTrailingBlock in the sem_ir/formatter.cpp to list the instructions in
curly braces ({...}). Other instructions that reference that InstBlockId
will use the default rendering that has just the instruction names in parens
((...)).
Adding an instruction will generally also require a handler in the Lower step.
Most new instructions will automatically be formatted reasonably by the SemIR
formatter. If not, then add a FormatInst overload to
sem_ir/formatter.cpp. If only the arguments
need custom formatting, then a FormatInstRhs overload can be implemented
instead.
If the resulting SemIR needs a new built-in, add it to
File construction.
SemIR typed instruction metadata implementation
How does this work? As of #3310:
TODO: Convert this chart to Mermaid.
-
common/enum_base.h defines the
EnumBaseCRTP class extendingPrintablefrom common/ostream.h, along withCARBON_ENUMmacros for making enumerations -
sem_ir/inst_kind.h includes common/enum_base.h and defines an enumeration
InstKind, along withInstValueKindandTerminatorKind.-
The
InstKindenumeration is populated with the list of all instruction kinds using sem_ir/inst_kind.def (using the .def file idiom) declared in this file using a macro from common/enum_base.h -
InstKindhas a member typeInstKind::Definitionthat extendsInstKindand adds their_namestring field, and aTerminatorKindfield. -
InstKindhas a methodDefinefor creating aInstKind::Definitionwith the same enumerant value, plus values for the other fields.
-
-
Note that additional information is needed to define the
ir_name(),value_kind(), andterminator_kind()methods ofInstKind. This information comes from the typed instruction definitions in sem_ir/typed_insts.h. -
sem_ir/typed_insts.h defines a typed instruction struct type for each kind of SemIR instruction, as described above.
- Each one defines a static constant named
Kindthat is set using a call toDefine()on the corresponding enumerant member ofInstKindfrom sem_ir/inst_kind.h (which is included by this file).
- Each one defines a static constant named
-
HasParseNodeMember<TypedInst>andHasTypeIdMember<TypedInst>at the bottom of sem_ir/typed_insts.h use field detection to determine ifTypedInsthas aParse::Node parse_nodeor aTypeId type_idfield respectively.- Note: both the type and name of these fields must match exactly.
-
sem_ir/inst_kind.cpp includes both sem_ir/inst_kind.h and sem_ir/typed_insts.h
-
Uses the macro from common/enum_base.h, the enumerants of
InstKindare defined using the list of instruction kinds from sem_ir/inst_kind.def (using the .def file idiom) -
InstKind::value_kind()is defined. It has a static table ofInstValueKindvalues indexed by the enum value, populated by applyingHasTypeIdMemberfrom sem_ir/typed_insts.h to every instruction kind by using the list from sem_ir/inst_kind.def. -
InstKind::definition()is defined. It has a static table ofconst InstKind::Definition*indexed by the enum value, populated by taking the address of theKindmember of eachTypedInst, using the list from sem_ir/inst_kind.def. -
InstKind::ir_name()andInstKind::terminator_kind()are defined usingInstKind::definition(). -
Tested assumption: the tables built in this file are indexed by the enum values. We rely on the fact that we get the instruction kinds in the same order by consistently using sem_ir/inst_kind.def.
-
This file will fail to compile unless every kind of SemIR instruction defined in sem_ir/inst_kind.def has a corresponding struct type in sem_ir/typed_insts.h.
-
-
TypedInstArgsInfo<TypedInst>defined in sem_ir/inst.h uses struct reflection to determine the other fields fromTypedInst. It skips theparse_nodeandtype_idfields usingHasParseNodeMember<TypedInst>andHasTypeIdMember<TypedInst>.- Tested assumption: the
parse_nodeandtype_idare the first fields inTypedInst, and there are at most two more fields.
- Tested assumption: the
-
sem_ir/inst.h defines templated conversions between
Instand each of the typed instruction structs:-
Uses
TypedInstArgsInfo<TypedInst>,HasParseNodeMember<TypedInst>, andHasTypeIdMember<TypedInst>, and local lambda. -
Defines a templated
ToRawfunction that converts the various id field types to anint32_t. -
Defines a templated
FromRaw<T>function that converts anint32_ttoTto perform the opposite conversion. -
Tested assumption: The
parse_nodefield is first, when present, and thetype_idis next, when present, in eachTypedInststruct type.
-
-
The "tested assumptions" above are all tested by sem_ir/typed_insts_test.cpp
Lower
Each SemIR instruction requires adding a Handle<kind> function in a
lower/handle_*.cpp file.
Tests and debugging
Running tests
Tests are run in bulk as bazel test //toolchain/.... Many tests are using the
file_test infrastructure; see
testing/file_test/README.md for information.
There are several supported ways to run Carbon on a given test file. For
example, with toolchain/parse/testdata/basics/empty.carbon:
bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/parse/testdata/basics/empty.carbon- Executes an individual test.
bazel run //toolchain -- compile --phase=parse --dump-parse-tree toolchain/parse/testdata/basics/empty.carbon- Explicitly runs
carbonwith the provided arguments.
- Explicitly runs
bazel-bin/toolchain/carbon compile --phase=parse --dump-parse-tree toolchain/parse/testdata/basics/empty.carbon- Similar to the previous command, but without using
bazel run. This can be useful with a debugger or other tool that needs to directly run the binary.
- Similar to the previous command, but without using
bazel run //toolchain -- -v compile --phase=check toolchain/check/testdata/basics/run.carbon- Runs using
-vfor verbose log output, and running through thecheckphase.
- Runs using
Updating tests
The toolchain/autoupdate_testdata.py script can be used to update output. It
invokes the file_test autoupdate support. See
testing/file_test/README.md for file syntax.
Reviewing test deltas
Using autoupdate_testdata.py can be useful to produce deltas during the
development process because it allows git status and git diff to be used to
examine what changed.
Minimal Core prelude
For most file tests in check/, very little of the Core package is used, and
the test is not intentionally testing the Core package itself. Compiling the
entire Core package adds a lot of noise during interactive debugging, which
can be avoided by using a minimal prelude.
To replace the production Core package with a minimal one, add the path to a
minimal Core package and prelude library to the file test with the
INCLUDE-FILE directive, and tell the toolchain to avoid loading the production
Core package by adding --custom-core to the EXTRA-ARGS directive, for
example:
// INCLUDE-FILE: toolchain/testing/min_prelude/facet_types.carbon
// EXTRA-ARGS: --custom-core
We have a set of minimal Core preludes for testing different compiler feature
areas in //toolchain/testing/min_prelude/. Each file begins with the line
package Core library "prelude"; to make it provide a prelude.
Verbose output
The -v flag can be passed to trace state, and should be specified before the
subcommand name: carbon -v compile .... CARBON_VLOG is used to print output
in this mode. There is currently no control over the degree of verbosity.
Stack traces
While the iterative processing pattern means function stack traces will have
minimal context for how the current function is reached, we use LLVM's
PrettyStackTrace to include details about the state stack. The state stack
will be above the function stack in crash output.
Dumping objects in interactive debuggers
We provide namespace-scoped Dump functions in several components, such as
check/dump.cpp. These Dump functions will print
contextual information about an object to stderr. The files contain details
regarding support.
Objects which inherit from Printable also have Dump member functions, but
these will lack contextual information.