--- a/test/TEST.groups	Mon Nov 17 23:11:40 2014 +0000
+++ b/test/TEST.groups	Tue Nov 18 19:44:45 2014 +0100
@@ -107,8 +107,8 @@
 # Tests that require the full JRE
 #
 needs_jre = \
-  compiler/6852078/Test6852078.java \
-  compiler/7047069/Test7047069.java \
+  compiler/c2/6852078/Test6852078.java \
+  compiler/c2/7047069/Test7047069.java \
   runtime/6294277/SourceDebugExtension.java \
   runtime/ClassFile/JsrRewriting.java \
   runtime/ClassFile/OomWhileParsingRepeatedJsr.java
@@ -325,245 +325,84 @@
   sanity/
 
 hotspot_compiler_1 = \
-  compiler/5057225/Test5057225.java \
-  compiler/5091921/Test5091921.java \
-  compiler/5091921/Test6186134.java \
-  compiler/5091921/Test6196102.java \
-  compiler/5091921/Test6357214.java \
-  compiler/5091921/Test6559156.java \
-  compiler/5091921/Test6753639.java \
-  compiler/5091921/Test6935022.java \
-  compiler/5091921/Test6959129.java \
-  compiler/5091921/Test6985295.java \
-  compiler/5091921/Test6992759.java \
-  compiler/5091921/Test7005594.java \
-  compiler/5091921/Test7020614.java \
-  compiler/6378821/Test6378821.java \
-  compiler/6431242/Test.java \
-  compiler/6443505/Test6443505.java \
-  compiler/6478991/NullCheckTest.java \
-  compiler/6539464/Test.java \
-  compiler/6579789/Test6579789.java \
-  compiler/6636138/ \
-  compiler/6646019/Test.java \
-  compiler/6659207/Test.java \
-  compiler/6661247/Test.java \
-  compiler/6663621/IVTest.java \
-  compiler/6689060/Test.java \
-  compiler/6695810/Test.java \
-  compiler/6700047/Test6700047.java \
-  compiler/6711100/Test.java \
-  compiler/6724218/Test.java \
-  compiler/6732154/Test6732154.java \
-  compiler/6758234/Test6758234.java \
-  compiler/6769124/ \
-  compiler/6772683/InterruptedTest.java \
-  compiler/6778657/Test.java \
-  compiler/6795161/Test.java \
-  compiler/6795362/Test6795362.java \
-  compiler/6795465/Test6795465.java \
-  compiler/6796786/Test6796786.java \
-  compiler/6799693/Test.java \
-  compiler/6805724/Test6805724.java \
-  compiler/6814842/Test6814842.java \
-  compiler/6823453/Test.java \
-  compiler/6833129/Test.java \
-  compiler/6837011/Test6837011.java \
-  compiler/6843752/Test.java \
-  compiler/6849574/Test.java \
-  compiler/6855164/Test.java \
-  compiler/6855215/Test6855215.java \
-  compiler/6857159/Test6857159.java \
-  compiler/6860469/Test.java \
-  compiler/6863155/Test6863155.java \
-  compiler/6863420/Test.java \
-  compiler/6865265/StackOverflowBug.java \
-  compiler/6879902/Test6879902.java \
-  compiler/6880034/Test6880034.java \
-  compiler/6891750/Test6891750.java \
-  compiler/6892265/Test.java \
-  compiler/6894807/IsInstanceTest.java \
-  compiler/6901572/Test.java \
-  compiler/6909839/Test6909839.java \
-  compiler/6910484/Test.java \
-  compiler/6910605/Test.java \
-  compiler/6910618/Test.java \
-  compiler/6916644/Test6916644.java \
-  compiler/6921969/TestMultiplyLongHiZero.java \
-  compiler/6930043/Test6930043.java \
-  compiler/6932496/Test6932496.java \
-  compiler/6956668/Test6956668.java \
-  compiler/6968348/Test6968348.java \
-  compiler/6973329/Test.java
-
+  compiler/arraycopy/ \
+  compiler/c1/ \
+  compiler/c2/ \
+  -compiler/c2/5091921/Test6850611.java \
+  -compiler/c2/5091921/Test6890943.java \
+  -compiler/c2/5091921/Test6905845.java \
+  -compiler/c2/6340864 \
+  -compiler/c2/6589834 \
+  -compiler/c2/6603011 \
+  -compiler/c2/6912517 \
+  -compiler/c2/6792161 \
+  -compiler/c2/7070134 \
+  -compiler/c2/8004867
+  
 hotspot_compiler_2 = \
-  compiler/6982370/Test6982370.java \
-  compiler/7009231/Test7009231.java \
-  compiler/7009359/Test7009359.java \
-  compiler/7017746/Test.java \
-  compiler/7024475/Test7024475.java \
-  compiler/7041100/Test7041100.java \
-  compiler/7044738/Test7044738.java \
-  compiler/7046096/Test7046096.java \
-  compiler/7048332/Test7048332.java \
-  compiler/7068051/Test7068051.java \
-  compiler/7082949/Test7082949.java \
-  compiler/7088020/Test7088020.java \
-  compiler/7090976/Test7090976.java \
-  compiler/7103261/Test7103261.java \
-  compiler/7110586/Test7110586.java \
-  compiler/7119644/ \
-  compiler/7141637/SpreadNullArg.java \
-  compiler/7169782/Test7169782.java \
-  compiler/7174363/Test7174363.java \
-  compiler/7179138/ \
-  compiler/7190310/ \
-  compiler/7192963/ \
-  compiler/7200264/TestIntVect.java \
-  compiler/8000805/Test8000805.java \
-  compiler/8002069/Test8002069.java \
-  compiler/8004741/Test8004741.java \
-  compiler/8005033/Test8005033.java \
-  compiler/8005419/Test8005419.java \
-  compiler/8005956/PolynomialRoot.java \
-  compiler/8007294/Test8007294.java \
-  compiler/EliminateAutoBox/UnsignedLoads.java
-
+  compiler/classUnloading/ \
+  compiler/codecache/ \
+  compiler/codegen/ \
+  compiler/cpuflags/ \
+  compiler/eliminateAutobox/ \
+  compiler/escapeAnalysis/ \
+  compiler/exceptions/ \
+  compiler/floatingpoint/ \
+  compiler/gcbarriers/ \
+  compiler/inlining/ \
+  compiler/integerArithmetic/ \
+  compiler/interpreter/ \
+  -compiler/codegen/7184394
+  
 hotspot_compiler_3 = \
