From 70ec448a31293523769bbae05fc910e22263d090 Mon Sep 17 00:00:00 2001
From: Zachary Snow <zach@zachjs.com>
Date: Wed, 8 May 2024 08:57:17 -0400
Subject: [PATCH] remove iverilog workaround from typeof_scope.sv

With steveicarus/iverilog#483 resolved, this workaround is no longer
necessary.
---
 test/{core => basic}/typeof_scope.sv | 17 -----------------
 test/core/typeof_scope.v             |  2 --
 2 files changed, 19 deletions(-)
 rename test/{core => basic}/typeof_scope.sv (84%)
 delete mode 100644 test/core/typeof_scope.v

diff --git a/test/core/typeof_scope.sv b/test/basic/typeof_scope.sv
similarity index 84%
rename from test/core/typeof_scope.sv
rename to test/basic/typeof_scope.sv
index fe96397..e367e0b 100644
--- a/test/core/typeof_scope.sv
+++ b/test/basic/typeof_scope.sv
@@ -1,7 +1,5 @@
 `define TYPEOF(x) wire [$bits(x) - 1:0]
 
-// The `REF` sections of this test are workarounds for steveicarus/iverilog#483
-
 module top;
     genvar i;
     if (1) begin : blk
@@ -25,11 +23,7 @@ module top;
                             `TYPEOF(prev[z].x) x;
                             if (1) begin : e
                                 localparam i = 0;
-`ifdef REF
-                                localparam j = 3;
-`else
                                 localparam j = $bits(blk.loop[i].a.b.c.d.x);
-`endif
                                 wire [j-1:0] y;
                             end
                         end
@@ -39,16 +33,6 @@ module top;
         end
     end
 
-`ifdef REF
-    wire [1*2:0] a;
-    wire [2*2:0] b;
-    wire [1*2:0] c;
-    wire [2*2:0] d;
-    wire [1*2:0] e;
-    wire [2*2:0] f;
-    wire [1*2:0] g;
-    wire [1*2:0] h;
-`else
     `TYPEOF(blk.loop[0].x) a;
     `TYPEOF(blk.loop[1].x) b;
     `TYPEOF(blk.loop[0].a.b.x) c;
@@ -57,7 +41,6 @@ module top;
     `TYPEOF(blk.loop[1].a.b.c.d.x) f;
     `TYPEOF(blk.loop[0].a.b.c.d.e.y) g;
     `TYPEOF(blk.loop[1].a.b.c.d.e.y) h;
-`endif
 
     `define DUMP(x) assign x = 1; initial $display(`"x: %b (%0d bits)`", x, $bits(x));
     `DUMP(a) `DUMP(b) `DUMP(c) `DUMP(d) `DUMP(e) `DUMP(f) `DUMP(g) `DUMP(h)
diff --git a/test/core/typeof_scope.v b/test/core/typeof_scope.v
deleted file mode 100644
index 9ff8a48..0000000
--- a/test/core/typeof_scope.v
+++ /dev/null
@@ -1,2 +0,0 @@
-`define REF 1
-`include "typeof_scope.sv"