diff src/share/vm/c1/c1_Runtime1.cpp @ 4559:723df37192d6

Make it possible again to build a real client libjvm, drop the UseGraal flag. Use the --vm option instead of a special -vm option in the bench command
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 10 Feb 2012 17:04:03 +0100
parents 04b9a2566eec
children 8021e46f4a99
line wrap: on
line diff
--- a/src/share/vm/c1/c1_Runtime1.cpp	Fri Feb 10 02:22:23 2012 +0100
+++ b/src/share/vm/c1/c1_Runtime1.cpp	Fri Feb 10 17:04:03 2012 +0100
@@ -462,9 +462,11 @@
   thread->set_is_method_handle_return(false);
 
   Handle exception(thread, ex);
-  if (UseGraal && exception.is_null()) {
+#ifdef GRAAL
+  if (exception.is_null()) {
     exception = Exceptions::new_exception(thread, vmSymbols::java_lang_NullPointerException(), NULL);
   }
+#endif
   nm = CodeCache::find_nmethod(pc);
   assert(nm != NULL, "this is not an nmethod");
   // Adjust the pc as needed/