-  compiler/8007722/Test8007722.java \
-  compiler/8009761/Test8009761.java \
-  compiler/8010927/Test8010927.java \
-  compiler/8011706/Test8011706.java \
-  compiler/8011771/Test8011771.java \
-  compiler/8011901/Test8011901.java \
-  compiler/arraycopy/TestMissingControl.java \
-  compiler/ciReplay/TestVM_no_comp_level.sh \
-  compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java \
-  compiler/codecache/CheckSegmentedCodeCache.java \
-  compiler/codecache/CheckUpperLimit.java \
-  compiler/codegen/ \
-  compiler/cpuflags/RestoreMXCSR.java \
-  compiler/EscapeAnalysis/ \
-  compiler/exceptions/ \
-  compiler/floatingpoint/ModNaN.java \
-  compiler/gcbarriers/G1CrashTest.java \
-  compiler/inlining/ \
-  compiler/IntegerArithmetic/TestIntegerComparison.java \
-  compiler/intrinsics/bmi/TestAndnI.java \
-  compiler/intrinsics/bmi/TestAndnI.java \
-  compiler/intrinsics/bmi/TestAndnL.java \
-  compiler/intrinsics/bmi/TestBlsiI.java \
-  compiler/intrinsics/bmi/TestBlsiL.java \
-  compiler/intrinsics/bmi/TestBlsmskI.java \
-  compiler/intrinsics/bmi/TestBlsmskL.java \
-  compiler/intrinsics/bmi/TestBlsrI.java \
-  compiler/intrinsics/bmi/TestBlsrL.java \
-  compiler/intrinsics/bmi/TestLzcntI.java \
-  compiler/intrinsics/bmi/TestLzcntL.java \
-  compiler/intrinsics/bmi/TestTzcntI.java \
-  compiler/intrinsics/bmi/TestTzcntL.java \
-  compiler/intrinsics/clone/TestObjectClone.java \
-  compiler/intrinsics/hashcode/TestHashCode.java \
-  compiler/intrinsics/mathexact/CompareTest.java \
-  compiler/intrinsics/mathexact/GVNTest.java \
-  compiler/intrinsics/mathexact/NegExactILoadTest.java \
-  compiler/intrinsics/mathexact/NegExactILoopDependentTest.java \
-  compiler/intrinsics/mathexact/NegExactINonConstantTest.java \
-  compiler/intrinsics/mathexact/SubExactICondTest.java \
-  compiler/intrinsics/mathexact/SubExactILoadTest.java \
-  compiler/intrinsics/mathexact/SubExactILoopDependentTest.java \
-  compiler/intrinsics/stringequals/TestStringEqualsBadLength.java \
-  compiler/intrinsics/unsafe/UnsafeGetAddressTest.java \
-  compiler/intrinsics/classcast/NullCheckDroppingsTest.java \
-  compiler/jsr292/ConcurrentClassLoadingTest.java \
-  compiler/jsr292/CreatesInterfaceDotEqualsCallInfo.java \
-  compiler/loopopts/TestLogSum.java \
-  compiler/macronodes/TestEliminateAllocationPhi.java \
-  compiler/membars/TestMemBarAcquire.java \
-  compiler/osr/TestOSRWithNonEmptyStack.java \
-  compiler/profiling/TestMethodHandleInvokesIntrinsic.java \
-  compiler/profiling/TestSpecTrapClassUnloading.java \
-  compiler/profiling/TestUnexpectedProfilingMismatch.java \
-  compiler/regalloc/C1ObjectSpillInLogicOp.java \
-  compiler/startup/NumCompilerThreadsCheck.java \
-  compiler/startup/SmallCodeCacheStartup.java \
-  compiler/types/TestSpeculationFailedHigherEqual.java \
-  compiler/types/TypeSpeculation.java \
-  compiler/uncommontrap/StackOverflowGuardPagesOff.java \
-  compiler/uncommontrap/TestStackBangMonitorOwned.java \
-  compiler/uncommontrap/TestStackBangRbp.java \
-  compiler/unsafe/GetUnsafeObjectG1PreBarrier.java
-  
+  compiler/intrinsics/ \
+  compiler/jsr292/ \
+  compiler/loopopts/ \
+  compiler/macronodes/ \
+  compiler/osr/ \
+  compiler/regalloc/ \
+  compiler/runtime/ \
+  compiler/startup/ \
+  compiler/types/ \
+  compiler/uncommontrap/ \
+  compiler/unsafe/ \
+  -compiler/intrinsics/bmi/verifycode \
+  -compiler/intrinsics/mathexact \
+  -compiler/intrinsics/multiplytolen \
+  -compiler/intrinsics/sha \
+  -compiler/loopopts/7052494 \
+  -compiler/runtime/6826736
 
 hotspot_compiler_closed = \
-  closed/compiler/4292742/Test.java \
-  closed/compiler/4474154/Test4474154.java \
-  closed/compiler/4482613/Test4482613.java \
-  closed/compiler/4490177/tctest.java \
-  closed/compiler/4495990/Application.java \
-  closed/compiler/4522874/Test4522874.sh \
-  closed/compiler/4629512/Test4629512.java \
-  closed/compiler/4647299/Looper.java \
-  closed/compiler/4655758/TestClass.java \
-  closed/compiler/4671453/LongCompTest.java \
-  closed/compiler/4671460/CharArrTest.java \
-  closed/compiler/4709105/StringTest2.java \
-  closed/compiler/4732721/Bug.java \
-  closed/compiler/4750681/ReadTest.java \
-  closed/compiler/4787943/LongCrash.java \
-  closed/compiler/4819903/Base64Test.java \
-  closed/compiler/4903383/Test.java \
-  closed/compiler/4906393/Test.java \
-  closed/compiler/4907999/Uidtest.java \
-  closed/compiler/4917709/Tester.java \
-  closed/compiler/4957832/Test.java \
-  closed/compiler/4965430/LoopTest.java \
-  closed/compiler/4979449/T4979449.java \
-  closed/compiler/5031274/Test.java \
-  closed/compiler/5043395/T5043395.java \
-  closed/compiler/5049410/Test.java \
-  closed/compiler/5098422/Test.java \
-  closed/compiler/6173783/Test.java \
-  closed/compiler/6272923/Test6272923.sh \
-  closed/compiler/6290963/Test.java \
-  closed/compiler/6305546/Test.java \
-  closed/compiler/6309806/Test.java \
-  closed/compiler/6311859/Test.java \
-  closed/compiler/6321689/Test.java \
-  closed/compiler/6326935/Test.java \
-  closed/compiler/6367889/Test.java \
-  closed/compiler/6371167/Test.java \
-  closed/compiler/6389127/Test.java \
-  closed/compiler/6397650/Test.java \
-  closed/compiler/6414932/Test.java \
-  closed/compiler/6421619/Test_6421619.java \
-  closed/compiler/6427750/UnsafeVolatile.java \
-  closed/compiler/6431243/Test.java \
-  closed/compiler/6433572/TestSyncJSR.java \
-  closed/compiler/6433840/clinit.java \
-  closed/compiler/6457854/Test.java \
-  closed/compiler/6476804/Test.java \
-  closed/compiler/6512111/CorruptFinalLong.java \
-  closed/compiler/6551887/Test.java \
-  closed/compiler/6571539/Test.java \
-  closed/compiler/6587132/Test.java \
-  closed/compiler/6588045/Test.java \
-  closed/compiler/6588598/etype.java \
-  closed/compiler/6661918/Test6661918.java \
-  closed/compiler/6707044/Test.java \
-  closed/compiler/6730716/Test.java \
-  closed/compiler/6772368/Test6772368.sh \
-  closed/compiler/6897150/Test6897150.java \
-  closed/compiler/6931567/Test6931567.java \
-  closed/compiler/7196857/Test7196857.java \
-  closed/compiler/8009699/Test8009699.java \
-  closed/compiler/8009699/Test8009699B.java \
-  closed/compiler/8014811/Test8014811.java \
-  closed/compiler/8029507/InvokePrivate.java \
-  closed/compiler/callingConvention/Arg9Double.java \
-  closed/compiler/deoptimization/DeoptArithmetic.java \
-  closed/compiler/deoptimization/TestDoubleLocals.java \
-  closed/compiler/deoptimization/TestDoubleMerge.java
+  closed/compiler/c1/ \
+  closed/compiler/c2/ \
+  closed/compiler/codegen/ \
+  closed/compiler/escapeAnalysis/ \
+  closed/compiler/interpreter/ \
+  closed/compiler/jsr292/ \
+  closed/compiler/loopopts/ \
+  closed/compiler/oracle/ \
+  closed/compiler/runtime/ \
+  closed/compiler/symantec/ \
+  -closed/compiler/c1/4477197 \
+  -closed/compiler/c1/5040872 \
+  -closed/compiler/c1/6507107 \
+  -closed/compiler/c2/4344895 \
+  -closed/compiler/c2/4485006 \
+  -closed/compiler/c2/4523683 \
+  -closed/compiler/c2/4620290 \
+  -closed/compiler/c2/4998314 \
+  -closed/compiler/c2/6329104 \
+  -closed/compiler/c2/6434117 \
+  -closed/compiler/c2/6547163 \
+  -closed/compiler/c2/6563987 \
+  -closed/compiler/c2/6595044 \
+  -closed/compiler/codegen/6440479 \
+  -closed/compiler/codegen/6603011 \
+  -closed/compiler/interpreter/5034475 \
+  -closed/compiler/jsr292/LongLambdaFormDynamicStackDepth.java \
+  -closed/compiler/loopopts/4463485 \
+  -closed/compiler/loopopts/8021898
 
 hotspot_gc = \
   sanity/ExecuteInternalVMTests.java
