Merge branch '2.11.x' into 2.12.x

6 files changed, 161 insertions, 0 deletions

diff --git a/test/files/jvm/beanInfo.check b/test/files/jvm/beanInfo.check
new file mode 100644
index 0000000000..d74e127711
--- /dev/null
+++ b/test/files/jvm/beanInfo.check
@@ -0,0 +1,6 @@
+property descriptors
+x -- int -- public int p.C.x() -- null
+y -- class java.lang.String -- public java.lang.String p.C.y() -- public void p.C.y_$eq(java.lang.String)
+z -- class scala.collection.immutable.List -- public scala.collection.immutable.List p.C.z() -- public void p.C.z_$eq(scala.collection.immutable.List)
+method descriptors
+f -- public p.C p.C.f()
diff --git a/test/files/jvm/beanInfo/C_1.scala b/test/files/jvm/beanInfo/C_1.scala
new file mode 100644
index 0000000000..a338abea1d
--- /dev/null
+++ b/test/files/jvm/beanInfo/C_1.scala
@@ -0,0 +1,9 @@
+package p
+
+@scala.beans.BeanInfo
+class C {
+  val x: Int = 0
+  var y: String = ""
+  var z: List[_] = Nil
+  def f: C = ???
+}
diff --git a/test/files/jvm/beanInfo/Test_2.scala b/test/files/jvm/beanInfo/Test_2.scala
new file mode 100644
index 0000000000..fa9b6e1391
--- /dev/null
+++ b/test/files/jvm/beanInfo/Test_2.scala
@@ -0,0 +1,17 @@
+object Test extends App {
+  val info = java.beans.Introspector.getBeanInfo(classOf[p.C])
+
+  println("property descriptors")
+
+  val pds = info.getPropertyDescriptors
+  for (pd <- pds) {
+    println(s"${pd.getName} -- ${pd.getPropertyType} -- ${pd.getReadMethod} -- ${pd.getWriteMethod}")
+  }
+
+  println("method descriptors")
+
+  val mds = info.getMethodDescriptors
+  for (md <- mds) {
+    println(s"${md.getName} -- ${md.getMethod}")
+  }
+}
diff --git a/test/files/jvm/t8582.check b/test/files/jvm/t8582.check
new file mode 100644
index 0000000000..1d19f1d6a8
--- /dev/null
+++ b/test/files/jvm/t8582.check
@@ -0,0 +1,47 @@
+t8582.scala:17: warning: class BeanInfo in package beans is deprecated: the generation of BeanInfo classes is no longer supported
+    class C1
+          ^
+getClass on module gives module class
+ class p1.p2.Singleton$Singleton$
+
+Nested module classes are found through reflection
+ p1.p2.Singleton$Singleton$: List(class p1.p2.Singleton$Singleton$Singleton$)
+
+Reflection can find direct nested classes (A1-B1-C1)
+ A1: List(class A1$B1)
+ A1$B1: List(class A1$B1$C1)
+ A1$B1$C1: List()
+
+Reflection can find direct nested classes (A2-B2-C2)
+ A2: List(class A2$B2)
+ A2$B2: List(class A2$B2$C2)
+ A2$B2$C2: List()
+
+Mirror classes have the same InnerClass attributes as the corresponding module class:
+ className[p1/p2/Singleton$Singleton$] outerClassName[p1/p2/Singleton] innerName[Singleton$] access[9]
+Module class
+ className[p1/p2/Singleton$Singleton$] outerClassName[p1/p2/Singleton] innerName[Singleton$] access[9]
+
+An outer class has a InnerClass attribute for direct nested classes
+ className[A1$B1] outerClassName[A1] innerName[B1] access[1]
+A nested class has an InnerClass attribute for itself (and also for its nested classes)
+ className[A1$B1] outerClassName[A1] innerName[B1] access[1]
+ className[A1$B1$C1] outerClassName[A1$B1] innerName[C1] access[1]
+C1 is a nested class, so it has an InnerClass attribute for itself.
+Because that attribute leads to an entry for B1 in the constant pool, C1 needs an InnerClass attribute for B1.
+ className[A1$B1] outerClassName[A1] innerName[B1] access[1]
+ className[A1$B1$C1] outerClassName[A1$B1] innerName[C1] access[1]
+
+The BeanInfo class has the same InnerClass attributes as the corresponding bean
+ className[A1$B1] outerClassName[A1] innerName[B1] access[1]
+ className[A1$B1$C1] outerClassName[A1$B1] innerName[C1] access[1]
+
+Class A2 mentions class C2 in the constant pool (due to method  f), therefore it needs an InnerClass attribute for C1
+ className[A2$B2] outerClassName[A2] innerName[B2] access[1]
+ className[A2$B2$C2] outerClassName[A2$B2] innerName[C2] access[1]
+B2
+ className[A2$B2] outerClassName[A2] innerName[B2] access[1]
+ className[A2$B2$C2] outerClassName[A2$B2] innerName[C2] access[1]
+C2
+ className[A2$B2] outerClassName[A2] innerName[B2] access[1]
+ className[A2$B2$C2] outerClassName[A2$B2] innerName[C2] access[1]
diff --git a/test/files/jvm/t8582.flags b/test/files/jvm/t8582.flags
new file mode 100644
index 0000000000..dcc59ebe32
--- /dev/null
+++ b/test/files/jvm/t8582.flags
@@ -0,0 +1 @@
+-deprecation
diff --git a/test/files/jvm/t8582.scala b/test/files/jvm/t8582.scala
new file mode 100644
index 0000000000..8a57ef7952
--- /dev/null
+++ b/test/files/jvm/t8582.scala
@@ -0,0 +1,81 @@
+import scala.tools.partest.BytecodeTest
+import scala.collection.JavaConverters._
+
+package p1 {
+  package p2 {
+    object Singleton {
+      object Singleton {
+        object Singleton
+      }
+    }
+  }
+}
+
+class A1 {
+  class B1 {
+    @scala.beans.BeanInfo
+    class C1
+  }
+}
+
+class A2 {
+  class B2 {
+    class C2
+  }
+  def f: B2#C2 = null
+}
+
+
+object Test extends BytecodeTest {
+  import p1.p2._
+
+  def nested(c: Class[_]) = s" ${c.getName}: ${c.getDeclaredClasses.toList}"
+
+  def nprintln(s: String) = println("\n"+s)
+  def printInner(cname: String): Unit = {
+    val cnode = loadClassNode(cname)
+    println(cnode.innerClasses.asScala.toList.map(i => s"className[${i.name}] outerClassName[${i.outerName}] innerName[${i.innerName}] access[${i.access}]").mkString(" ", "\n ", ""))
+  }
+
+  def show() {
+
+    println("getClass on module gives module class")
+    println(" " + Singleton.Singleton.getClass)
+
+    nprintln("Nested module classes are found through reflection")
+    println(nested(Singleton.Singleton.getClass))
+
+    nprintln("Reflection can find direct nested classes (A1-B1-C1)")
+    println(nested(classOf[A1]))
+    println(nested(classOf[A1#B1]))
+    println(nested(classOf[A1#B1#C1]))
+
+    nprintln("Reflection can find direct nested classes (A2-B2-C2)")
+    println(nested(classOf[A2]))
+    println(nested(classOf[A2#B2]))
+    println(nested(classOf[A2#B2#C2]))
+
+    nprintln("Mirror classes have the same InnerClass attributes as the corresponding module class:")
+    printInner("p1.p2.Singleton") // mirror class
+    println("Module class")
+    printInner("p1.p2.Singleton$")
+
+    nprintln("An outer class has a InnerClass attribute for direct nested classes")
+    printInner("A1")
+    println("A nested class has an InnerClass attribute for itself (and also for its nested classes)")
+    printInner("A1$B1")
+    println("C1 is a nested class, so it has an InnerClass attribute for itself.\n"+
+            "Because that attribute leads to an entry for B1 in the constant pool, C1 needs an InnerClass attribute for B1.")
+    printInner("A1$B1$C1")
+
+    nprintln("The BeanInfo class has the same InnerClass attributes as the corresponding bean")
+    printInner("A1$B1$C1BeanInfo")
+
+    nprintln("Class A2 mentions class C2 in the constant pool (due to method  f), therefore it needs an InnerClass attribute for C1")
+    printInner("A2")
+    println("B2")
+    printInner("A2$B2")
+    println("C2")
+    printInner("A2$B2$C2")
+  }
+}