Commit `a95fdb0635`

Jacob G-W <jacoblevgw@gmail.com>

2021-06-17 17:57:27

stage2: simplify codegen for errorToInt and intToError

We can just use bitcast instead of error_to_int, int_to_error since errorToInt and intToError do not actually do anything, just change types. This allows us to remove 2 air ops that were the exact same as bitcast

master

1 parent fc1feeb

Changed files (4)

src

codegen

@@ -724,8 +724,6 @@ pub fn genBody(o: *Object, body: ir.Body) error{ AnalysisFail, OutOfMemory }!voi
 
             .is_err => try genIsErr(o, inst.castTag(.is_err).?),
             .is_err_ptr => try genIsErr(o, inst.castTag(.is_err_ptr).?),
-            .error_to_int => try genErrorToInt(o, inst.castTag(.error_to_int).?),
-            .int_to_error => try genIntToError(o, inst.castTag(.int_to_error).?),
 
             .unwrap_errunion_payload => try genUnwrapErrUnionPay(o, inst.castTag(.unwrap_errunion_payload).?),
             .unwrap_errunion_err => try genUnwrapErrUnionErr(o, inst.castTag(.unwrap_errunion_err).?),
@@ -1283,14 +1281,6 @@ fn genIsErr(o: *Object, inst: *Inst.UnOp) !CValue {
     return local;
 }
 
-fn genIntToError(o: *Object, inst: *Inst.UnOp) !CValue {
-    return o.resolveInst(inst.operand);
-}
-
-fn genErrorToInt(o: *Object, inst: *Inst.UnOp) !CValue {
-    return o.resolveInst(inst.operand);
-}
-
 fn IndentWriter(comptime UnderlyingWriter: type) type {
     return struct {
         const Self = @This();

@@ -92,10 +92,6 @@ pub const Inst = struct {
         is_err,
         /// *E!T => bool
         is_err_ptr,
-        /// E => u16
-        error_to_int,
-        /// u16 => E
-        int_to_error,
         bool_and,
         bool_or,
         /// Read a value from a pointer.
@@ -159,8 +155,6 @@ pub const Inst = struct {
                 .is_null_ptr,
                 .is_err,
                 .is_err_ptr,
-                .int_to_error,
-                .error_to_int,
                 .ptrtoint,
                 .floatcast,
                 .intcast,
@@ -730,8 +724,6 @@ const DumpTzir = struct {
                 .is_null_ptr,
                 .is_err,
                 .is_err_ptr,
-                .error_to_int,
-                .int_to_error,
                 .ptrtoint,
                 .floatcast,
                 .intcast,
@@ -865,8 +857,6 @@ const DumpTzir = struct {
                 .is_null_ptr,
                 .is_err,
                 .is_err_ptr,
-                .error_to_int,
-                .int_to_error,
                 .ptrtoint,
                 .floatcast,
                 .intcast,

@@ -850,8 +850,6 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
                 .is_null_ptr => return self.genIsNullPtr(inst.castTag(.is_null_ptr).?),
                 .is_err => return self.genIsErr(inst.castTag(.is_err).?),
                 .is_err_ptr => return self.genIsErrPtr(inst.castTag(.is_err_ptr).?),
-                .error_to_int => return self.genErrorToInt(inst.castTag(.error_to_int).?),
-                .int_to_error => return self.genIntToError(inst.castTag(.int_to_error).?),
                 .load => return self.genLoad(inst.castTag(.load).?),
                 .loop => return self.genLoop(inst.castTag(.loop).?),
                 .not => return self.genNot(inst.castTag(.not).?),
@@ -2960,14 +2958,6 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
             return self.fail(inst.base.src, "TODO load the operand and call genIsErr", .{});
         }
 
-        fn genErrorToInt(self: *Self, inst: *ir.Inst.UnOp) !MCValue {
-            return self.resolveInst(inst.operand);
-        }
-
-        fn genIntToError(self: *Self, inst: *ir.Inst.UnOp) !MCValue {
-            return self.resolveInst(inst.operand);
-        }
-
         fn genLoop(self: *Self, inst: *ir.Inst.Loop) !MCValue {
             // A loop is a setup to be able to jump back to the beginning.
             const start_index = self.code.items.len;

@@ -2506,7 +2506,7 @@ fn zirErrorToInt(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) InnerEr
     }
 
     try sema.requireRuntimeBlock(block, src);
-    return block.addUnOp(src, result_ty, .error_to_int, op_coerced);
+    return block.addUnOp(src, result_ty, .bitcast, op_coerced);
 }
 
 fn zirIntToError(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) InnerError!*Inst {
@@ -2539,7 +2539,7 @@ fn zirIntToError(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) InnerEr
         // const is_gt_max = @panic("TODO get max errors in compilation");
         // try sema.addSafetyCheck(block, is_gt_max, .invalid_error_code);
     }
-    return block.addUnOp(src, Type.initTag(.anyerror), .int_to_error, op);
+    return block.addUnOp(src, Type.initTag(.anyerror), .bitcast, op);
 }
 
 fn zirMergeErrorSets(sema: *Sema, block: *Scope.Block, inst: Zir.Inst.Index) InnerError!*Inst {

Commit a95fdb0635

Commit `a95fdb0635`