Merge pull request #4566 from lrytz/t9359

SI-9359 Fix InnerClass entry flags for nested Java enums

8 files changed, 90 insertions, 10 deletions

diff --git a/test/files/run/t7582.check b/test/files/run/t7582.check
index 2a11210000..0cfbf08886 100644
--- a/test/files/run/t7582.check
+++ b/test/files/run/t7582.check
@@ -1,6 +1 @@
-#partest !-Ybackend:GenBCode
-warning: there was one inliner warning; re-run with -Yinline-warnings for details
-#partest -Ybackend:GenBCode
-warning: there was one inliner warning; re-run with -Yopt-warnings for details
-#partest
 2
diff --git a/test/files/run/t7582/InlineHolder.scala b/test/files/run/t7582/InlineHolder.scala
index a18b9effaa..3cbf233ce1 100644
--- a/test/files/run/t7582/InlineHolder.scala
+++ b/test/files/run/t7582/InlineHolder.scala
@@ -1,3 +1,6 @@
+/*
+ * filter: inliner warning; re-run with
+ */
 package p1 {
   object InlineHolder {
     @inline def inlinable = p1.PackageProtectedJava.protectedMethod() + 1
diff --git a/test/files/run/t7582b.check b/test/files/run/t7582b.check
index 2a11210000..0cfbf08886 100644
--- a/test/files/run/t7582b.check
+++ b/test/files/run/t7582b.check
@@ -1,6 +1 @@
-#partest !-Ybackend:GenBCode
-warning: there was one inliner warning; re-run with -Yinline-warnings for details
-#partest -Ybackend:GenBCode
-warning: there was one inliner warning; re-run with -Yopt-warnings for details
-#partest
 2
diff --git a/test/files/run/t7582b/InlineHolder.scala b/test/files/run/t7582b/InlineHolder.scala
index a18b9effaa..3cbf233ce1 100644
--- a/test/files/run/t7582b/InlineHolder.scala
+++ b/test/files/run/t7582b/InlineHolder.scala
@@ -1,3 +1,6 @@
+/*
+ * filter: inliner warning; re-run with
+ */
 package p1 {
   object InlineHolder {
     @inline def inlinable = p1.PackageProtectedJava.protectedMethod() + 1
diff --git a/test/files/run/t9359.check b/test/files/run/t9359.check
new file mode 100644
index 0000000000..8dcfe4f60a
--- /dev/null
+++ b/test/files/run/t9359.check
@@ -0,0 +1,18 @@
+  // access flags 0x4009
+  public static enum INNERCLASS A_1$A1N A_1 A1N
+
+  // access flags 0x4409
+  public static abstract enum INNERCLASS A_1$A1N_ABSTRACT A_1 A1N_ABSTRACT
+
+  // access flags 0x4019
+  public final static enum INNERCLASS A_1$A1N_FINAL A_1 A1N_FINAL
+
+  // access flags 0x4009
+  public static enum INNERCLASS B_2$A1N B_2 A1N
+
+  // access flags 0x4409
+  public static abstract enum INNERCLASS B_2$A1N_ABSTRACT B_2 A1N_ABSTRACT
+
+  // access flags 0x4019
+  public final static enum INNERCLASS B_2$A1N_FINAL B_2 A1N_FINAL
+
diff --git a/test/files/run/t9359/A_1.java b/test/files/run/t9359/A_1.java
new file mode 100644
index 0000000000..3ac82ed55f
--- /dev/null
+++ b/test/files/run/t9359/A_1.java
@@ -0,0 +1,19 @@
+public class A_1 {
+  // nested final
+  public static enum A1N_FINAL {
+    A1N_FINAL_VAL
+  }
+
+  // nested, non-final
+  public enum A1N {
+    A1N_VAL { } // value has a body, so a class extending A1N is generated
+  }
+
+  // nested, non-final, abstract
+  public enum A1N_ABSTRACT {
+    A1N_ABSTRACT_VAL {
+      void foo() { return; }
+    };
+    abstract void foo(); // abstract member makes the enum class abstract
+  }
+}
diff --git a/test/files/run/t9359/B_2.java b/test/files/run/t9359/B_2.java
new file mode 100644
index 0000000000..d824facda9
--- /dev/null
+++ b/test/files/run/t9359/B_2.java
@@ -0,0 +1,19 @@
+public class B_2 {
+  // nested final
+  public enum A1N_FINAL {
+    A1N_FINAL_VAL
+  }
+
+  // nested, non-final
+  public enum A1N {
+    A1N_VAL { } // value has a body, so a class extending A1N is generated
+  }
+
+  // nested, non-final, abstract
+  public enum A1N_ABSTRACT {
+    A1N_ABSTRACT_VAL {
+      void foo() { return; }
+    };
+    abstract void foo(); // abstract member makes the enum class abstract
+  }
+}
diff --git a/test/files/run/t9359/Test_2.scala b/test/files/run/t9359/Test_2.scala
new file mode 100644
index 0000000000..869c51b619
--- /dev/null
+++ b/test/files/run/t9359/Test_2.scala
@@ -0,0 +1,28 @@
+import scala.tools.partest.BytecodeTest
+import scala.tools.asm
+import asm.tree.{ClassNode, InnerClassNode}
+import asm.{Opcodes => Flags}
+import scala.collection.JavaConverters._
+
+class C {
+  def f1: A_1.A1N_FINAL    = A_1.A1N_FINAL.A1N_FINAL_VAL
+  def f2: A_1.A1N          = A_1.A1N.A1N_VAL
+  def f3: A_1.A1N_ABSTRACT = A_1.A1N_ABSTRACT.A1N_ABSTRACT_VAL
+
+  def f4: B_2.A1N_FINAL    = B_2.A1N_FINAL.A1N_FINAL_VAL
+  def f5: B_2.A1N          = B_2.A1N.A1N_VAL
+  def f6: B_2.A1N_ABSTRACT = B_2.A1N_ABSTRACT.A1N_ABSTRACT_VAL
+}
+
+object Test extends BytecodeTest {
+  def tost(n: InnerClassNode) = {
+    val t = new asm.util.Textifier
+    t.visitInnerClass(n.name, n.outerName, n.innerName, n.access)
+    t.getText.get(0);
+  }
+  def show(): Unit = {
+    for (n <- loadClassNode("C").innerClasses.asScala.toList.sortBy(_.name)) {
+      println(tost(n))
+    }
+  }
+}