@@ -609,4 +448,4 @@
 #
 not_needs_nashorn = \
   :jdk \
-  -:needs_nashorh
+  -:needs_nashorn

--- a/test/compiler/5057225/Test5057225.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. 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 5057225
- * @summary Remove useless I2L conversions
- *
- * @run main/othervm -Xcomp -XX:CompileOnly=Test5057225.doload Test5057225
- */
-
-import java.net.URLClassLoader;
-
-public class Test5057225 {
-    static byte[]  ba = new byte[]  { -1 };
-    static short[] sa = new short[] { -1 };
-    static int[]   ia = new int[]   { -1 };
-
-    static final long[] BYTE_MASKS = {
-         0x0FL,
-         0x7FL,  // 7-bit
-         0xFFL,
-    };
-
-    static final long[] SHORT_MASKS = {
-        0x000FL,
-        0x007FL,  // 7-bit
-        0x00FFL,
-        0x0FFFL,
-        0x3FFFL,  // 14-bit
-        0x7FFFL,  // 15-bit
-        0xFFFFL,
-    };
-
-    static final long[] INT_MASKS = {
-        0x0000000FL,
-        0x0000007FL,  // 7-bit
-        0x000000FFL,
-        0x00000FFFL,
-        0x00003FFFL,  // 14-bit
-        0x00007FFFL,  // 15-bit
-        0x0000FFFFL,
-        0x00FFFFFFL,
-        0x7FFFFFFFL,  // 31-bit
-        0xFFFFFFFFL,
-    };
-
-    public static void main(String[] args) throws Exception {
-        for (int i = 0; i < BYTE_MASKS.length; i++) {
-            System.setProperty("value", "" + BYTE_MASKS[i]);
-            loadAndRunClass("Test5057225$loadUB2L");
-        }
-
-        for (int i = 0; i < SHORT_MASKS.length; i++) {
-            System.setProperty("value", "" + SHORT_MASKS[i]);
-            loadAndRunClass("Test5057225$loadUS2L");
-        }
-
-        for (int i = 0; i < INT_MASKS.length; i++) {
-            System.setProperty("value", "" + INT_MASKS[i]);
-            loadAndRunClass("Test5057225$loadUI2L");
-        }
-    }
-
-    static void check(long result, long expected) {
-        if (result != expected)
-            throw new InternalError(result + " != " + expected);
-    }
-
-    static void loadAndRunClass(String classname) throws Exception {
-        Class cl = Class.forName(classname);
-        URLClassLoader apploader = (URLClassLoader) cl.getClassLoader();
-        ClassLoader loader = new URLClassLoader(apploader.getURLs(), apploader.getParent());
-        Class c = loader.loadClass(classname);
-        Runnable r = (Runnable) c.newInstance();
-        r.run();
-    }
-
-    public static class loadUB2L implements Runnable {
-        static final long MASK;
-        static {
-            long value = 0;
-            try {
-                value = Long.decode(System.getProperty("value"));
-            } catch (Throwable e) {}
-            MASK = value;
-        }
-
-        public void run() { check(doload(ba), MASK); }
-        static long doload(byte[] ba) { return ba[0] & MASK; }
-    }
-
-    public static class loadUS2L implements Runnable {
-        static final long MASK;
-        static {
-            long value = 0;
-            try {
-                value = Long.decode(System.getProperty("value"));
-            } catch (Throwable e) {}
-            MASK = value;
-        }
-
-        public void run() { check(doload(sa), MASK); }
-        static long doload(short[] sa) { return sa[0] & MASK; }
-    }
-
-    public static class loadUI2L implements Runnable {
-        static final long MASK;
-        static {
-            long value = 0;
-            try {
-                value = Long.decode(System.getProperty("value"));
-            } catch (Throwable e) {}
-            MASK = value;
-        }
-
-        public void run() { check(doload(ia), MASK); }
-        static long doload(int[] ia) { return ia[0] & MASK; }
-    }
-}

