# HG changeset patch
# User Gilles Duboscq <gilles.m.duboscq@gmail.com>
# Date 1317914061 -7200
# Node ID f3e823ead645c93037ff39f538d4238b11f7e0e2
# Parent  cda0630a864095ea4b5520bf130d5607f18fcfa7# Parent  764daa888a1859ffd5d6930ac8156f69756036b0
Merge

diff -r 764daa888a18 -r f3e823ead645 runavrora.sh
--- a/runavrora.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runavrora.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 if [ -z "${DACAPO}" ]; then
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 runbatik.sh
--- a/runbatik.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runbatik.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 if [ -z "${DACAPO}" ]; then
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 runbootstrap.sh
--- a/runbootstrap.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runbootstrap.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,8 +7,4 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 ${JDK7}/bin/java -graal $* -version 
diff -r 764daa888a18 -r f3e823ead645 rundacapo.sh
--- a/rundacapo.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/rundacapo.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 if [ -z "${DACAPO}" ]; then
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 runeclipse.sh
--- a/runeclipse.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runeclipse.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a Maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a Maxine repository directory."
-  exit 1;
-fi
 if [ ! -f "${DACAPO}/dacapo-9.12-bach.jar" ]; then
   echo "DACAPO must point to a directory containing dacapo-9.12-bach.jar"
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 runexamples.sh
--- a/runexamples.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runexamples.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 if [ -z "${DACAPO}" ]; then
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 runexamplescompare.sh
--- a/runexamplescompare.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runexamplescompare.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 if [ -z "${DACAPO}" ]; then
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 runfilter.sh
--- a/runfilter.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runfilter.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 if [ $# -lt 1 ]; then
   echo "You must provide at least a filter option"
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 runfop.sh
--- a/runfop.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runfop.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 if [ -z "${DACAPO}" ]; then
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 runh2.sh
--- a/runh2.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runh2.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 if [ -z "${DACAPO}" ]; then
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 runjython.sh
--- a/runjython.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runjython.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 if [ -z "${DACAPO}" ]; then
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 runlusearch.sh
--- a/runlusearch.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runlusearch.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 if [ -z "${DACAPO}" ]; then
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 runpmd.sh
--- a/runpmd.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runpmd.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 if [ -z "${DACAPO}" ]; then
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 runscimark.sh
--- a/runscimark.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runscimark.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 if [ -z "${SCIMARK}" ]; then
   echo "SCIMARK is not defined. It must point to a directory with the SciMark benchmark jar."
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 runtests.sh
--- a/runtests.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runtests.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,9 +7,5 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 TESTDIR=${MAXINE}/com.oracle.max.vm/test
 ${JDK7}/bin/java -graal -ea -esa -Xcomp -XX:+PrintCompilation -XX:CompileOnly=jtt $@ -Xbootclasspath/p:"${MAXINE}/com.oracle.max.vm/bin" -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $@ test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${TESTDIR}/jtt/bytecode ${TESTDIR}/jtt/except ${TESTDIR}/jtt/jdk ${TESTDIR}/jtt/hotpath ${TESTDIR}/jtt/jdk ${TESTDIR}/jtt/lang ${TESTDIR}/jtt/loop ${TESTDIR}/jtt/micro ${TESTDIR}/jtt/optimize ${TESTDIR}/jtt/reflect ${TESTDIR}/jtt/threads ${TESTDIR}/jtt/hotspot
diff -r 764daa888a18 -r f3e823ead645 runtradebeans.sh
--- a/runtradebeans.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runtradebeans.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 if [ -z "${DACAPO}" ]; then
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 runxalan.sh
--- a/runxalan.sh	Mon Oct 03 23:37:10 2011 +0200
+++ b/runxalan.sh	Thu Oct 06 17:14:21 2011 +0200
@@ -7,10 +7,6 @@
   echo "MAXINE is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-if [ -z "${GRAAL}" ]; then
-  echo "GRAAL is not defined. It must point to a maxine repository directory."
-  exit 1;
-fi
 if [ -z "${DACAPO}" ]; then
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
diff -r 764daa888a18 -r f3e823ead645 src/share/vm/graal/graalVMEntries.cpp
--- a/src/share/vm/graal/graalVMEntries.cpp	Mon Oct 03 23:37:10 2011 +0200
+++ b/src/share/vm/graal/graalVMEntries.cpp	Thu Oct 06 17:14:21 2011 +0200
@@ -979,8 +979,10 @@
   if (CURRENT_ENV == NULL) {
     Arena arena;
     ciEnv env(&arena);
+    ResourceMark rm;
     CodeInstaller installer(JNIHandles::resolve(targetMethod));
   } else {
+    ResourceMark rm;
     CodeInstaller installer(JNIHandles::resolve(targetMethod));
   }
 }
@@ -992,8 +994,10 @@
   if (CURRENT_ENV == NULL) {
     Arena arena;
     ciEnv env(&arena);
+    ResourceMark rm;
     CodeInstaller installer(JNIHandles::resolve(targetMethod), id);
   } else {
+    ResourceMark rm;
     CodeInstaller installer(JNIHandles::resolve(targetMethod), id);
   }
   return id;