authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2021-02-03 18:51:56+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-03-02 23:53:10-07:00
logad3f7e0cf0d4176bfc60b15b47562bd1a8adb666
treeec8552aeada812e98d2e90d088a52bc7e5a5a61b
parent8b100792ebaa4fa17dd75fadc7a8bdb47328dfad

fix small inconsistency

1 files changed, 2 insertions(+), 2 deletions(-)

src/zir_sema.zig+2-2
...@@ -1257,13 +1257,13 @@ fn zirMergeErrorSets(mod: *Module, scope: *Scope, inst: *zir.Inst.BinOp) InnerEr...@@ -1257,13 +1257,13 @@ fn zirMergeErrorSets(mod: *Module, scope: *Scope, inst: *zir.Inst.BinOp) InnerEr
1257 .error_set => {1257 .error_set => {
1258 var multiple = rhs_ty.castTag(.error_set).?.data.typed_value.most_recent.typed_value.val.castTag(.error_set).?.data.fields;1258 var multiple = rhs_ty.castTag(.error_set).?.data.typed_value.most_recent.typed_value.val.castTag(.error_set).?.data.fields;
1259 var it = multiple.iterator();1259 var it = multiple.iterator();
1260 while (it.next()) |name| {1260 while (it.next()) |entry| {
1261 const entry = try mod.getErrorValue(name.key);
1262 payload.data.fields.putAssumeCapacity(entry.key, entry.value);1261 payload.data.fields.putAssumeCapacity(entry.key, entry.value);
1263 }1262 }
1264 },1263 },
1265 else => unreachable,1264 else => unreachable,
1266 }1265 }
1266 // TODO create name in format "error:line:column"
1267 const new_decl = try mod.createAnonymousDecl(scope, &new_decl_arena, .{1267 const new_decl = try mod.createAnonymousDecl(scope, &new_decl_arena, .{
1268 .ty = Type.initTag(.type),1268 .ty = Type.initTag(.type),
1269 .val = Value.initPayload(&payload.base),1269 .val = Value.initPayload(&payload.base),