--- a/test/compiler/5091921/Test5091921.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,309 +0,0 @@
-/*
- * Copyright (c) 2011 Hewlett-Packard Company. 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 5091921
- * @summary Sign flip issues in loop optimizer
- *
- * @run main/othervm -Xcomp -XX:CompileOnly=Test5091921 -XX:MaxInlineSize=1 Test5091921
- */
-
-public class Test5091921 {
-  private static int result = 0;
-
-
-  /* Test for the bug of transforming indx >= MININT to indx > MININT-1 */
-  public static int test_ge1(int limit) {
-    int indx;
-    int sum = 0;
-    for (indx = 500; indx >= limit; indx -= 2) {
-      sum += 2000 / indx;
-      result = sum;
-    }
-    return sum;
-  }
-
-  /* Test for the bug of transforming indx <= MAXINT to indx < MAXINT+1 */
-  public static int test_le1(int limit) {
-    int indx;
-    int sum = 0;
-    for (indx = -500; indx <= limit; indx += 2)
-    {
-      sum += 3000 / indx;
-      result = sum;
-    }
-    return sum;
-  }
-
-  /* Run with -Xcomp -XX:CompileOnly=wrap1.test1 -XX:MaxInlineSize=1 */
-  /* limit reset to ((limit-init+stride-1)/stride)*stride+init */
-  /* Calculation may overflow */
-  public static volatile int c = 1;
-  public static int test_wrap1(int limit)
-  {
-    int indx;
-    int sum = 0;
-    for (indx = 0xffffffff; indx < limit; indx += 0x20000000)
-    {
-      sum += c;
-    }
-    return sum;
-  }
-
-  /* Test for range check elimination with bit flip issue for
-     scale*i+offset<limit where offset is not 0 */
-  static int[] box5 = {1,2,3,4,5,6,7,8,9};
-  public static int test_rce5(int[] b, int limit)
-  {
-    int indx;
-    int sum = b[1];
-    result = sum;
-    for (indx = 0x80000000; indx < limit; ++indx)
-    {
-      if (indx > 0x80000000)
-      {
-        // this test is not issued in pre-loop but issued in main loop
-        // trick rce into thinking expression is false when indx >= 0
-        // in fact it is false when indx==0x80000001
-        if (indx - 9 < -9)
-        {
-          sum += indx;
-          result = sum;
-          sum ^= b[indx & 7];
-          result = sum;
-        }
-        else
-          break;
-      }
-      else
-      {
-        sum += b[indx & 3];
-        result = sum;
-      }
-    }
-    return sum;
-  }
-
-  /* Test for range check elimination with bit flip issue for
-     scale*i<limit where scale > 1 */
-  static int[] box6 = {1,2,3,4,5,6,7,8,9};
-  public static int test_rce6(int[] b, int limit)
-  {
-    int indx;
-    int sum = b[1];
-    result = sum;
-    for (indx = 0x80000000; indx < limit; ++indx)
-    {
-      if (indx > 0x80000000)
-      {
-        // harmless rce target
-        if (indx < 0)
-        {
-          sum += result;
-          result = sum;
-        }
-        else
-          break;
-        // this test is not issued in pre-loop but issued in main loop
-        // trick rce into thinking expression is false when indx >= 0
-        // in fact it is false when indx==0x80000001
-        // In compilers that transform mulI to shiftI may mask this issue.
-        if (indx * 28 + 1 < 0)
-        {
-          sum += indx;
-          result = sum;
-          sum ^= b[indx & 7];
-          result = sum;
-        }
-        else
-          break;
-      }
-      else
-      {
-        sum += b[indx & 3];
-        result = sum;
-      }
-    }
-    return sum;
-  }
-
-  /* Test for range check elimination with i <= limit */
-  static int[] box7 = {1,2,3,4,5,6,7,8,9,0x7fffffff};
-  public static int test_rce7(int[] b)
-  {
-    int indx;
-    int max = b[9];
-    int sum = b[7];
-    result = sum;
-    for (indx = 0; indx < b.length; ++indx)
-    {
-      if (indx <= max)
-      {
-        sum += (indx ^ 15) + ((result != 0) ? 0 : sum);
-        result = sum;
-      }
-      else
-        throw new RuntimeException();
-    }
-    for (indx = -7; indx < b.length; ++indx)
-    {
-      if (indx <= 9)
-      {
-        sum += (sum ^ 15) + ((result != 0) ? 0 : sum);
-        result = sum;
-      }
-      else
-        throw new RuntimeException();
-    }
-    return sum;
-  }
-
-  /* Test for range check elimination with i >= limit */
-  static int[] box8 = {-1,0,1,2,3,4,5,6,7,8,0x80000000};
-  public static int test_rce8(int[] b)
-  {
-    int indx;
-    int sum = b[5];
-    int min = b[10];
-    result = sum;
-    for (indx = b.length-1; indx >= 0; --indx)
-    {
-      if (indx >= min)
-      {
-        sum += (sum ^ 9) + ((result != 0) ? 0 :sum);
-        result = sum;
-      }
-      else
-        throw new RuntimeException();
-    }
-    return sum;
-  }
-
-  public static void main(String[] args)
-  {
-    result=1;
-    int r = 0;
-    try {
-      r = test_ge1(0x80000000);
-      System.out.println(result);
-      System.out.println("test_ge1 FAILED");
-      System.exit(1);
-    }
-    catch (ArithmeticException e1) {
-      System.out.println("test_ge1: Expected exception caught");
-      if (result != 5986) {
-        System.out.println(result);
-        System.out.println("test_ge1 FAILED");
-        System.exit(97);
-      }
-    }
-    System.out.println("test_ge1 WORKED");
-
-    result=0;
-    try
-    {
-      r = test_le1(0x7fffffff);
-      System.out.println(result);
-      System.out.println("test_le1 FAILED");
-      System.exit(1);
-    }
-    catch (ArithmeticException e1)
-    {
-      System.out.println("test_le1: Expected exception caught");
-      if (result != -9039)
-      {
-        System.out.println(result);
-        System.out.println("test_le1 FAILED");
-        System.exit(97);
-      }
-    }
-    System.out.println("test_le1 WORKED");
-
-    result=0;
-    r = test_wrap1(0x7fffffff);
-    if (r != 4)
-    {
-      System.out.println(result);
-      System.out.println("test_wrap1 FAILED");
-      System.exit(97);
-    }
-    else
-    {
-      System.out.println("test_wrap1 WORKED");
-    }
-
-    result=0;
-    r = test_rce5(box5,0x80000100);
-    if (result != 3)
-    {
-      System.out.println(result);
-      System.out.println("test_rce5 FAILED");
-      System.exit(97);
-    }
-    else
-    {
-      System.out.println("test_rce5 WORKED");
-    }
-
-    result=0;
-    r = test_rce6(box6,0x80000100);
-    if (result != 6)
-    {
-      System.out.println(result);
-      System.out.println("test_rce6 FAILED");
-      System.exit(97);
-    }
-    else
-    {
-      System.out.println("test_rce6 WORKED");
-    }
-
-    result=0;
-    r = test_rce7(box7);
-    if (result != 14680079)
-    {
-      System.out.println(result);
-      System.out.println("test_rce7 FAILED");
-      System.exit(97);
-    }
-    else
-    {
-      System.out.println("test_rce7 WORKED");
-    }
-
-    result=0;
-    r = test_rce8(box8);
-    if (result != 16393)
-    {
-      System.out.println(result);
-      System.out.println("test_rce8 FAILED");
-      System.exit(97);
-    }
-    else
-    {
-      System.out.println("test_rce8 WORKED");
-    }
-  }
-}

