carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix expected signature for type.and. (#5613)

Browse Source 
The former signature unintentionally allowed any parameter and result
types, because it only checked that the type of the type was `type`,
which is tautological (for non-error values). Also add missing tests for
the builtin.
This commit is contained in:
Richard Smith
2025-06-04 23:42:20 +00:00
committed by GitHub
parent 315c79ea33
commit a508b00883
9 changed files with 317 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/sem_ir/builtin_function_kind.cpp
+2 -14
View File
@@ -128,18 +128,6 @@ struct AnyFloat {
// Constraint that requires the type to be the type type.
using Type = BuiltinType<TypeType::TypeInstId>;
// Constraint that requires the type to be a type value, whose type is type
// type. Also accepts symbolic constant value types.
struct AnyType {
static auto Check(const File& sem_ir, ValidateState& state, TypeId type_id)
-> bool {
if (BuiltinType<TypeType::TypeInstId>::Check(sem_ir, state, type_id)) {
return true;
}
return sem_ir.types().GetAsInst(type_id).type_id() == TypeType::TypeId;
}
};
// Checks that the specified type matches the given type constraint.
template <typename TypeConstraint>
auto Check(const File& sem_ir, ValidateState& state, TypeId type_id) -> bool {
@@ -513,8 +501,8 @@ constexpr BuiltinInfo BoolNeq = {"bool.neq",
ValidateSignature<auto(Bool, Bool)->Bool>};
// "type.and": facet type combination.
constexpr BuiltinInfo TypeAnd = {
"type.and", ValidateSignature<auto(AnyType, AnyType)->AnyType>};
constexpr BuiltinInfo TypeAnd = {"type.and",
ValidateSignature<auto(Type, Type)->Type>};
} // namespace BuiltinFunctionInfo