1 files changed, 30 insertions, 35 deletions

diff --git a/src/test/scala/chiselTests/AutoNestedCloneSpec.scala b/src/test/scala/chiselTests/AutoNestedCloneSpec.scala
index 401766e2..258d0823 100644
--- a/src/test/scala/chiselTests/AutoNestedCloneSpec.scala
+++ b/src/test/scala/chiselTests/AutoNestedCloneSpec.scala
@@ -3,6 +3,7 @@
 package chiselTests
 import chisel3._
 import chisel3.testers.TestUtils
+import chisel3.stage.ChiselStage.elaborate
 import org.scalatest.matchers.should.Matchers
 
 class BundleWithAnonymousInner(val w: Int) extends Bundle {
@@ -11,10 +12,7 @@ class BundleWithAnonymousInner(val w: Int) extends Bundle {
   }
 }
 
-// TODO all `.suggestNames` are due to https://github.com/chipsalliance/chisel3/issues/1802
 class AutoNestedCloneSpec extends ChiselFlatSpec with Matchers with Utils {
-  val usingPlugin: Boolean = TestUtils.usingPlugin
-  val elaborate = TestUtils.elaborateNoReflectiveAutoCloneType _
 
   behavior of "autoCloneType of inner Bundle in Chisel3"
 
@@ -27,7 +25,7 @@ class AutoNestedCloneSpec extends ChiselFlatSpec with Matchers with Utils {
           }
           def getIO: InnerIOType = new InnerIOType
         }
-        val io = IO(new Bundle {}).suggestName("io")
+        val io = IO(new Bundle {})
         val myWire = Wire((new Middle(w)).getIO)
       }
       new Outer(2)
@@ -37,7 +35,7 @@ class AutoNestedCloneSpec extends ChiselFlatSpec with Matchers with Utils {
   it should "clone an anonymous inner bundle successfully" in {
     elaborate {
       class TestTop(val w: Int) extends Module {
-        val io = IO(new Bundle {}).suggestName("io")
+        val io = IO(new Bundle {})
         val myWire = Wire(new Bundle{ val a = UInt(w.W) })
       }
       new TestTop(2)
@@ -50,13 +48,13 @@ class AutoNestedCloneSpec extends ChiselFlatSpec with Matchers with Utils {
         val io = IO(new Bundle{
           val in = Input(UInt(w.W))
           val out = Output(UInt(w.W))
-        }).suggestName("io")
+        })
       }
       class Outer(val w: Int) extends Module {
         val io = IO(new Bundle{
           val in = Input(UInt(w.W))
           val out = Output(UInt(w.W))
-        }).suggestName("io")
+        })
         val i = Module(new Inner(w))
         val iw = Wire(chiselTypeOf(i.io))
         iw <> io
@@ -69,7 +67,7 @@ class AutoNestedCloneSpec extends ChiselFlatSpec with Matchers with Utils {
   it should "clone an anonymous, bound, inner bundle of another bundle successfully" in {
     elaborate {
       class TestModule(w: Int) extends Module {
-        val io = IO(new BundleWithAnonymousInner(w) ).suggestName("io")
+        val io = IO(new BundleWithAnonymousInner(w))
         val w0 = WireDefault(io)
         val w1 = WireDefault(io.inner)
       }
@@ -85,7 +83,7 @@ class AutoNestedCloneSpec extends ChiselFlatSpec with Matchers with Utils {
         }
         val io = IO(new Bundle {
           val inner = Input(bun)
-        }).suggestName("io")
+        })
         val w0 = WireDefault(io)
         val w1 = WireDefault(io.inner)
       }
@@ -100,42 +98,39 @@ class AutoNestedCloneSpec extends ChiselFlatSpec with Matchers with Utils {
           val inner = Input(new Bundle {
             val x = UInt(8.W)
           })
-        }).suggestName("io")
+        })
       }
       new TestModule()
     }
   }
 
-  if (usingPlugin) {
-    // This works with the plugin, but is a null pointer exception when using reflective autoclonetype
-    it should "support an anonymous doubly-nested inner bundle" in {
-      elaborate {
-        class Outer(val w: Int) extends Module {
-          class Middle(val w: Int) {
-            def getIO: Bundle = new Bundle {
-              val in = Input(UInt(w.W))
-            }
+  it should "support an anonymous doubly-nested inner bundle" in {
+    elaborate {
+      class Outer(val w: Int) extends Module {
+        class Middle(val w: Int) {
+          def getIO: Bundle = new Bundle {
+            val in = Input(UInt(w.W))
           }
-          val io = IO(new Bundle {}).suggestName("io")
-          val myWire = Wire((new Middle(w)).getIO)
         }
-        new Outer(2)
+        val io = IO(new Bundle {})
+        val myWire = Wire((new Middle(w)).getIO)
       }
+      new Outer(2)
     }
+  }
 
-    it should "support anonymous Inner bundles that capture type parameters from outer Bundles" in {
-      elaborate(new MultiIOModule {
-        class MyBundle[T <: Data](n: Int, gen: T) extends Bundle {
-          val foo = new Bundle {
-            val x = Input(Vec(n, gen))
-          }
-          val bar = Output(Option(new { def mkBundle = new Bundle { val x = Vec(n, gen) }}).get.mkBundle)
+  it should "support anonymous Inner bundles that capture type parameters from outer Bundles" in {
+    elaborate(new MultiIOModule {
+      class MyBundle[T <: Data](n: Int, gen: T) extends Bundle {
+        val foo = new Bundle {
+          val x = Input(Vec(n, gen))
         }
-        val io = IO(new MyBundle(4, UInt(8.W)))
-        val myWire = WireInit(io.foo)
-        val myWire2 = WireInit(io.bar)
-        io.bar.x := io.foo.x
-      })
-    }
+        val bar = Output(Option(new { def mkBundle = new Bundle { val x = Vec(n, gen) }}).get.mkBundle)
+      }
+      val io = IO(new MyBundle(4, UInt(8.W)))
+      val myWire = WireInit(io.foo)
+      val myWire2 = WireInit(io.bar)
+      io.bar.x := io.foo.x
+    })
   }
 }