Mercurial > hg > graal-jvmci-8

diff src/share/vm/runtime/javaCalls.cpp @ 22298:c28cb37b2e1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename JVMCI to INCLUDE_JVMCI.
author twisti
date Wed, 22 Jul 2015 08:56:03 -0700
parents 0e095e2c24e2
children 4a532b03e2cd
line wrap: on
line diff
--- a/src/share/vm/runtime/javaCalls.cpp	Wed Jul 22 15:50:08 2015 +0200
+++ b/src/share/vm/runtime/javaCalls.cpp	Wed Jul 22 08:56:03 2015 -0700
@@ -40,7 +40,7 @@
 #include "runtime/signature.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
-#ifdef JVMCI
+#if INCLUDE_JVMCI
 #include "jvmci/jvmciJavaAccess.hpp"
 #include "jvmci/jvmciRuntime.hpp"
 #endif
@@ -343,7 +343,7 @@
 
   CHECK_UNHANDLED_OOPS_ONLY(thread->clear_unhandled_oops();)
 
-#ifdef JVMCI
+#if INCLUDE_JVMCI
   nmethod* nm = args->alternative_target();
   if (nm == NULL) {
 #endif
@@ -353,7 +353,7 @@
     args->verify(method, result->get_type(), thread);
   }
   else debug_only(args->verify(method, result->get_type(), thread));
-#ifdef JVMCI
+#if INCLUDE_JVMCI
   }
 #else
 
@@ -418,7 +418,7 @@
     os::bang_stack_shadow_pages();
   }
 
-#ifdef JVMCI
+#if INCLUDE_JVMCI
   if (nm != NULL) {
     if (nm->is_alive()) {
       ((JavaThread*) THREAD)->set_jvmci_alternate_call_target(nm->verified_entry_point());