mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 22:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage2: only create inferred error sets for inferred error set functions

Browse Source
This commit is contained in:
Robin Voetter 2021-12-18 00:30:16 +01:00
parent 16bddecff9
commit 138f85bf25
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Sema.zig
View File

@ -3912,18 +3912,20 @@ fn analyzeCall(
const ret_ty_inst = try sema.resolveBody(&child_block, fn_info.ret_ty_body);
const ret_ty_src = func_src; // TODO better source location
const bare_return_type = try sema.analyzeAsType(&child_block, ret_ty_src, ret_ty_inst);
// If the function has an inferred error set, `bare_return_type` is the payload type only.
// Create a fresh inferred error set type for inline/comptime calls.
const fn_ret_ty = blk: {
if (func_ty_info.return_type.tag() == .error_union) {
const node = try sema.gpa.create(Module.Fn.InferredErrorSetListNode);
node.data = .{ .func = module_fn };
parent_func.?.inferred_error_sets.prepend(node);
if (func_ty_info.return_type.castTag(.error_union)) |payload| {
if (payload.data.error_set.tag() == .error_set_inferred) {
const node = try sema.gpa.create(Module.Fn.InferredErrorSetListNode);
node.data = .{ .func = module_fn };
parent_func.?.inferred_error_sets.prepend(node);
const error_set_ty = try Type.Tag.error_set_inferred.create(sema.arena, &node.data);
break :blk try Type.Tag.error_union.create(sema.arena, .{
.error_set = error_set_ty,
.payload = bare_return_type,
});
const error_set_ty = try Type.Tag.error_set_inferred.create(sema.arena, &node.data);
break :blk try Type.Tag.error_union.create(sema.arena, .{
.error_set = error_set_ty,
.payload = bare_return_type,
});
}
}
break :blk bare_return_type;
};
@ -12473,7 +12475,7 @@ fn coerceInMemoryAllowed(
dest_ty: Type,
src_ty: Type,
dest_is_mut: bool,
target: std.Target
target: std.Target,
) CompileError!InMemoryCoercionResult {
if (dest_ty.eql(src_ty))
return .ok;