Mercurial > hg > truffle

diff src/share/vm/c1x/c1x_Compiler.cpp @ 2674:6ab73784566a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* BlockBegin.predecessors changed to List<BlockEnd> * Node: add input/successor with given back edge index, allows for explicit ordering of predecessors/usages * Graphviz: PDF output, option to omit FrameStates * runscimark.sh: forward additional options to JVM
author Lukas Stadler <lukas.stadler@jku.at>
date Fri, 13 May 2011 15:18:41 +0200
parents d7c0775d7e72
children d90bf514d647
line wrap: on
line diff
--- a/src/share/vm/c1x/c1x_Compiler.cpp	Fri May 13 11:19:25 2011 +0200
+++ b/src/share/vm/c1x/c1x_Compiler.cpp	Fri May 13 15:18:41 2011 +0200
@@ -53,7 +53,8 @@
   JNIEnv *env = ((JavaThread *) Thread::current())->jni_environment();
   jclass klass = env->FindClass("com/oracle/graal/runtime/VMEntriesNative");
   if (klass == NULL) {
-    fatal("c1x VMEntries class not found");
+    tty->print_cr("c1x VMEntries class not found");
+    vm_abort(false);
   }
   env->RegisterNatives(klass, VMEntries_methods, VMEntries_methods_count());
 
@@ -72,7 +73,10 @@
       const char* arg = Arguments::c1x_args_array()[i];
       Handle option = java_lang_String::create_from_str(arg, THREAD);
       jboolean result = VMExits::setOption(option);
-      if (!result) fatal("Invalid option for C1X!");
+      if (!result) {
+        tty->print_cr("Invalid option for C1X!");
+        vm_abort(false);
+      }
     }
 
     VMExits::initializeCompiler();