authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-03-03 13:18:13-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-03-03 13:18:13-07:00
logfcd25065ef41ac93e10031ebea0ed2bc0effce17
tree5f86c4580f3f5f858ce0ad451359b26ec6cb0bdf
parent2ebeb0dbf30751cec6fd7cc8578a7aac4cb068ce

stage2: fix merge conflict with previous commit

The compiler failed to build from source; this fixes it.

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

src/zir_sema.zig+2-4
...@@ -1235,8 +1235,7 @@ fn zirMergeErrorSets(mod: *Module, scope: *Scope, inst: *zir.Inst.BinOp) InnerEr...@@ -1235,8 +1235,7 @@ fn zirMergeErrorSets(mod: *Module, scope: *Scope, inst: *zir.Inst.BinOp) InnerEr
1235 switch (lhs_ty.tag()) {1235 switch (lhs_ty.tag()) {
1236 .error_set_single => {1236 .error_set_single => {
1237 const name = lhs_ty.castTag(.error_set_single).?.data;1237 const name = lhs_ty.castTag(.error_set_single).?.data;
1238 const num = mod.global_error_set.get(name).?;1238 payload.data.fields.putAssumeCapacity(name, {});
1239 payload.data.fields.putAssumeCapacity(name, num);
1240 },1239 },
1241 .error_set => {1240 .error_set => {
1242 var multiple = lhs_ty.castTag(.error_set).?.data.typed_value.most_recent.typed_value.val.castTag(.error_set).?.data.fields;1241 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...@@ -1251,8 +1250,7 @@ fn zirMergeErrorSets(mod: *Module, scope: *Scope, inst: *zir.Inst.BinOp) InnerEr
1251 switch (rhs_ty.tag()) {1250 switch (rhs_ty.tag()) {
1252 .error_set_single => {1251 .error_set_single => {
1253 const name = rhs_ty.castTag(.error_set_single).?.data;1252 const name = rhs_ty.castTag(.error_set_single).?.data;
1254 const num = mod.global_error_set.get(name).?;1253 payload.data.fields.putAssumeCapacity(name, {});
1255 payload.data.fields.putAssumeCapacity(name, num);
1256 },1254 },
1257 .error_set => {1255 .error_set => {
1258 var multiple = rhs_ty.castTag(.error_set).?.data.typed_value.most_recent.typed_value.val.castTag(.error_set).?.data.fields;1256 var multiple = rhs_ty.castTag(.error_set).?.data.typed_value.most_recent.typed_value.val.castTag(.error_set).?.data.fields;