--- a/test/compiler/5091921/Test6186134.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. 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 6186134
- * @summary Server virtual machine produces/exeutes incorrect code.
- *
- * @run main Test6186134 100000
- */
-import java.util.ArrayList;
-
-public class Test6186134 {
-
-  int num = 0;
-
-  public Test6186134(int n) {
-    num = n;
-  }
-
-  public boolean more() {
-    return num-- > 0;
-  }
-
-  public ArrayList test1() {
-    ArrayList res = new ArrayList();
-    int maxResults = Integer.MAX_VALUE;
-    int n = 0;
-    boolean more = more();
-    while ((n++ < maxResults) && more) {
-      res.add(new Object());
-      more = more();
-    }
-    return res;
-  }
-
-  public static void main(String[] pars) {
-    int n = Integer.parseInt(pars[0]);
-    for (int i=0; i<n; i++) {
-      Test6186134 t = new Test6186134(10);
-      int size = t.test1().size();
-      if (size != 10) {
-        System.out.println("wrong size: " + size +", should be 10");
-        System.exit(97);
-      }
-    }
-    System.out.println("Passed");
-  }
-}
-

--- a/test/compiler/5091921/Test6196102.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. 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 6196102
- * @summary Integer seems to be greater than Integer.MAX_VALUE
- *
- * @run main Test6196102
- */
-
-public class Test6196102 {
-    static public void main(String[] args) {
-        int i1 = 0;
-        int i2 = Integer.MAX_VALUE;
-
-        while (i1 >= 0) {
-            i1++;
-            if (i1 > i2) {
-                System.out.println("E R R O R: " + i1);
-                System.exit(97);
-            }
-        }
-    }
-}
-

--- a/test/compiler/5091921/Test6357214.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. 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 6357214
- * @summary Hotspot server compiler gets integer comparison wrong
- *
- * @run main/othervm/timeout=60 -DshowAll=ffo -DeventID=444 Test6357214
- */
-
-// The test hangs after few iterations before the fix. So it fails if timeout.
-class MyResult {
-        public boolean next() {
-                return true;
-        }
-
-        public String getString(String in) {
-                if (in.equals("id"))
-                        return "idFoo";
-                if (in.equals("contentKey"))
-                        return "ckFoo";
-                return "Foo";
-        }
-
-        public int getInt(String in) {
-                if (in.equals("processingComplete"))
-                        return 0;
-                return 1;
-        }
-
-        public byte[] getBytes(String in) {
-                byte[] arr = null;
-                if (in.equals("content")) {
-                        arr = new byte[65536];
-                        byte j = 32;
-                        for (int i=0; i<65536; i++) {
-                                arr[i] = j;
-                                if (++j == 127)
-                                        j=32;
-                        }
-                }
-                return arr;
-        }
-}
-
-public class Test6357214 {
-        public static volatile boolean bollocks = true;
-    public String create(String context) throws Exception {
-
-        //
-        // Extract HTTP parameters
-        //
-
-        boolean showAll = System.getProperty("showAll") != null;
-          String eventID = System.getProperty("eventID");
-          String eventContentKey = System.getProperty("cKey");
-        //
-        // Build ContentStaging query based on eventID or eventContentKey
-        //
-
-        String sql = "select id, processingComplete, contentKey, content "
-                   + "from   ContentStaging cs, ContentStagingKey csk "
-                   + "where  cs.eventContentKey = csk.eventContentKey ";
-
-        if (eventID != null) {
-            sql += "and id = " + eventID;
-        }
-        else if (eventContentKey != null) {
-            sql += "and cs.eventContentKey = '"
-                +  eventContentKey
-                +  "' having id = max(id)";
-        }
-        else {
-            throw new Exception("Need eventID or eventContentKey");
-        }
-
-        //
-        // This factory builds a static panel, there is no JSP
-        //
-
-        StringBuffer html = new StringBuffer();
-
-        try {
-
-                MyResult result = new MyResult();
-            if (result.next()) {
-
-                eventID = result.getString("id");
-                int processingComplete = result.getInt("processingComplete");
-                String contentKey = result.getString("contentKey");
-                byte[] bytes = result.getBytes("content");
-
-                //
-                // Print content status and associated controls
-                //
-
-                html.append("<br/><font class=\"small\">");
-                html.append("Status: ");
-                switch (processingComplete) {
-                    case  0 :
-                    case  1 : html.append("PENDING"); break;
-                    case  2 : html.append(contentKey); break;
-                    case  3 : html.append(eventID); break;
-                    default : html.append("UNKNONW");
-                }
-                html.append("</font><br/>");
-
-                //
-                // Print at most 20Kb of content unless "showAll" is set
-                //
-
-                int limit = showAll ? Integer.MAX_VALUE : 1024 * 20;
-                System.out.println(limit);
-                html.append("<pre>");
-                for (int i = 0; bytes != null && i < bytes.length; i++) {
-                    char c = (char) bytes[i];
-                    switch (c) {
-                        case '<' : html.append("&lt;");  break;
-                        case '>' : html.append("&gt;");  break;
-                        case '&' : html.append("&amp;"); break;
-                        default  : html.append(c);
-                    }
-
-                    if (i > limit) {
-                        while (bollocks);
-                        // System.out.println("i is " + i);
-                        // System.out.println("limit is " + limit);
-                        html.append("...\n</pre>");
-                        html.append(eventID);
-                        html.append("<pre>");
-                        break;
-                    }
-                }
-                html.append("</pre>");
-            }
-        }
-        catch (Exception exception) {
-            throw exception;
-        }
-        finally {
-            html.append("Oof!!");
-        }
-        String ret = html.toString();
-        System.out.println("Returning string length = "+ ret.length());
-        return ret;
-    }
-
-    public static void main(String[] args) throws Exception {
-                int length=0;
-
-                for (int i = 0; i < 100; i++) {
-                        length = new Test6357214().create("boo").length();
-                        System.out.println(length);
-                }
-    }
-}
-

--- a/test/compiler/5091921/Test6559156.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. 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 6559156
- * @summary Server compiler generates bad code for "<= Integer.MAX_VALUE" expression
- *
- * @run main Test6559156
- */
-
-public class Test6559156 {
-
-    static final int N_TESTS = 1000000;
-
-    public static void main(String[] args) throws Exception {
-
-        /*
-         * If MAX_VALUE is changed to MAX_VALUE - 1 below, the test passes
-         * because (apparently) bad code is only generated when comparing
-         * <= MAX_VALUE in the doTest method.
-         */
-        Test6559156 test = new Test6559156();
-        for (int i = 0; i < N_TESTS; i += 1) {
-            test.doTest1(10, Integer.MAX_VALUE, i);
-            test.doTest2(10, Integer.MAX_VALUE, i);
-        }
-        System.out.println("No failure");
-    }
-
-    void doTest1(int expected, int max, int i) {
-        int counted;
-        for (counted = 0;
-             (counted <= max) && (counted < expected);
-             counted += 1) {
-        }
-        if (counted != expected) {
-            throw new RuntimeException("Failed test1 iteration=" + i +
-                                       " max=" + max +
-                                       " counted=" + counted +
-                                       " expected=" + expected);
-        }
-    }
-
-    void doTest2(int expected, int max, int i) {
-        int counted;
-        for (counted = 0;
-             // change test sequence.
-             (counted < expected) && (counted <= max);
-             counted += 1) {
-        }
-        if (counted != expected) {
-            throw new RuntimeException("Failed test1 iteration=" + i +
-                                       " max=" + max +
-                                       " counted=" + counted +
-                                       " expected=" + expected);
-        }
-    }
-}
-

