Get things working with this.type

Author: jackkoenig

core/src/main/scala/chisel3/AggregateImpl.scala

@@ -543,7 +543,7 @@ private[chisel3] abstract class VecImpl[T <: Data] private[chisel3] (gen: => T,
     requireIsChiselType(this, "vec literal constructor model")
     checkLiteralConstruction()
 
-    val clone = cloneType
+    val clone: this.type = this.cloneType
     val cloneFields = getRecursiveFields(clone, "(vec root)").toMap
 
     // Create the Vec literal binding from litArgs of arguments
@@ -833,7 +833,7 @@ private[chisel3] trait RecordImpl extends AggregateImpl { thiz: Record =>
   }
 
   override def cloneType: this.type = {
-    val clone = _cloneTypeImpl.asInstanceOf[this.type]
+    val clone: this.type = _cloneTypeImpl.asInstanceOf[this.type]
     checkClone(clone)
     clone
   }
@@ -956,7 +956,7 @@ private[chisel3] trait RecordImpl extends AggregateImpl { thiz: Record =>
   private[chisel3] def _makeLit(elems: (this.type => (Data, Data))*)(implicit sourceInfo: SourceInfo): this.type = {
 
     requireIsChiselType(this, "bundle literal constructor model")
-    val clone = cloneType
+    val clone: this.type = cloneType
     val cloneFields = getRecursiveFields(clone, "_").toMap
 
     // Create the Bundle literal binding from litargs of arguments

core/src/main/scala/chisel3/ChiselEnumImpl.scala

@@ -363,8 +363,7 @@ private[chisel3] trait ChiselEnumImpl { self: ChiselEnum =>
 // This is an enum type that can be connected directly to UInts. It is used as a "glue" to cast non-literal UInts
 // to enums.
 private[chisel3] class UnsafeEnum(override val width: Width) extends EnumType(UnsafeEnum, selfAnnotating = false) {
-
-  override def _cloneType: Data = new UnsafeEnum(width)
+  override def cloneType: this.type = new UnsafeEnum(width).asInstanceOf[this.type]
 }
 private object UnsafeEnum extends ChiselEnum
 

core/src/main/scala/chisel3/DataImpl.scala

@@ -796,7 +796,7 @@ private[chisel3] trait DataImpl extends HasId with NamedComponent { self: Data =
     * Directionality data and probe information is still preserved.
     */
   private[chisel3] def cloneTypeFull: this.type = {
-    val clone = this.cloneType // get a fresh object, without bindings
+    val clone: this.type = this.cloneType // get a fresh object, without bindings
     // Only the top-level direction needs to be fixed up, cloneType should do the rest
     clone.specifiedDirection = specifiedDirection
     probe.setProbeModifier(clone, probeInfo)

core/src/main/scala/chisel3/properties/Property.scala

@@ -277,8 +277,18 @@ sealed trait Property[T] extends Element { self =>
 
   /** Clone type by simply constructing a new Property[T].
     */
-  override def _cloneType: Data = new Property[T] {
+  override def cloneType: this.type = new Property[T] {
     val tpe = self.tpe
+  }.asInstanceOf[this.type]
+
+  /** Clone type with extra information preserved.
+    *
+    * The only extra information present on a Property type is directionality.
+    */
+  private[chisel3] override def cloneTypeFull: this.type = {
+    val clone: this.type = this.cloneType
+    clone.specifiedDirection = specifiedDirection
+    clone
   }
 
   /** Get the IR PropertyType for this Property.