Mercurial > hg > graal-jvmci-8
diff src/share/vm/compiler/oopMap.cpp @ 22294:d86b226e331a
Enable derived oop processing by the GC with JVMCI
| author | Tom Rodriguez <tom.rodriguez@oracle.com> |
|---|---|
| date | Tue, 21 Jul 2015 15:00:07 -0700 |
| parents | be896a1983c0 |
| children | c28cb37b2e1d |
line wrap: on
line diff
--- a/src/share/vm/compiler/oopMap.cpp Tue Jul 21 14:55:47 2015 +0200 +++ b/src/share/vm/compiler/oopMap.cpp Tue Jul 21 15:00:07 2015 -0700 @@ -319,9 +319,9 @@ COMPILER1_PRESENT(ShouldNotReachHere();) COMPILERJVMCI_PRESENT(ShouldNotReachHere();) #endif // TIERED -#ifdef COMPILER2 +#if defined(COMPILER2) || defined(JVMCI) DerivedPointerTable::add(derived, base); -#endif // COMPILER2 +#endif // COMPILER2 || JVMCI } @@ -509,12 +509,12 @@ COMPILER1_PRESENT(return false); COMPILERJVMCI_PRESENT(return false); #endif // !TIERED -#ifdef COMPILER2 +#if defined(COMPILER2) || defined(JVMCI) OopMapStream oms((OopMap*)this,OopMapValue::derived_oop_value); return oms.is_done(); #else return false; -#endif // COMPILER2 +#endif // COMPILER2 || JVMCI } #endif //PRODUCT @@ -581,7 +581,7 @@ //------------------------------DerivedPointerTable--------------------------- -#ifdef COMPILER2 +#if defined(COMPILER2) || defined(JVMCI) class DerivedPointerEntry : public CHeapObj<mtCompiler> { private: @@ -674,4 +674,4 @@ _active = false; } -#endif // COMPILER2 +#endif // COMPILER2 || JVMCI