--- a/test/compiler/5091921/Test6753639.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. 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 6753639
- * @summary Strange optimisation in for loop with cyclic integer condition
- *
- * @run main/othervm -Xbatch Test6753639
- */
-
-public class Test6753639 {
-    public static void main(String[] args) throws InterruptedException {
-        int END = Integer.MAX_VALUE;
-        int count = 0;
-        for(int i = Integer.MAX_VALUE - 5; i <= END; i++) {
-            count++;
-            if (count > 100000) {
-                System.out.println("Passed");
-                System.exit(95);
-            }
-        }
-        System.out.println("broken " + count);
-        System.out.println("FAILED");
-        System.exit(97);
-    }
-}
-
-

--- a/test/compiler/5091921/Test6850611.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. 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 6850611
- * @summary int / long arithmetic seems to be broken in 1.6.0_14 HotSpot Server VM (Win XP)
- *
- * @run main/timeout=480 Test6850611
- */
-
-public class Test6850611 {
-
-    public static void main(String[] args) {
-        test();
-    }
-
-    private static void test() {
-        for (int j = 0; j < 5; ++j) {
-            long x = 0;
-            for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; ++i) {
-                x += i;
-            }
-            System.out.println("sum: " + x);
-            if (x != -4294967295l) {
-                System.out.println("FAILED");
-                System.exit(97);
-            }
-        }
-    }
-}
-

