Fix HeterogeneousBag for chisel3 #2945

chipsalliance/chisel#2945

src/main/scala/util/HeterogeneousBag.scala

@@ -4,14 +4,19 @@ package freechips.rocketchip.util
 
 import Chisel._
 import chisel3.Record
+import chisel3.reflect.DataMirror.internal.chiselTypeClone
+import chisel3.experimental.requireIsChiselType
 import scala.collection.immutable.ListMap
 
 final case class HeterogeneousBag[T <: Data](elts: Seq[T]) extends Record with collection.IndexedSeq[T] {
   def apply(x: Int) = elts(x)
   def length = elts.length
 
   override def className: String = super.className
-  val elements = ListMap(elts.zipWithIndex.map { case (n,i) => (i.toString, n) }:_*)
+  val elements = ListMap(elts.zipWithIndex.map { case (n,i) => (i.toString, {
+    requireIsChiselType(n)
+    chiselTypeClone(n)
+  }) }:_*)
   // 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)