Mercurial > hg > graal-compiler
diff src/share/vm/compiler/oopMap.cpp @ 7125:1baf7f1e3f23
decoupled C++ Graal runtime from C1
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 03 Dec 2012 15:32:17 +0100 |
| parents | 7d815d842ee0 |
| children | 3ac7d10a6572 |
line wrap: on
line diff
--- a/src/share/vm/compiler/oopMap.cpp Mon Dec 03 13:56:13 2012 +0100 +++ b/src/share/vm/compiler/oopMap.cpp Mon Dec 03 15:32:17 2012 +0100 @@ -319,6 +319,7 @@ static void add_derived_oop(oop* base, oop* derived) { #ifndef TIERED COMPILER1_PRESENT(ShouldNotReachHere();) + GRAAL_ONLY(ShouldNotReachHere();) #endif // TIERED #ifdef COMPILER2 DerivedPointerTable::add(derived, base); @@ -380,6 +381,7 @@ if (!oms.is_done()) { #ifndef TIERED COMPILER1_PRESENT(ShouldNotReachHere();) + GRAAL_ONLY(ShouldNotReachHere();) #endif // !TIERED // Protect the operation on the derived pointers. This // protects the addition of derived pointers to the shared @@ -502,7 +504,7 @@ // Check that runtime stubs save all callee-saved registers #ifdef COMPILER2 - assert(cb->is_compiled_by_c1() || !cb->is_runtime_stub() || + assert(cb->is_compiled_by_c1() || cb->is_compiled_by_graal() || !cb->is_runtime_stub() || (nof_callee >= SAVED_ON_ENTRY_REG_COUNT || nof_callee >= C_SAVED_ON_ENTRY_REG_COUNT), "must save all"); #endif // COMPILER2 @@ -521,6 +523,7 @@ bool OopMap::has_derived_pointer() const { #ifndef TIERED COMPILER1_PRESENT(return false); + GRAAL_ONLY(return false); #endif // !TIERED #ifdef COMPILER2 OopMapStream oms((OopMap*)this,OopMapValue::derived_oop_value);