archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8152470: Add COMPILER2_OR_JVMCI definition

Browse source 
Defined(COMPILER2) || INCLUDE_JVMCI changed replaced with COMPILER2_OR_JVMCI

Reviewed-by: kvn
This commit is contained in:
Jamsheed Mohammed C M 2017-11-06 21:28:03 -08:00
parent c8aacd3972
commit 10a1edcc22
33 changed files with 88 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/hotspot/share/compiler/oopMap.cpp
View file

@ -268,9 +268,9 @@ static void add_derived_oop(oop* base, oop* derived) {
#if !defined(TIERED) && !defined(INCLUDE_JVMCI)
COMPILER1_PRESENT(ShouldNotReachHere();)
#endif // !defined(TIERED) && !defined(INCLUDE_JVMCI)
#if defined(COMPILER2) || INCLUDE_JVMCI
#if COMPILER2_OR_JVMCI
DerivedPointerTable::add(derived, base);
#endif // COMPILER2 || INCLUDE_JVMCI
#endif // COMPILER2_OR_JVMCI
}
@ -461,12 +461,12 @@ bool ImmutableOopMap::has_derived_pointer() const {
#if !defined(TIERED) && !defined(INCLUDE_JVMCI)
COMPILER1_PRESENT(return false);
#endif // !TIERED
#if defined(COMPILER2) || INCLUDE_JVMCI
#if COMPILER2_OR_JVMCI
OopMapStream oms(this,OopMapValue::derived_oop_value);
return oms.is_done();
#else
return false;
#endif // COMPILER2 || INCLUDE_JVMCI
#endif // COMPILER2_OR_JVMCI
}
#endif //PRODUCT
@ -726,7 +726,7 @@ ImmutableOopMapSet* ImmutableOopMapSet::build_from(const OopMapSet* oopmap_set)
//------------------------------DerivedPointerTable---------------------------
#if defined(COMPILER2) || INCLUDE_JVMCI
#if COMPILER2_OR_JVMCI
class DerivedPointerEntry : public CHeapObj<mtCompiler> {
private:
@ -819,4 +819,4 @@ void DerivedPointerTable::update_pointers() {
_active = false;
}
#endif // COMPILER2 || INCLUDE_JVMCI
#endif // COMPILER2_OR_JVMCI