# HG changeset patch
# User Christian Humer <christian.humer@gmail.com>
# Date 1381758717 -7200
# Node ID bfcae72b61a05f04449bc4a6763b9a6a1ff9519f
# Parent  85dcc7f59c34f59ceb9c9abb8dd71755b41b2f51# Parent  ce5e6f9075b608d0af8863382f316ac815de69e0
merge.

diff -r 85dcc7f59c34 -r bfcae72b61a0 src/share/vm/compiler/oopMap.cpp
--- a/src/share/vm/compiler/oopMap.cpp	Mon Oct 14 15:44:18 2013 +0200
+++ b/src/share/vm/compiler/oopMap.cpp	Mon Oct 14 15:51:57 2013 +0200
@@ -319,7 +319,7 @@
 static void add_derived_oop(oop* base, oop* derived) {
 #ifndef TIERED
   COMPILER1_PRESENT(ShouldNotReachHere();)
-  GRAAL_ONLY(ShouldNotReachHere();)
+  GRAALVM_ONLY(ShouldNotReachHere();)
 #endif // TIERED
 #ifdef COMPILER2
   DerivedPointerTable::add(derived, base);
@@ -381,7 +381,7 @@
     if (!oms.is_done()) {
 #ifndef TIERED
       COMPILER1_PRESENT(ShouldNotReachHere();)
-      GRAAL_ONLY(ShouldNotReachHere();)
+      GRAALVM_ONLY(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);
-  GRAAL_ONLY(return false);
+  GRAALVM_ONLY(return false);
 #endif // !TIERED
 #ifdef COMPILER2
   OopMapStream oms((OopMap*)this,OopMapValue::derived_oop_value);