--- old/test/compiler/c2/6837094/Test.java	2016-07-06 19:19:44.143391911 +0300
+++ /dev/null	2016-06-14 14:43:27.230512026 +0300
@@ -1,94 +0,0 @@
-/*
- * Copyright 2009 Google Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/**
- * @test
- * @bug 6837094
- * @summary False positive for "meet not symmetric" failure
- *
- * @run main/othervm -Xbatch -XX:CompileOnly=Test.collectIs,Test$Factory$1.getArray,Test$Factory$2.getArray Test
- */
-
-import java.util.Set;
-import java.util.HashSet;
-
-public class Test {
-
-  private interface Factory<M extends Interface> {
-    Factory<Child0> Zero = new Factory<Child0>() {
-      public Child0[] getArray() { return new Child0[1]; }
-    };
-
-    Factory<Child1> One = new Factory<Child1>() {
-      public Child1[] getArray() { return new Child1[1]; }
-    };
-
-    M[] getArray();
-  }
-
-  /**
-   * C2 asserts when compiling this method. Bimorphic inlining happens at
-   * getArray call site. A Phi in the catch block tries to join the meet type
-   * from he inline site (Parent[]) with the type expected by CI (Interface[]).
-   *
-   * C2 throws an assert when it doesn't need to.
-   */
-  private static <I extends Interface> void collectIs(
-      Factory<I> factory, Set<Interface> s) {
-    for (I i : factory.getArray()) {
-      try {
-        s.add(i);
-      } catch (Exception e) {
-      }
-    }
-  }
-
-  static public void main(String argv[]) {
-    Set<Interface> s = new HashSet();
-
-    for (int i = 0; i < 25000; i++) {
-      collectIs(Factory.Zero, s);
-      collectIs(Factory.One, s);
-    }
-  }
-}
-
-/**
- * Establish necessary class hierarchy
- */
-
-interface Interface {
-}
-
-class Parent {
-}
-
-class Child0 extends Parent implements Interface {
-}
-
-class Child1 extends Parent implements Interface {
-}
-
-class Child2 extends Parent implements Interface {
-}
--- /dev/null	2016-06-14 14:43:27.230512026 +0300
+++ new/test/compiler/c2/Test6837094.java	2016-07-06 19:19:43.991391907 +0300
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2009 Google Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6837094
+ * @summary False positive for "meet not symmetric" failure
+ *
+ * @run main/othervm -Xbatch
+ *    -XX:CompileCommand=compileonly,compiler.c2.Test6837094::collectIs
+ *    -XX:CompileCommand=compileonly,compiler.c2.Test6837094$Factory$1::getArray
+ *    -XX:CompileCommand=compileonly,compiler.c2.Test6837094$Factory$2::getArray
+ *    compiler.c2.Test6837094
+ */
+
+package compiler.c2;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class Test6837094 {
+
+  private interface Factory<M extends Interface> {
+    Factory<Child0> Zero = new Factory<Child0>() {
+      public Child0[] getArray() { return new Child0[1]; }
+    };
+
+    Factory<Child1> One = new Factory<Child1>() {
+      public Child1[] getArray() { return new Child1[1]; }
+    };
+
+    M[] getArray();
+  }
+
+  /**
+   * C2 asserts when compiling this method. Bimorphic inlining happens at
+   * getArray call site. A Phi in the catch block tries to join the meet type
+   * from he inline site (Parent[]) with the type expected by CI (Interface[]).
+   *
+   * C2 throws an assert when it doesn't need to.
+   */
+  private static <I extends Interface> void collectIs(
+      Factory<I> factory, Set<Interface> s) {
+    for (I i : factory.getArray()) {
+      try {
+        s.add(i);
+      } catch (Exception e) {
+      }
+    }
+  }
+
+  static public void main(String argv[]) {
+    Set<Interface> s = new HashSet();
+
+    for (int i = 0; i < 25000; i++) {
+      collectIs(Factory.Zero, s);
+      collectIs(Factory.One, s);
+    }
+  }
+
+  /**
+   * Establish necessary class hierarchy
+   */
+
+  static interface Interface {
+  }
+
+  static class Parent {
+  }
+
+  static class Child0 extends Parent implements Interface {
+  }
+
+  static class Child1 extends Parent implements Interface {
+  }
+
+  static class Child2 extends Parent implements Interface {
+  }
+
+}
+