Updates

Author: adkian-sifive

core/src/main/scala-2/chisel3/experimental/hierarchy/core/Hierarchy.scala

@@ -34,7 +34,7 @@ object Hierarchy {
     def toTarget: IsModule = i match {
       case d: Definition[T] => new Definition.DefinitionBaseModuleExtensions(d).toTarget
       case i: Instance[T]   => new Instance.InstanceBaseModuleExtensions(i).toTarget
-      case _ => throw new InternalErrorException("Match error: toTarget i=$i")
+      case _ => throw new InternalErrorException(s"Match error: toTarget i=$i")
     }
 
     /** Returns the toAbsoluteTarget of this hierarchy
@@ -43,7 +43,7 @@ object Hierarchy {
     def toAbsoluteTarget: IsModule = i match {
       case d: Definition[T] => new Definition.DefinitionBaseModuleExtensions(d).toAbsoluteTarget
       case i: Instance[T]   => new Instance.InstanceBaseModuleExtensions(i).toAbsoluteTarget
-      case _ => throw new InternalErrorException("Match error: toAbsoluteTarget i=$i")
+      case _ => throw new InternalErrorException(s"Match error: toAbsoluteTarget i=$i")
     }
 
     /** Returns the toRelativeTarget of this hierarchy
@@ -52,7 +52,7 @@ object Hierarchy {
     def toRelativeTarget(root: Option[BaseModule]): IsModule = i match {
       case d: Definition[T] => new Definition.DefinitionBaseModuleExtensions(d).toRelativeTarget(root)
       case i: Instance[T]   => new Instance.InstanceBaseModuleExtensions(i).toRelativeTarget(root)
-      case _ => throw new InternalErrorException("Match error: toAbsoluteTarget i=$i")
+      case _ => throw new InternalErrorException(s"Match error: toAbsoluteTarget i=$i")
     }
 
     /** Returns the toRelativeTarget of this hierarchy
@@ -61,7 +61,7 @@ object Hierarchy {
     def toRelativeTargetToHierarchy(root: Option[Hierarchy[BaseModule]]): IsModule = i match {
       case d: Definition[T] => new Definition.DefinitionBaseModuleExtensions(d).toRelativeTargetToHierarchy(root)
       case i: Instance[T]   => new Instance.InstanceBaseModuleExtensions(i).toRelativeTargetToHierarchy(root)
-      case _ => throw new InternalErrorException("Match error: toAbsoluteTarget i=$i")
+      case _ => throw new InternalErrorException(s"Match error: toAbsoluteTarget i=$i")
     }
 
   }

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

@@ -58,7 +58,7 @@ private[chisel3] abstract class EnumTypeImpl(private[chisel3] val factory: Chise
   // This override just ensures that if `that` has a known width, the result actually has that width
   // Put another way, this is preserving a case where #4159 does **not** occur
   // This can be deleted when Builder.useLegacyWidth is removed.
-  override def do_asTypeOf[T <: Data](that: T)(implicit sourceInfo: SourceInfo): T = {
+  override def _asTypeOfImpl[T <: Data](that: T)(implicit sourceInfo: SourceInfo): T = {
     that.widthOption match {
       // Note that default case will handle literals just fine
       case Some(w) =>

core/src/main/scala-2/chisel3/experimental/hierarchy/InstantiateImpl.scala renamed to core/src/main/scala/chisel3/experimental/hierarchy/InstantiateImpl.scala

@@ -2,7 +2,6 @@
 
 package chisel3.experimental.hierarchy
 
-import scala.reflect.runtime.{universe => ru}
 import scala.collection.mutable
 
 import chisel3._

core/src/main/scala/chisel3/experimental/hierarchy/core/HierarchyImpl.scala

@@ -46,7 +46,7 @@ trait HierarchyImpl[+A] {
       Set.empty[String]
     }
   }
-  private def inBaseClasses(clz: String): Boolean = superClasses.contains(clz)
+  protected def inBaseClasses(clz: String): Boolean = superClasses.contains(clz)
 
   /** Used by Chisel's internal macros. DO NOT USE in your normal Chisel code!!!
     * Instead, mark the field you are accessing with [[public]]

svsim/src/main/scala/Workspace.scala

@@ -351,11 +351,11 @@ final class Workspace(
       //format: off
       // For this debug flow, we rebuild the simulation from scratch every time, to avoid issues if the simulation was originally compiled in a different environment, like using SiFive's `wake`.
       l("clean:")
-	    l("\tls . | grep -v Makefile | grep -v execution-script.txt | xargs rm -rf")
+      l("\tls . | grep -v Makefile | grep -v execution-script.txt | xargs rm -rf")
       l()
       l("simulation: clean")
       l("\t$(compilerEnvironment) \\")
-	    l("\t", parameters.compilerPath, " \\")
+      l("\t", parameters.compilerPath, " \\")
       for (argument <- parameters.compilerInvocation.arguments) {
         val sanitizedArugment = argument
           .replace("$", "$$")