diff src/share/vm/compiler/oopMap.cpp @ 14124:7ad529321294

make: remove GRAALVM and introduce COMPILERGRAAL. fix client hosted-mode
author Bernhard Urban <bernhard.urban@jku.at>
date Mon, 10 Mar 2014 16:26:10 +0100
parents ce5e6f9075b6
children 82ff6c8c8f6e
line wrap: on
line diff
--- a/src/share/vm/compiler/oopMap.cpp	Mon Mar 10 16:20:45 2014 +0100
+++ b/src/share/vm/compiler/oopMap.cpp	Mon Mar 10 16:26:10 2014 +0100
@@ -319,7 +319,7 @@
 static void add_derived_oop(oop* base, oop* derived) {
 #ifndef TIERED
   COMPILER1_PRESENT(ShouldNotReachHere();)
-  GRAALVM_ONLY(ShouldNotReachHere();)
+  COMPILERGRAAL_PRESENT(ShouldNotReachHere();)
 #endif // TIERED
 #ifdef COMPILER2
   DerivedPointerTable::add(derived, base);
@@ -381,7 +381,7 @@
     if (!oms.is_done()) {
 #ifndef TIERED
       COMPILER1_PRESENT(ShouldNotReachHere();)
-      GRAALVM_ONLY(ShouldNotReachHere();)
+      COMPILERGRAAL_PRESENT(ShouldNotReachHere();)
 #endif // !TIERED
       // Protect the operation on the derived pointers.  This
       // protects the addition of derived pointers to the shared
@@ -523,7 +523,7 @@
 bool OopMap::has_derived_pointer() const {
 #ifndef TIERED
   COMPILER1_PRESENT(return false);
-  GRAALVM_ONLY(return false);
+  COMPILERGRAAL_PRESENT(return false);
 #endif // !TIERED
 #ifdef COMPILER2
   OopMapStream oms((OopMap*)this,OopMapValue::derived_oop_value);