diff options
Diffstat (limited to 'src/main/scala/chisel3/util/Decoupled.scala')
| -rw-r--r-- | src/main/scala/chisel3/util/Decoupled.scala | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/main/scala/chisel3/util/Decoupled.scala b/src/main/scala/chisel3/util/Decoupled.scala index f8c8f9e9..a0d86a75 100644 --- a/src/main/scala/chisel3/util/Decoupled.scala +++ b/src/main/scala/chisel3/util/Decoupled.scala @@ -22,7 +22,6 @@ import scala.annotation.nowarn abstract class ReadyValidIO[+T <: Data](gen: T) extends Bundle { // Compatibility hack for rocket-chip private val genType = (DataMirror.internal.isSynthesizable(gen), chisel3.internal.Builder.currentModule) match { - case (true, Some(module: Module)) if !module.compileOptions.declaredTypeMustBeUnbound => chiselTypeOf(gen) case _ => gen } @@ -253,20 +252,12 @@ class Queue[T <: Data]( val flow: Boolean = false, val useSyncReadMem: Boolean = false, val hasFlush: Boolean = false -)( - implicit compileOptions: chisel3.CompileOptions) - extends Module() { +) extends Module() { require(entries > -1, "Queue must have non-negative number of entries") require(entries != 0, "Use companion object Queue.apply for zero entries") - val genType = if (compileOptions.declaredTypeMustBeUnbound) { + val genType = { requireIsChiselType(gen) gen - } else { - if (DataMirror.internal.isSynthesizable(gen)) { - chiselTypeOf(gen) - } else { - gen - } } val io = IO(new QueueIO(genType, entries, hasFlush)) |