From 43abf28868b7dbcf74f6e4f815e2d7c69cd8eecd Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Fri, 15 Apr 2022 16:29:45 -0400 Subject: [PATCH] fixup! Enable Clock Invalidation (#2485) --- core/src/main/scala/chisel3/Clock.scala | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/core/src/main/scala/chisel3/Clock.scala b/core/src/main/scala/chisel3/Clock.scala index e0ca3bac0ac..963804bd04a 100644 --- a/core/src/main/scala/chisel3/Clock.scala +++ b/core/src/main/scala/chisel3/Clock.scala @@ -21,18 +21,10 @@ sealed class Clock(private[chisel3] val width: Width = Width(1)) extends Element private[chisel3] def typeEquivalent(that: Data): Boolean = this.getClass == that.getClass -<<<<<<< HEAD override def connect(that: Data)(implicit sourceInfo: SourceInfo, connectCompileOptions: CompileOptions): Unit = that match { - case _: Clock => super.connect(that)(sourceInfo, connectCompileOptions) + case _: Clock | DontCare => super.connect(that)(sourceInfo, connectCompileOptions) case _ => super.badConnect(that)(sourceInfo) } -======= - override def connect(that: Data)(implicit sourceInfo: SourceInfo, connectCompileOptions: CompileOptions): Unit = - that match { - case _: Clock | DontCare => super.connect(that)(sourceInfo, connectCompileOptions) - case _ => super.badConnect(that)(sourceInfo) - } ->>>>>>> 5d8a0c8e (Enable Clock Invalidation (#2485)) override def litOption: Option[BigInt] = None