From 3b206b5054bc36706f295b3f48f170da8775031f Mon Sep 17 00:00:00 2001
From: Adam Izraelevitz
Date: Thu, 30 Jul 2020 14:57:18 -0700
Subject: Broken auto-clonetype on Scala 2.11.12 (#1480)

* Added broken auto-clonetype test

* Added bugfix for 2.11

* Add descriptive comment for 2.11 special case

* Update src/test/scala/chiselTests/AutoClonetypeSpec.scala

* Update src/test/scala/chiselTests/AutoClonetypeSpec.scala

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>---
 core/src/main/scala/chisel3/Aggregate.scala | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'core/src')

diff --git a/core/src/main/scala/chisel3/Aggregate.scala b/core/src/main/scala/chisel3/Aggregate.scala
index 523d404d..4e9a95c1 100644
--- a/core/src/main/scala/chisel3/Aggregate.scala
+++ b/core/src/main/scala/chisel3/Aggregate.scala
@@ -824,7 +824,20 @@ abstract class Bundle(implicit compileOptions: CompileOptions) extends Record {
       }
     }
 
+    val isAnonFunc = ".*\\$\\$anonfun\\$\\d+$".r
+    // In Scala 2.11, anonymous functions were compiled to their own classes, while in Scala 2.12,
+    // they are directly compiled into the enclosing classes. This meant that checking the enclosing
+    // parent in 2.12 would work, but in 2.11 they wouldn't. This fix just looks for the first enclosing class
+    // which is not an anonymous function.
+    def getNonFuncClass(clz: Class[_]): Option[Class[_]] = {
+      clz.getName match {
+        case isAnonFunc() => getNonFuncClass(clz.getEnclosingClass)
+        case _ => Some(clz)
+      }
+    }
+
     val mirror = runtimeMirror(clazz.getClassLoader)
+
     val classSymbolOption = try {
       Some(mirror.reflect(this).symbol)
     } catch {
@@ -834,7 +847,7 @@ abstract class Bundle(implicit compileOptions: CompileOptions) extends Record {
     val enclosingClassOption = (clazz.getEnclosingClass, classSymbolOption) match {
       case (null, _) => None
       case (_, Some(classSymbol)) if classSymbol.isStatic => None  // allows support for members of companion objects
-      case (outerClass, _) => Some(outerClass)
+      case (parent, _) => getNonFuncClass(parent)
     }
 
     // For compatibility with pre-3.1, where null is tried as an argument to the constructor.
-- 
cgit v1.2.3