mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-11 03:51:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage2: fix merge conflict with previous commit

Browse Source 
The compiler failed to build from source; this fixes it.
This commit is contained in:
Andrew Kelley 2021-03-03 13:18:13 -07:00
parent 2ebeb0dbf3
commit fcd25065ef
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zir_sema.zig
View File

@ -1235,8 +1235,7 @@ fn zirMergeErrorSets(mod: *Module, scope: *Scope, inst: *zir.Inst.BinOp) InnerEr
switch (lhs_ty.tag()) {
.error_set_single => {
const name = lhs_ty.castTag(.error_set_single).?.data;
const num = mod.global_error_set.get(name).?;
payload.data.fields.putAssumeCapacity(name, num);
payload.data.fields.putAssumeCapacity(name, {});
},
.error_set => {
var multiple = lhs_ty.castTag(.error_set).?.data.typed_value.most_recent.typed_value.val.castTag(.error_set).?.data.fields;
@ -1251,8 +1250,7 @@ fn zirMergeErrorSets(mod: *Module, scope: *Scope, inst: *zir.Inst.BinOp) InnerEr
switch (rhs_ty.tag()) {
.error_set_single => {
const name = rhs_ty.castTag(.error_set_single).?.data;
const num = mod.global_error_set.get(name).?;
payload.data.fields.putAssumeCapacity(name, num);
payload.data.fields.putAssumeCapacity(name, {});
},
.error_set => {
var multiple = rhs_ty.castTag(.error_set).?.data.typed_value.most_recent.typed_value.val.castTag(.error_set).?.data.fields;