aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/codegen.cpp236
-rw-r--r--src/ir.cpp89
2 files changed, 174 insertions, 151 deletions
diff --git a/src/codegen.cpp b/src/codegen.cpp
index 2e7cc937b4..7d83a38bbf 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -6349,143 +6349,143 @@ static void define_builtin_compile_vars(CodeGen *g) {
{
// TODO: Add method info where methods are supported.
buf_appendf(contents,
- "pub const IntInfo = struct {\n"
- " is_signed: bool,\n"
- " bits: u8,\n"
- "};\n"
- "\n"
- "pub const FloatInfo = struct {\n"
- " bits: u8,\n"
- "};\n"
+ "pub const TypeInfo = union(TypeId) {\n"
+ " Type: void,\n"
+ " Void: void,\n"
+ " Bool: void,\n"
+ " NoReturn: void,\n"
+ " Int: Int,\n"
+ " Float: Float,\n"
+ " Pointer: Pointer,\n"
+ " Array: Array,\n"
+ " Struct: Struct,\n"
+ " FloatLiteral: void,\n"
+ " IntLiteral: void,\n"
+ " UndefinedLiteral: void,\n"
+ " NullLiteral: void,\n"
+ " Nullable: Nullable,\n"
+ " ErrorUnion: ErrorUnion,\n"
+ " ErrorSet: ErrorSet,\n"
+ " Enum: Enum,\n"
+ " Union: Union,\n"
+ " Fn: Fn,\n"
+ " Namespace: void,\n"
+ " Block: void,\n"
+ " BoundFn: BoundFn,\n"
+ " ArgTuple: void,\n"
+ " Opaque: void,\n"
+ " Promise: Promise,\n"
+ "\n\n"
+ " pub const Int = struct {\n"
+ " is_signed: bool,\n"
+ " bits: u8,\n"
+ " };\n"
"\n"
- "pub const PointerInfo = struct {\n"
- " is_const: bool,\n"
- " is_volatile: bool,\n"
- " alignment: u32,\n"
- " child: &TypeInfo,\n"
- "};\n"
+ " pub const Float = struct {\n"
+ " bits: u8,\n"
+ " };\n"
"\n"
- "pub const ArrayInfo = struct {\n"
- " len: usize,\n"
- " child: &TypeInfo,\n"
- "};\n"
+ " pub const Pointer = struct {\n"
+ " is_const: bool,\n"
+ " is_volatile: bool,\n"
+ " alignment: u32,\n"
+ " child: &TypeInfo,\n"
+ " };\n"
"\n"
- "pub const ContainerLayout = enum {\n"
- " Auto,\n"
- " Extern,\n"
- " Packed,\n"
- "};\n"
+ " pub const Array = struct {\n"
+ " len: usize,\n"
+ " child: &TypeInfo,\n"
+ " };\n"
"\n"
- "pub const StructFieldInfo = struct {\n"
- " name: []const u8,\n"
- " offset: usize,\n"
- " type_info: TypeInfo,\n"
- "};\n"
+ " pub const ContainerLayout = enum {\n"
+ " Auto,\n"
+ " Extern,\n"
+ " Packed,\n"
+ " };\n"
"\n"
- "pub const StructInfo = struct {\n"
- " layout: ContainerLayout,\n"
- " fields: []StructFieldInfo,\n"
- "};\n"
+ " pub const StructField = struct {\n"
+ " name: []const u8,\n"
+ " offset: usize,\n"
+ " type_info: TypeInfo,\n"
+ " };\n"
"\n"
- "pub const NullableInfo = struct {\n"
- " child: &TypeInfo,\n"
- "};\n"
+ " pub const Struct = struct {\n"
+ " layout: ContainerLayout,\n"
+ " fields: []StructField,\n"
+ " };\n"
"\n"
- "pub const ErrorUnionInfo = struct {\n"
- " error_set: ErrorSetInfo,\n"
- " payload: &TypeInfo,\n"
- "};\n"
+ " pub const Nullable = struct {\n"
+ " child: &TypeInfo,\n"
+ " };\n"
"\n"
- "pub const ErrorInfo = struct {\n"
- " name: []const u8,\n"
- " value: usize,\n"
- "};\n"
+ " pub const ErrorUnion = struct {\n"
+ " error_set: ErrorSet,\n"
+ " payload: &TypeInfo,\n"
+ " };\n"
"\n"
- "pub const ErrorSetInfo = struct {\n"
- " errors: []ErrorInfo,\n"
- "};\n"
+ " pub const Error = struct {\n"
+ " name: []const u8,\n"
+ " value: usize,\n"
+ " };\n"
"\n"
- "pub const EnumFieldInfo = struct {\n"
- " name: []const u8,\n"
- " value: usize,\n"
- "};\n"
+ " pub const ErrorSet = struct {\n"
+ " errors: []Error,\n"
+ " };\n"
"\n"
- "pub const EnumInfo = struct {\n"
- " layout: ContainerLayout,\n"
- " tag_type: IntInfo,\n"
- " fields: []EnumFieldInfo,\n"
- "};\n"
+ " pub const EnumField = struct {\n"
+ " name: []const u8,\n"
+ " value: usize,\n"
+ " };\n"
"\n"
- "pub const UnionFieldInfo = struct {\n"
- " name: []const u8,\n"
- " enum_field: EnumFieldInfo,\n"
- " type_info: TypeInfo,\n"
- "};\n"
+ " pub const Enum = struct {\n"
+ " layout: ContainerLayout,\n"
+ " tag_type: Int,\n"
+ " fields: []EnumField,\n"
+ " };\n"
"\n"
- "pub const UnionInfo = struct {\n"
- " layout: ContainerLayout,\n"
- " tag_type: ?EnumInfo,\n"
- " fields: []UnionFieldInfo,\n"
- "};\n"
+ " pub const UnionField = struct {\n"
+ " name: []const u8,\n"
+ " enum_field: EnumField,\n"
+ " type_info: TypeInfo,\n"
+ " };\n"
"\n"
- "pub const CallingConvention = enum {\n"
- " Unspecified,\n"
- " C,\n"
- " Cold,\n"
- " Naked,\n"
- " Stdcall,\n"
- " Async,\n"
- "};\n"
+ " pub const Union = struct {\n"
+ " layout: ContainerLayout,\n"
+ " tag_type: ?Enum,\n"
+ " fields: []UnionField,\n"
+ " };\n"
"\n"
- "pub const FnArgInfo = struct {\n"
- " is_comptime: bool,\n"
- " name: []const u8,\n"
- " type_info: TypeInfo,\n"
- "};\n"
+ " pub const CallingConvention = enum {\n"
+ " Unspecified,\n"
+ " C,\n"
+ " Cold,\n"
+ " Naked,\n"
+ " Stdcall,\n"
+ " Async,\n"
+ " };\n"
"\n"
- "pub const FnInfo = struct {\n"
- " calling_convention: CallingConvention,\n"
- " is_generic: bool,\n"
- " is_varargs: bool,\n"
- " return_type: &TypeInfo,\n"
- " args: []FnArgInfo,\n"
- "};\n"
+ " pub const FnArg = struct {\n"
+ " is_comptime: bool,\n"
+ " name: []const u8,\n"
+ " type_info: TypeInfo,\n"
+ " };\n"
"\n"
- "pub const BoundFnInfo = struct {\n"
- " bound_type: &TypeInfo,\n"
- " fn_info: FnInfo,\n"
- "};\n"
+ " pub const Fn = struct {\n"
+ " calling_convention: CallingConvention,\n"
+ " is_generic: bool,\n"
+ " is_varargs: bool,\n"
+ " return_type: &TypeInfo,\n"
+ " args: []FnArg,\n"
+ " };\n"
"\n"
- "pub const PromiseInfo = struct {\n"
- " child: ?&TypeInfo,\n"
- "};\n"
+ " pub const BoundFn = struct {\n"
+ " bound_type: &TypeInfo,\n"
+ " fn_info: Fn,\n"
+ " };\n"
"\n"
- "pub const TypeInfo = union(TypeId) {\n"
- " Type: void,\n"
- " Void: void,\n"
- " Bool: void,\n"
- " NoReturn: void,\n"
- " Int: IntInfo,\n"
- " Float: FloatInfo,\n"
- " Pointer: PointerInfo,\n"
- " Array: ArrayInfo,\n"
- " Struct: StructInfo,\n"
- " FloatLiteral: void,\n"
- " IntLiteral: void,\n"
- " UndefinedLiteral: void,\n"
- " NullLiteral: void,\n"
- " Nullable: NullableInfo,\n"
- " ErrorUnion: ErrorUnionInfo,\n"
- " ErrorSet: ErrorSetInfo,\n"
- " Enum: EnumInfo,\n"
- " Union: UnionInfo,\n"
- " Fn: FnInfo,\n"
- " Namespace: void,\n"
- " Block: void,\n"
- " BoundFn: BoundFnInfo,\n"
- " ArgTuple: void,\n"
- " Opaque: void,\n"
- " Promise: PromiseInfo,\n"
+ " pub const Promise = struct {\n"
+ " child: ?&TypeInfo,\n"
+ " };\n"
"};\n\n");
assert(ContainerLayoutAuto == 0);
assert(ContainerLayoutExtern == 1);
diff --git a/src/ir.cpp b/src/ir.cpp
index a68747fce4..1f2ef0e68f 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -15737,7 +15737,8 @@ static TypeTableEntry *ir_analyze_instruction_offset_of(IrAnalyze *ira,
return ira->codegen->builtin_types.entry_num_lit_int;
}
-static void ensure_field_index(TypeTableEntry *type, const char *field_name, size_t index) {
+static void ensure_field_index(TypeTableEntry *type, const char *field_name, size_t index)
+{
Buf *field_name_buf;
assert(type != nullptr && !type_is_invalid(type));
@@ -15747,7 +15748,8 @@ static void ensure_field_index(TypeTableEntry *type, const char *field_name, siz
(buf_deinit(field_name_buf), true));
}
-static void ir_type_info_struct_set_parent(ConstExprValue *struct_val, ConstExprValue *parent, ssize_t parent_field_index) {
+static void ir_type_info_struct_set_parent(ConstExprValue *struct_val, ConstExprValue *parent, ssize_t parent_field_index)
+{
assert(struct_val->type->id == TypeTableEntryIdStruct);
assert(parent->type != nullptr && !type_is_invalid(parent->type));
@@ -15771,6 +15773,37 @@ static void ir_type_info_struct_set_parent(ConstExprValue *struct_val, ConstExpr
}
}
+static TypeTableEntry *ir_type_info_get_type(IrAnalyze *ira, const char *type_name)
+{
+ ConstExprValue *type_info_var = get_builtin_value(ira->codegen, "TypeInfo");
+ assert(type_info_var->type->id == TypeTableEntryIdMetaType);
+
+ TypeTableEntry *type_info_type = type_info_var->data.x_type;
+ assert(type_info_type->id == TypeTableEntryIdUnion);
+
+ if (type_name == nullptr)
+ return type_info_type;
+
+ // @TODO
+
+ ScopeDecls *type_info_scope = get_container_scope(type_info_type);
+ assert(type_info_scope != nullptr);
+
+ Buf field_name = BUF_INIT;
+ buf_init_from_str(&field_name, type_name);
+ auto entry = type_info_scope->decl_table.maybe_get(&field_name);
+ buf_deinit(&field_name);
+ assert(entry != nullptr);
+
+ TldVar *tld = (TldVar *)entry->value;
+ assert(tld->base.id == TldIdVar);
+
+ VariableTableEntry *var = tld->var;
+
+ assert(var->value->type->id == TypeTableEntryIdMetaType);
+ return var->value->data.x_type;
+}
+
static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *parent,
ssize_t parent_field_index, TypeTableEntry *type_entry)
{
@@ -15798,10 +15831,7 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *p
{
ConstExprValue *payload = create_const_vals(1);
payload->special = ConstValSpecialStatic;
-
- ConstExprValue *int_info_type = get_builtin_value(ira->codegen, "IntInfo");
- assert(int_info_type->type->id == TypeTableEntryIdMetaType);
- payload->type = int_info_type->data.x_type;
+ payload->type = ir_type_info_get_type(ira, "Int");
ConstExprValue *fields = create_const_vals(2);
payload->data.x_struct.fields = fields;
@@ -15825,10 +15855,7 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *p
{
ConstExprValue *payload = create_const_vals(1);
payload->special = ConstValSpecialStatic;
-
- ConstExprValue *float_info_type = get_builtin_value(ira->codegen, "FloatInfo");
- assert(float_info_type->type->id == TypeTableEntryIdMetaType);
- payload->type = float_info_type->data.x_type;
+ payload->type = ir_type_info_get_type(ira, "Float");
ConstExprValue *fields = create_const_vals(1);
payload->data.x_struct.fields = fields;
@@ -15847,10 +15874,7 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *p
{
ConstExprValue *payload = create_const_vals(1);
payload->special = ConstValSpecialStatic;
-
- ConstExprValue *pointer_info_type = get_builtin_value(ira->codegen, "PointerInfo");
- assert(pointer_info_type->type->id == TypeTableEntryIdMetaType);
- payload->type = pointer_info_type->data.x_type;
+ payload->type = ir_type_info_get_type(ira, "Pointer");
ConstExprValue *fields = create_const_vals(4);
payload->data.x_struct.fields = fields;
@@ -15884,7 +15908,10 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *p
union_val->special = ConstValSpecialStatic;
union_val->type = type_info_type->data.x_type;
bigint_init_unsigned(&union_val->data.x_union.tag, type_id_index(type_entry->data.pointer.child_type->id));
- union_val->data.x_union.payload = ir_make_type_info_value(ira, union_val, -1, type_entry->data.pointer.child_type);
+
+ union_val->data.x_union.payload = ir_make_type_info_value(ira, union_val, -1,
+ type_entry->data.pointer.child_type);
+
fields[3].data.x_ptr.data.ref.pointee = union_val;
return payload;
}
@@ -15892,10 +15919,7 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *p
{
ConstExprValue *payload = create_const_vals(1);
payload->special = ConstValSpecialStatic;
-
- ConstExprValue *pointer_info_type = get_builtin_value(ira->codegen, "ArrayInfo");
- assert(pointer_info_type->type->id == TypeTableEntryIdMetaType);
- payload->type = pointer_info_type->data.x_type;
+ payload->type = ir_type_info_get_type(ira, "Array");
ConstExprValue *fields = create_const_vals(2);
payload->data.x_struct.fields = fields;
@@ -15919,7 +15943,10 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *p
union_val->special = ConstValSpecialStatic;
union_val->type = type_info_type->data.x_type;
bigint_init_unsigned(&union_val->data.x_union.tag, type_id_index(type_entry->data.array.child_type->id));
- union_val->data.x_union.payload = ir_make_type_info_value(ira, union_val, -1, type_entry->data.array.child_type);
+
+ union_val->data.x_union.payload = ir_make_type_info_value(ira, union_val, -1,
+ type_entry->data.array.child_type);
+
fields[1].data.x_ptr.data.ref.pointee = union_val;
return payload;
}
@@ -15927,10 +15954,7 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *p
{
ConstExprValue *payload = create_const_vals(1);
payload->special = ConstValSpecialStatic;
-
- ConstExprValue *pointer_info_type = get_builtin_value(ira->codegen, "NullableInfo");
- assert(pointer_info_type->type->id == TypeTableEntryIdMetaType);
- payload->type = pointer_info_type->data.x_type;
+ payload->type = ir_type_info_get_type(ira, "Nullable");
ConstExprValue *fields = create_const_vals(1);
payload->data.x_struct.fields = fields;
@@ -15949,7 +15973,10 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *p
union_val->special = ConstValSpecialStatic;
union_val->type = type_info_type->data.x_type;
bigint_init_unsigned(&union_val->data.x_union.tag, type_id_index(type_entry->data.maybe.child_type->id));
- union_val->data.x_union.payload = ir_make_type_info_value(ira, union_val, -1, type_entry->data.maybe.child_type);
+
+ union_val->data.x_union.payload = ir_make_type_info_value(ira, union_val, -1,
+ type_entry->data.maybe.child_type);
+
fields[0].data.x_ptr.data.ref.pointee = union_val;
return payload;
}
@@ -15957,10 +15984,7 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *p
{
ConstExprValue *payload = create_const_vals(1);
payload->special = ConstValSpecialStatic;
-
- ConstExprValue *pointer_info_type = get_builtin_value(ira->codegen, "PromiseInfo");
- assert(pointer_info_type->type->id == TypeTableEntryIdMetaType);
- payload->type = pointer_info_type->data.x_type;
+ payload->type = ir_type_info_get_type(ira, "Promise");
ConstExprValue *fields = create_const_vals(1);
payload->data.x_struct.fields = fields;
@@ -15994,7 +16018,8 @@ static ConstExprValue *ir_make_type_info_value(IrAnalyze *ira, ConstExprValue *p
union_val->special = ConstValSpecialStatic;
union_val->type = type_info_type->data.x_type;
bigint_init_unsigned(&union_val->data.x_union.tag, type_id_index(type_entry->data.promise.result_type->id));
- union_val->data.x_union.payload = ir_make_type_info_value(ira, union_val, -1, type_entry->data.promise.result_type);
+ union_val->data.x_union.payload = ir_make_type_info_value(ira, union_val, -1,
+ type_entry->data.promise.result_type);
maybe_value->data.x_ptr.data.ref.pointee = union_val;
fields[0].data.x_maybe = maybe_value;
@@ -16014,9 +16039,7 @@ static TypeTableEntry *ir_analyze_instruction_type_info(IrAnalyze *ira,
if (type_is_invalid(type_entry))
return ira->codegen->builtin_types.entry_invalid;
- ConstExprValue *var_value = get_builtin_value(ira->codegen, "TypeInfo");
- assert(var_value->type->id == TypeTableEntryIdMetaType);
- TypeTableEntry *result_type = var_value->data.x_type;
+ TypeTableEntry *result_type = ir_type_info_get_type(ira, nullptr);
ConstExprValue *out_val = ir_build_const_from(ira, &instruction->base);
out_val->type = result_type;
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-28 02:51:50 +0000