# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1322844414 -3600
# Node ID 54d4c210a34e83b3aee3204fa218ac2c82bdffc4
# Parent  0ac36a6d5ab09f651957d854ddb9d512a8483822
Remove recordBailout method. Remove GraalBailoutIsFatal flag.

diff -r 0ac36a6d5ab0 -r 54d4c210a34e runjython.sh
--- a/runjython.sh	Fri Dec 02 16:59:53 2011 +0100
+++ b/runjython.sh	Fri Dec 02 17:46:54 2011 +0100
@@ -11,6 +11,4 @@
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
 fi
-COMMAND="${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 10 jython"
-echo $COMMAND
-$COMMAND
+${JDK7}/bin/java -graal -Xms1g -Xmx2g -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal $* Harness --preserve -n 10 jython 
diff -r 0ac36a6d5ab0 -r 54d4c210a34e src/share/vm/c1/c1_globals.hpp
--- a/src/share/vm/c1/c1_globals.hpp	Fri Dec 02 16:59:53 2011 +0100
+++ b/src/share/vm/c1/c1_globals.hpp	Fri Dec 02 17:46:54 2011 +0100
@@ -57,8 +57,6 @@
           "Use graal instead of C1")                                        \
   product(bool, DebugGraal, true,                                           \
           "Enable JVMTI for the compiler thread")                           \
-  product(bool, GraalBailoutIsFatal, false,                                 \
-          "Abort the VM on graal bailout")                                  \
   product(bool, BootstrapGraal, true,                                       \
           "Bootstrap graal before running Java main method")                \
   product(intx, TraceGraal, 0,                                              \
diff -r 0ac36a6d5ab0 -r 54d4c210a34e src/share/vm/graal/graalVMEntries.cpp
--- a/src/share/vm/graal/graalVMEntries.cpp	Fri Dec 02 16:59:53 2011 +0100
+++ b/src/share/vm/graal/graalVMEntries.cpp	Fri Dec 02 17:46:54 2011 +0100
@@ -974,17 +974,6 @@
   return id;
 }
 
-// public void recordBailout(String reason);
-JNIEXPORT void JNICALL Java_com_oracle_graal_hotspot_VMEntries_recordBailout(JNIEnv *jniEnv, jobject, jobject message) {
-  if (GraalBailoutIsFatal) {
-    Handle msg = JNIHandles::resolve(message);
-    if (!msg.is_null()) {
-      java_lang_String::print(msg, tty);
-    }
-    vm_abort(false);
-  }
-}
-
 // public void notifyJavaQueue();
 JNIEXPORT void JNICALL Java_com_oracle_graal_hotspot_VMEntries_notifyJavaQueue(JNIEnv *jniEnv, jobject) {
   CompileBroker::notify_java_queue();
@@ -1052,7 +1041,6 @@
   {CC"getConfiguration",                  CC"()"CONFIG,                               FN_PTR(Java_com_oracle_graal_hotspot_VMEntries_getConfiguration)},
   {CC"installMethod",                     CC"("TARGET_METHOD"Z)"HS_COMP_METHOD,       FN_PTR(Java_com_oracle_graal_hotspot_VMEntries_installMethod)},
   {CC"installStub",                       CC"("TARGET_METHOD")"PROXY,                 FN_PTR(Java_com_oracle_graal_hotspot_VMEntries_installStub)},
-  {CC"recordBailout",                     CC"("STRING")V",                            FN_PTR(Java_com_oracle_graal_hotspot_VMEntries_recordBailout)},
   {CC"notifyJavaQueue",                   CC"()V",                                    FN_PTR(Java_com_oracle_graal_hotspot_VMEntries_notifyJavaQueue)}
 };