mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage2: add parameters to fn typeInfo

Browse Source
This commit is contained in:
Veikka Tuominen 2022-02-22 14:08:21 +02:00
parent f8154905e7
commit 923b07bac7
2 changed files with 63 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/Sema.zig
View File

@ -9886,7 +9886,65 @@ fn zirTypeInfo(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai
}),
),
.Fn => {
// TODO: look into memoizing this result.
const info = ty.fnInfo();
var params_anon_decl = try block.startAnonDecl(src);
defer params_anon_decl.deinit();
const param_vals = try params_anon_decl.arena().alloc(Value, info.param_types.len);
for (param_vals) |*param_val, i| {
const param_ty = info.param_types[i];
const is_generic = param_ty.tag() == .generic_poison;
const param_ty_val = if (is_generic)
Value.@"null"
else
try Value.Tag.opt_payload.create(
params_anon_decl.arena(),
try Value.Tag.ty.create(params_anon_decl.arena(), param_ty),
);
const param_fields = try params_anon_decl.arena().create([3]Value);
param_fields.* = .{
// is_generic: bool,
Value.makeBool(is_generic),
// is_noalias: bool,
Value.@"false", // TODO
// arg_type: ?type,
param_ty_val,
};
param_val.* = try Value.Tag.@"struct".create(params_anon_decl.arena(), param_fields);
}
const args_val = v: {
const fn_info_decl = (try sema.namespaceLookup(
block,
src,
type_info_ty.getNamespace().?,
"Fn",
)).?;
try sema.mod.declareDeclDependency(sema.owner_decl, fn_info_decl);
try sema.ensureDeclAnalyzed(fn_info_decl);
const param_info_decl = (try sema.namespaceLookup(
block,
src,
fn_info_decl.val.castTag(.ty).?.data.getNamespace().?,
"Param",
)).?;
try sema.mod.declareDeclDependency(sema.owner_decl, param_info_decl);
try sema.ensureDeclAnalyzed(param_info_decl);
const new_decl = try params_anon_decl.finish(
try Type.Tag.array.create(params_anon_decl.arena(), .{
.len = param_vals.len,
.elem_type = param_info_decl.ty,
}),
try Value.Tag.array.create(
params_anon_decl.arena(),
param_vals,
),
);
break :v try Value.Tag.decl_ref.create(sema.arena, new_decl);
};
const field_values = try sema.arena.alloc(Value, 6);
// calling_convention: CallingConvention,
field_values[0] = try Value.Tag.enum_field_index.create(sema.arena, @enumToInt(info.cc));
@ -9897,9 +9955,9 @@ fn zirTypeInfo(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai
// is_var_args: bool,
field_values[3] = Value.makeBool(info.is_var_args);
// return_type: ?type,
field_values[4] = try Value.Tag.ty.create(sema.arena, ty.fnReturnType());
// args: []const FnArg,
field_values[5] = Value.@"null"; // TODO
field_values[4] = try Value.Tag.ty.create(sema.arena, info.return_type);
// args: []const Fn.Param,
field_values[5] = args_val;
return sema.addConstant(
type_info_ty,
@ -10102,7 +10160,7 @@ fn zirTypeInfo(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai
}),
try Value.Tag.array.create(
fields_anon_decl.arena(),
try fields_anon_decl.arena().dupe(Value, enum_field_vals),
enum_field_vals,
),
);
break :v try Value.Tag.decl_ref.create(sema.arena, new_decl);

3
test/behavior/type_info.zig
View File

@ -323,8 +323,6 @@ fn testOpaque() !void {
}
test "type info: function type info" {
if (builtin.zig_backend != .stage1) return error.SkipZigTest; // TODO
// wasm doesn't support align attributes on functions
if (builtin.target.cpu.arch == .wasm32 or builtin.target.cpu.arch == .wasm64) return error.SkipZigTest;
try testFunction();
@ -343,6 +341,7 @@ fn testFunction() !void {
const fn_aligned_info = @typeInfo(@TypeOf(fooAligned));
try expect(fn_aligned_info.Fn.alignment == 4);
if (builtin.zig_backend != .stage1) return; // no bound fn in stage2
const test_instance: TestPackedStruct = undefined;
const bound_fn_info = @typeInfo(@TypeOf(test_instance.foo));
try expect(bound_fn_info == .BoundFn);