From 1cfa9c1df3d91a99ad146f85c77cee7c37a3a116 Mon Sep 17 00:00:00 2001
From: Edward Wang
Date: Sat, 27 Jul 2019 19:22:23 -0700
Subject: Make Queue.irrevocable work properly in chisel3

Close #1134
---
 src/main/scala/chisel3/util/Decoupled.scala | 2 +-
 src/test/scala/chiselTests/QueueSpec.scala  | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/scala/chisel3/util/Decoupled.scala b/src/main/scala/chisel3/util/Decoupled.scala
index c20c1eb3..0ed6984b 100644
--- a/src/main/scala/chisel3/util/Decoupled.scala
+++ b/src/main/scala/chisel3/util/Decoupled.scala
@@ -305,7 +305,7 @@ object Queue
       flow: Boolean = false): IrrevocableIO[T] = {    
     val deq = apply(enq, entries, pipe, flow)
     require(entries > 0, "Zero-entry queues don't guarantee Irrevocability")
-    val irr = Wire(new IrrevocableIO(deq.bits))
+    val irr = Wire(new IrrevocableIO(chiselTypeOf(deq.bits)))
     irr.bits := deq.bits
     irr.valid := deq.valid
     deq.ready := irr.ready
diff --git a/src/test/scala/chiselTests/QueueSpec.scala b/src/test/scala/chiselTests/QueueSpec.scala
index 0f798e09..77b3912f 100644
--- a/src/test/scala/chiselTests/QueueSpec.scala
+++ b/src/test/scala/chiselTests/QueueSpec.scala
@@ -269,6 +269,13 @@ class QueueSpec extends ChiselPropSpec {
         }
       }
     }
+  }
 
+  property("Queue.irrevocable should elaborate") {
+    class IrrevocableQueue extends MultiIOModule {
+      val in = Wire(Decoupled(Bool()))
+      val iQueue = Queue.irrevocable(in, 1)
+    }
+    (new chisel3.stage.phases.Elaborate).transform(Seq(chisel3.stage.ChiselGeneratorAnnotation(() => new IrrevocableQueue)))
   }
 }
-- 
cgit v1.2.3