Mercurial > hg > graal-compiler

diff src/share/vm/code/nmethod.cpp @ 4559:723df37192d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 125678ef7587
children ef00461e29af
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.cpp	Fri Feb 10 02:22:23 2012 +0100
+++ b/src/share/vm/code/nmethod.cpp	Fri Feb 10 17:04:03 2012 +0100
@@ -839,7 +839,7 @@
     // Exception handler and deopt handler are in the stub section
     assert(offsets->value(CodeOffsets::Exceptions) != -1, "must be set");
     assert(offsets->value(CodeOffsets::Deopt     ) != -1, "must be set");
-    if (UseGraal) {
+#ifdef GRAAL
       // graal produces no (!) stub section
       _exception_offset        = code_offset()          + offsets->value(CodeOffsets::Exceptions);
       _deoptimize_offset       = code_offset()          + offsets->value(CodeOffsets::Deopt);
@@ -848,7 +848,7 @@
       } else {
         _deoptimize_mh_offset  = -1;
       }
-    } else {
+#else
       _exception_offset        = _stub_offset          + offsets->value(CodeOffsets::Exceptions);
       _deoptimize_offset       = _stub_offset          + offsets->value(CodeOffsets::Deopt);
       if (offsets->value(CodeOffsets::DeoptMH) != -1) {
@@ -856,7 +856,7 @@
       } else {
         _deoptimize_mh_offset  = -1;
       }
-    }
+#endif
     if (offsets->value(CodeOffsets::UnwindHandler) != -1) {
       _unwind_handler_offset = code_offset()         + offsets->value(CodeOffsets::UnwindHandler);
     } else {
@@ -2355,7 +2355,9 @@
         // information in a table.
         break;
     }
-    assert(UseGraal || stub == NULL || stub_contains(stub), "static call stub outside stub section");
+#ifndef GRAAL
+    assert(stub == NULL || stub_contains(stub), "static call stub outside stub section");
+#endif
   }
 }