Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/scala/chisel3/Module.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ package experimental {
*
* This requires that the module is closed.
*/
private[chisel3] def layers: Seq[Layer] = {
private[chisel3] def _moduleLayers: Seq[Layer] = {
require(isClosed, "Can't get layers before module is closed")
if (_layers == null) {
throw new InternalErrorException(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ private[chisel3] class DefinitionClone[T <: BaseModule](val getProto: T) extends
// Necessary for toTarget to work
private[chisel3] def initializeInParent(): Unit = ()
// Module name is the same as proto's module name
override def desiredName: String = getProto.name
override def layers: Seq[Layer] = getProto.layers
override def desiredName: String = getProto.name
override def _moduleLayers: Seq[Layer] = getProto._moduleLayers
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ private[chisel3] final class InstanceClone[T <: BaseModule](val getProto: T, val
// Instance name is the same as proto's instance name
override def instanceName = instName()
// Module name is the same as proto's module name
override def desiredName: String = getProto.name
override def layers: Seq[Layer] = getProto.layers
override def desiredName: String = getProto.name
override def _moduleLayers: Seq[Layer] = getProto._moduleLayers
}
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,5 @@ private[chisel3] class ModuleClone[T <: BaseModule](val getProto: T)(implicit si
this
}

override def layers: Seq[Layer] = getProto.layers
override def _moduleLayers: Seq[Layer] = getProto._moduleLayers
}
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ object Instance extends SourceInfoDoc {
firrtlPorts,
SpecifiedDirection.Unspecified,
params,
importedDefinition.proto.layers,
importedDefinition.proto._moduleLayers,
// Imported Definitions necessarily don't have external requirements
Seq.empty
)
Expand Down Expand Up @@ -202,7 +202,7 @@ object Instance extends SourceInfoDoc {

// The definition may have known layers that are not yet known to the
// Builder. Add them here.
definition.proto.layers.foreach(layer.addLayer)
definition.proto._moduleLayers.foreach(layer.addLayer)

new Instance(Clone(clone))
}
Expand Down
Loading