zig

commit fcd25065ef41ac93e10031ebea0ed2bc0effce17 (tree)
parent 2ebeb0dbf30751cec6fd7cc8578a7aac4cb068ce
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Wed,  3 Mar 2021 13:18:13 -0700

stage2: fix merge conflict with previous commit

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

Diffstat:
M
src/zir_sema.zig
 | 
6
++----

1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/zir_sema.zig b/src/zir_sema.zig
@@ -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;