--- a/test/compiler/5091921/Test6890943.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. 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 6890943
- * @summary JVM mysteriously gives wrong result on 64-bit 1.6 VMs in hotspot mode.
- *
- * @run main/othervm/timeout=240 Test6890943
- */
-
-import java.io.*;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Scanner;
-
-public class Test6890943 {
-    public static final boolean AIR = true, ROCK = false;
-    private static final Path PATH = Paths.get(System.getProperty("test.src", "."));
-    private static final Path INPUT_FILE = PATH.resolve("input6890943.txt");
-    private static final Path GOLDEN_FILE = PATH.resolve("output6890943.txt");
-
-    public static void main(String[] args) {
-        new Test6890943().go();
-    }
-
-    int r, c, f, t;
-    boolean[][] grid;
-
-    public void go() {
-        Scanner in, golden;
-        try {
-            in = new Scanner(new FileInputStream(INPUT_FILE.toFile()));
-            golden = new Scanner(new FileInputStream(GOLDEN_FILE.toFile()));
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException("TEST failure: can't open test file", e);
-        }
-        in.useDelimiter("\\s+");
-        golden.useDelimiter("\\s+");
-
-        int T = in.nextInt();
-        for (t = 0; t < T; t++) {
-            r = in.nextInt();
-            c = in.nextInt();
-            f = in.nextInt();
-            grid = new boolean[r][c];
-            for (int x = 0; x < r; x++) {
-                String line = in.next();
-                for (int y = 0; y < c; y++) {
-                    grid[x][y] = line.charAt(y) == '.';
-                }
-            }
-            int digs = solve();
-            String result = "Case #" + (t + 1) + ": " + (digs == -1 ? "No" : "Yes " + digs);
-            System.out.println(result);
-            // Compare with golden string from the file
-            String goldenStr = golden.nextLine();
-            if (!result.equals(goldenStr)) {
-                System.err.println("FAIL: strings are not equal\n"
-                        + "-- Result: " + result + "\n"
-                        + "-- Golden: " + goldenStr);
-                throw new RuntimeException("FAIL: Result string is not equal to the golden");
-            }
-        }
-    }
-
-    Map<Integer, Integer> M = new HashMap<Integer, Integer>();
-
-    private int solve() {
-        M = new HashMap<Integer, Integer>();
-        M.put(calcWalkingRange(0, 0), 0);
-        for (int digDown = 0; digDown < r; digDown++) {
-            Map<Integer, Integer> tries = new HashMap<Integer, Integer>();
-            for (Map.Entry<Integer, Integer> m : M.entrySet()) {
-                int q = m.getKey();
-                if (depth(q) != (digDown)) continue;
-                if (stuck(q)) continue;
-                tries.put(q, m.getValue());
-            }
-
-            for (Map.Entry<Integer, Integer> m : tries.entrySet()) {
-                int q = m.getKey();
-                int fallLeftDelta = 0, fallRightDelta = 0;
-                //fall left
-                int fallLeft = fall(digDown, start(q));
-                if (fallLeft > 0) {
-                    fallLeftDelta = 1;
-                    if (fallLeft <= f) addToM(calcWalkingRange(digDown + fallLeft, start(q)), m.getValue());
-                }
-
-                //fall right
-                int fallRight = fall(digDown, end(q));
-                if (fallRight > 0) {
-                    fallRightDelta = 1;
-
-                    if (fallRight <= f) addToM(calcWalkingRange(digDown + fallRight, end(q)), m.getValue());
-                }
-
-                for (int p = start(q) + fallLeftDelta; p <= end(q) - fallRightDelta; p++) {
-                    //goLeft
-                    for (int digSpot = p; digSpot > start(q) + fallLeftDelta; digSpot--) {
-                        int fallDown = 1 + fall(digDown + 1, digSpot);
-                        if (fallDown <= f) {
-                            if (fallDown == 1) {
-                                addToM(calcWalkingRange(digDown + 1, digSpot, digSpot, p),
-                                        m.getValue() + Math.abs(digSpot - p) + 1);
-                            } else {
-                                addToM(calcWalkingRange(digDown + fallDown, digSpot),
-                                        m.getValue() + Math.abs(digSpot - p) + 1);
-                            }
-                        }
-                    }
-
-                    //goRight
-                    for (int digSpot = p; digSpot < end(q) - fallRightDelta; digSpot++) {
-                        int fallDown = 1 + fall(digDown + 1, digSpot);
-                        if (fallDown <= f) {
-                            if (fallDown == 1) {
-                                addToM(calcWalkingRange(digDown + 1, digSpot, p, digSpot),
-                                        m.getValue() + Math.abs(digSpot - p) + 1);
-                            } else {
-                                addToM(calcWalkingRange(digDown + fallDown, digSpot),
-                                        m.getValue() + Math.abs(digSpot - p) + 1);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        int result = Integer.MAX_VALUE;
-        for (Map.Entry<Integer, Integer> m : M.entrySet()) {
-            if (depth(m.getKey()) == r - 1) result = Math.min(m.getValue(), result);
-        }
-
-        if (result == Integer.MAX_VALUE) return -1;
-        return result;
-    }
-
-    private void addToM(int q, int i) {
-        Integer original = M.get(q);
-        if (original == null) M.put(q, i);
-        else M.put(q, Math.min(original, i));
-    }
-
-    private int fall(int row, int column) {
-        int res = 0;
-        for (int p = row + 1; p < r; p++) {
-            if (grid[p][column] == AIR) res++;
-            else break;
-        }
-        return res;
-    }
-
-    private boolean stuck(int q) {
-        return start(q) == end(q);
-    }
-
-    private int depth(int q) {
-        return q % 50;
-    }
-
-    private int start(int q) {
-        return q / (50 * 50);
-    }
-
-    private int end(int q) {
-        return (q / 50) % 50;
-    }
-
-    private int calcWalkingRange(int depth, int pos) {
-        return calcWalkingRange(depth, pos, Integer.MAX_VALUE, Integer.MIN_VALUE);
-    }
-
-    private int calcWalkingRange(int depth, int pos, int airOverrideStart, int airOverrideEnd) {
-        int left = pos, right = pos;
-        if (depth >= r) return (c - 1) * 50 + depth;
-
-        while (left > 0) {
-            if (grid[depth][left - 1] == ROCK && (left - 1 < airOverrideStart || left - 1 > airOverrideEnd)) break;
-            if (depth < r - 1 && grid[depth + 1][left - 1] == AIR) {
-                left--;
-                break;
-            }
-            left--;
-        }
-        while (right < c - 1) {
-            if (grid[depth][right + 1] == ROCK && (right + 1 < airOverrideStart || right + 1 > airOverrideEnd)) break;
-            if (depth < r - 1 && grid[depth + 1][right + 1] == AIR) {
-                right++;
-                break;
-            }
-            right++;
-        }
-
-        return left * 50 * 50 + right * 50 + depth;
-    }
-}

--- a/test/compiler/5091921/Test6897150.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. 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 6897150
- * @summary Hotspot optimises away a valid loop
- *
- * @run main Test6897150
- */
-
-// Should be compiled with javac from JDK1.3 to get bytecode which shows the problem.
-public class Test6897150 {
-    public static void main(String[] args) {
-        // This works
-        loopAndPrint(Integer.MAX_VALUE -1);
-        // This doesn't
-        loopAndPrint(Integer.MAX_VALUE);
-    }
-
-    static void verify(int max, int a) {
-        if ( a != (max - 1)) {
-            System.out.println("Expected: " + (max - 1));
-            System.out.println("Actual  : " + a);
-            System.exit(97);
-        }
-    }
-    static void loopAndPrint(int max) {
-        int a = -1;
-        int i = 1;
-        for (; i < max; i++) {
-            a = i;
-        }
-        verify(max, a);
-    }
-}
-

--- a/test/compiler/5091921/Test6905845.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. 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 6905845
- * @summary Server VM improperly optimizing away loop.
- *
- * @run main/timeout=480 Test6905845
- */
-
-public class Test6905845 {
-
-   public static void main(String[] args){
-      for (int asdf = 0; asdf < 5; asdf++){
-         //test block
-         {
-            StringBuilder strBuf1 = new StringBuilder(65);
-            long          start   = System.currentTimeMillis();
-            int           count   = 0;
-
-            for (int i = Integer.MIN_VALUE; i < (Integer.MAX_VALUE - 80); i += 79){
-               strBuf1.append(i);
-               count++;
-               strBuf1.delete(0, 65);
-            }
-
-            System.out.println(count);
-            if (count != 54366674) {
-              System.out.println("wrong count: " + count +", should be 54366674");
-              System.exit(97);
-            }
-         }
-         //test block
-         {
-            StringBuilder strBuf1 = new StringBuilder(65);
-            long          start   = System.currentTimeMillis();
-            int           count   = 0;
-
-            for (int i = Integer.MIN_VALUE; i < (Integer.MAX_VALUE - 80); i += 79){
-               strBuf1.append(i);
-               count++;
-               strBuf1.delete(0, 65);
-            }
-
-            System.out.println(count);
-            if (count != 54366674) {
-              System.out.println("wrong count: " + count +", should be 54366674");
-              System.exit(97);
-            }
-         }
-      }
-   }
-}
-

--- a/test/compiler/5091921/Test6931567.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. 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 6931567
- * @summary JIT Error (on class file compiled with eclipse) on JVM x64 (but not on x32!).
- *
- * @run main Test6931567
- */
-
-// Should be compiled with javac from JDK1.3 to get bytecode which shows the problem.
-public class Test6931567 {
-
-    public static void main(final String[] args) {
-        booleanInvert(Integer.MAX_VALUE);
-        booleanInvert(Integer.MAX_VALUE - 1);
-    }
-
-    private static void booleanInvert(final int max) {
-        boolean test1 = false;
-        boolean test2 = false;
-
-        for (int i = 0; i < max; i++) {
-            test1 = !test1;
-        }
-
-        for (int i = 0; i < max; i++) {
-            test2 ^= true;
-        }
-
-        if (test1 != test2) {
-            System.out.println("ERROR: Boolean invert\n\ttest1=" + test1
-                    + "\n\ttest2=" + test2);
-            System.exit(97);
-        } else {
-            System.out.println("Passed!");
-        }
-    }
-}
-

--- a/test/compiler/5091921/Test6935022.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. 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 6935022
- * @summary Server VM incorrectly breaks out of while loop
- *
- * @run main Test6935022
- */
-
-public class Test6935022 {
-    public static final void main(String[] args) throws Exception {
-        Test6935022 test = new Test6935022();
-
-        int cnt = 0;
-
-        while (cnt < 10000) {
-            try {
-                ++cnt;
-                if ((cnt&1023) == 0)
-                  System.out.println("Thread="+Thread.currentThread().getName() + " iteration: " + cnt);
-                test.loop(2147483647, (cnt&1023));
-            }
-
-            catch (Exception e) {
-                System.out.println("Caught on iteration " + cnt);
-                e.printStackTrace();
-                System.exit(97);
-            }
-        }
-    }
-
-    private void loop(int endingRow, int mask) throws Exception {
-        int rows = 1;
-        boolean next = true;
-
-        while(rows <= endingRow && next) {
-            rows++;
-            if (rows == mask)
-              System.out.println("Rows="+rows+", end="+endingRow+", next="+next);
-            next = next(rows);
-        }
-
-        if (next)
-            throw new Exception("Ended on rows(no rs): " + rows);
-    }
-
-    private boolean next(int rows) {
-        return rows < 12;
-    }
-}
-

--- a/test/compiler/5091921/Test6959129.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. 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 6959129
- * @summary COMPARISON WITH INTEGER.MAX_INT DOES NOT WORK CORRECTLY IN THE CLIENT VM.
- *
- * @run main/othervm -ea Test6959129
- */
-
-public class Test6959129 {
-
-  public static void main(String[] args) {
-    long start  = System.currentTimeMillis();
-    int min = Integer.MAX_VALUE-30000;
-    int max = Integer.MAX_VALUE;
-    long maxmoves = 0;
-    try {
-      maxmoves = maxMoves(min, max);
-    } catch (AssertionError e) {
-      System.out.println("Passed");
-      System.exit(95);
-    }
-    System.out.println("maxMove:" + maxmoves);
-    System.out.println("FAILED");
-    System.exit(97);
-  }
-  /**
-   * Imperative implementation that returns the length hailstone moves
-   * for a given number.
-   */
-  public static long hailstoneLengthImp(long n) {
-    long moves = 0;
-    while (n != 1) {
-      assert n > 1;
-      if (isEven(n)) {
-        n = n / 2;
-      } else {
-        n = 3 * n + 1;
-      }
-      ++moves;
-    }
-    return moves;
-  }
-
-  private static boolean isEven(long n) {
-    return n % 2 == 0;
-  }
-
-  /**
-   * Returns the maximum length of the hailstone sequence for numbers
-   * between min to max.
-   *
-   * For rec1 - Assume that min is bigger than max.
-   */
-  public static long maxMoves(int min, int max) {
-    long maxmoves = 0;
-    for (int n = min; n <= max; n++) {
-      if ((n & 1023) == 0) System.out.println(n);
-      long moves = hailstoneLengthImp(n);
-      if (moves > maxmoves) {
-        maxmoves = moves;
-      }
-    }
-    return maxmoves;
-  }
-}
-

--- a/test/compiler/5091921/Test6985295.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. 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 6985295
- * @summary JVM fails to evaluate condition randomly
- *
- * @run main/othervm -Xbatch Test6985295
- */
-
-public class Test6985295 {
-
-    public static void main(String[] args) {
-        int min = Integer.MAX_VALUE-50000;
-        int max = Integer.MAX_VALUE;
-        System.out.println("max = " + max);
-        long counter = 0;
-        int i;
-        for(i = min; i <= max; i++) {
-            counter++;
-            if (counter > 1000000) {
-              System.out.println("Passed");
-              System.exit(95);
-            }
-        }
-        System.out.println("iteration went " + counter + " times (" + i + ")");
-        System.out.println("FAILED");
-        System.exit(97);
-    }
-}
-

--- a/test/compiler/5091921/Test6992759.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. 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 6992759
- * @summary Bad code generated for integer <= comparison, fails for Integer.MAX_VALUE
- *
- * @run main/timeout=240 Test6992759
- */
-
-public class Test6992759 {
-
-    static final int N_TESTS = 1000000000;
-
-    public static void main(String[] args) throws Exception {
-
-        /*
-         * If MAX_VALUE is changed to MAX_VALUE - 1 below, the test passes
-         * because (apparently) bad code is only generated when comparing
-         * <= MAX_VALUE in the doTest method.
-         */
-        Test6992759 test = new Test6992759();
-        for (int i = 0; i < N_TESTS; i += 1) {
-            test.doTest(10, Integer.MAX_VALUE, i);
-            //test.doTest(10, Integer.MAX_VALUE - 1, i);
-        }
-        System.out.println("No failure");
-    }
-
-    void doTest(int expected, int max, int i) {
-        int counted;
-        for (counted = 0;
-             (counted <= max) && (counted < expected);
-             counted += 1) {
-        }
-        if (counted != expected) {
-            throw new RuntimeException("Failed test iteration=" + i +
-                                       " max=" + max +
-                                       " counted=" + counted +
-                                       " expected=" + expected);
-        }
-    }
-}
-

--- a/test/compiler/5091921/Test7005594.java	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. 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 7005594
- * @summary Array overflow not handled correctly with loop optimzations
- *
- * @run shell Test7005594.sh
- */
-
-public class Test7005594 {
-
-      static int test(byte a[]){
-          int result=0;
-          for( int i=0; i<a.length; i+=((0x7fffffff>>1)+1) ){
-              result += a[i];
-          }
-          return result;
-      }
-
-      public static void main(String [] args){
-          byte a[]=new byte[(0x7fffffff>>1)+2];
-          int result = 0;
-          try {
-              result = test(a);
-          } catch (ArrayIndexOutOfBoundsException e) {
-              e.printStackTrace(System.out);
-              System.out.println("Passed");
-              System.exit(95);
-          }
-          System.out.println(result);
-          System.out.println("FAILED");
-          System.exit(97);
-      }
-
-}
-

--- a/test/compiler/5091921/Test7005594.sh	Mon Nov 17 23:11:40 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-#!/bin/sh
-# 
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. 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.
-# 
-# 
-## some tests require path to find test source dir
-if [ "${TESTSRC}" = "" ]
-then
-  TESTSRC=${PWD}
-  echo "TESTSRC not set.  Using "${TESTSRC}" as default"
-fi
-echo "TESTSRC=${TESTSRC}"
-## Adding common setup Variables for running shell tests.
-. ${TESTSRC}/../../test_env.sh
-
-# Amount of physical memory in megabytes
-MEM=0
-if [ -f "/proc/meminfo" ]; then
-  # Linux, Windows/Cygwin
-  MEM=`cat /proc/meminfo |grep ^MemTotal: | awk '{print $2}'`
-  MEM="$(($MEM / 1024))"
-elif [ -x "/usr/sbin/prtconf" ]; then
-  # Solaris
-  MEM=`/usr/sbin/prtconf | grep "^Memory size" | awk '{print $3}'`
-elif [ -x "/usr/sbin/system_profiler" ]; then
-  # MacOS
-  MEMo=`/usr/sbin/system_profiler SPHardwareDataType | grep Memory:`
-  MEM=`echo "$MEMo" | awk '{print $2}'`
-  MEMu=`echo "$MEMo" | awk '{print $3}'`
-  case $MEMu in
-  GB)
-    MEM="$(($MEM * 1024))"
-    ;;
-  MB)
-    ;;
-  *)
-    echo "Unknown memory unit in system_profile output: $MEMu"
-    ;;
-  esac
-elif [ -n "$ROOTDIR" -a -x "$ROOTDIR/mksnt/sysinf" ]; then
-  # Windows/MKS
-  MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
-  MEM="$(($machine_memory / 1024))"
-else
-  echo "Unable to determine amount of physical memory on the machine"
-fi
-
-if [ $MEM -lt 2000 ]; then
-  echo "Test skipped due to low (or unknown) memory on the system: $MEM Mb"
-  exit 0
-fi
-
-echo "MEMORY=$MEM Mb"
-
-set -x
-
-cp ${TESTSRC}/Test7005594.java .
-cp ${TESTSRC}/Test7005594.sh .
-
-${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Test7005594.java
-
-${TESTJAVA}/bin/java ${TESTOPTS} -Xmx1600m -Xms1600m -XX:+IgnoreUnrecognizedVMOptions -XX:-ZapUnusedHeapArea -Xcomp -XX:CompileOnly=Test7005594.test Test7005594 > test.out 2>&1
-
-result=$?
-
-cat test.out
-
-if [ $result -eq 95 ]
-then
-  echo "Passed"
-  exit 0
-fi
-
-if [ $result -eq 97 ]
-then
-  echo "Failed"
-  exit 1
-fi
-
-# The test should pass when no enough space for object heap
-grep "Could not reserve enough space for .*object heap" test.out
-if [ $? = 0 ]
-then
-  echo "Passed"
-  exit 0
-else
-  echo "Failed"
-  exit 1
-fi