3 files changed, 30 insertions, 18 deletions
diff --git a/libjava/testsuite/libjava.lang/PR35020.jar b/libjava/testsuite/libjava.lang/PR35020.jar
index bedaed7ecdb..09c4ef4818d 100644
--- a/libjava/testsuite/libjava.lang/PR35020.jar
+++ b/libjava/testsuite/libjava.lang/PR35020.jar
diff --git a/libjava/testsuite/libjava.lang/PR35020.java b/libjava/testsuite/libjava.lang/PR35020.java
index 1850da79683..ff5f6bf06f2 100644
--- a/libjava/testsuite/libjava.lang/PR35020.java
+++ b/libjava/testsuite/libjava.lang/PR35020.java
@@ -1,21 +1,30 @@
+class outer$inner
+{
+};
+
 public class PR35020
 {
-   class inner
-   {
-   }
-   public static void main(String[] args)
-   {
-      System.out.println(inner.class.getSimpleName());
-      System.out.println(PR35020.class.getSimpleName());
-      System.out.println(Class.class.getSimpleName());
-      System.out.println((new int[7]).getClass().getSimpleName());
-      System.out.println((new Object[1][1][1][1][1][1][1][1]).getClass().getSimpleName());
-      System.out.println((new java.security.PrivilegedAction() 
-	{
-	  public Object run() {
-	    return null;
-	  }
-	}).getClass().getSimpleName());
-   }
+  class PR35020$Inner
+  {
+  };
+  class inner
+  {
+  }
+  public static void main(String[] args)
+  {
+    System.out.println(inner.class.getSimpleName());
+    System.out.println(PR35020.class.getSimpleName());
+    System.out.println(Class.class.getSimpleName());
+    System.out.println((new int[7]).getClass().getSimpleName());
+    System.out.println((new Object[1][1][1][1][1][1][1][1]).getClass().getSimpleName());
+    System.out.println((new java.security.PrivilegedAction() 
+      {
+	public Object run() {
+	  return null;
+	}
+      }).getClass().getSimpleName());
+    System.out.println(PR35020$Inner.class.getSimpleName());
+    System.out.println(outer$inner.class.getSimpleName());
+    System.out.println(outer$inner.inner.class.getSimpleName());
+  }
 }
-
diff --git a/libjava/testsuite/libjava.lang/PR35020.out b/libjava/testsuite/libjava.lang/PR35020.out
index 73eb0c917fc..9bf85e209d5 100644
--- a/libjava/testsuite/libjava.lang/PR35020.out
+++ b/libjava/testsuite/libjava.lang/PR35020.out
@@ -4,3 +4,6 @@ Class
 int[]
 Object[][][][][][][][]
 
+PR35020$Inner
+outer$inner
+inner