From 710a782145eee7f540bf1f6e23e2d16fc5667f6b Mon Sep 17 00:00:00 2001 From: "Wesley W. Terpstra" Date: Mon, 14 Aug 2017 15:48:42 -0700 Subject: [PATCH] HeterogenousBag: empty bags were being combined! (#956) This lead to strange firrtl errors when you had two empty HeterogeneousBags in the same Bundle. --- src/main/scala/util/HeterogeneousBag.scala | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/scala/util/HeterogeneousBag.scala b/src/main/scala/util/HeterogeneousBag.scala index 9a614906..aec7e321 100644 --- a/src/main/scala/util/HeterogeneousBag.scala +++ b/src/main/scala/util/HeterogeneousBag.scala @@ -12,4 +12,8 @@ final case class HeterogeneousBag[T <: Data](elts: Seq[T]) extends Record with c val elements = ListMap(elts.zipWithIndex.map { case (n,i) => (i.toString, n) }:_*) override def cloneType: this.type = (new HeterogeneousBag(elts.map(_.cloneType))).asInstanceOf[this.type] + + // IndexedSeq has its own hashCode/equals that we must not use + override def hashCode: Int = super[Record].hashCode + override def equals(that: Any): Boolean = super[Record].equals(that) }