archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 10:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8236000: VM build without C2 fails

Browse source 
C2 flags should be checked only when C2 is present.

Reviewed-by: kbarrett, thartmann
This commit is contained in:
Vladimir Kozlov 2019-12-18 12:32:34 -08:00
parent ca112043f1
commit 4b1be3ecf9
4 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/hotspot/share/gc/shared/genCollectedHeap.cpp
View file

@ -472,7 +472,7 @@ void GenCollectedHeap::collect_generation(Generation* gen, bool full, size_t siz
HandleMark hm; // Discard invalid handles created during verification HandleMark hm; // Discard invalid handles created during verification
Universe::verify("Before GC"); Universe::verify("Before GC");
} }
COMPILER2_PRESENT(DerivedPointerTable::clear()); COMPILER2_OR_JVMCI_PRESENT(DerivedPointerTable::clear());
if (restore_marks_for_biased_locking) { if (restore_marks_for_biased_locking) {
// We perform this mark word preservation work lazily // We perform this mark word preservation work lazily
@ -520,7 +520,7 @@ void GenCollectedHeap::collect_generation(Generation* gen, bool full, size_t siz
rp->verify_no_references_recorded(); rp->verify_no_references_recorded();
} }
COMPILER2_PRESENT(DerivedPointerTable::update_pointers()); COMPILER2_OR_JVMCI_PRESENT(DerivedPointerTable::update_pointers());
gen->stat_record()->accumulated_time.stop(); gen->stat_record()->accumulated_time.stop();

4
src/hotspot/share/gc/z/zRootsIterator.cpp
View file

@ -190,7 +190,7 @@ ZRootsIterator::ZRootsIterator(bool visit_jvmti_weak_export) :
assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint"); assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
ZStatTimer timer(ZSubPhasePauseRootsSetup); ZStatTimer timer(ZSubPhasePauseRootsSetup);
Threads::change_thread_claim_token(); Threads::change_thread_claim_token();
COMPILER2_PRESENT(DerivedPointerTable::clear()); COMPILER2_OR_JVMCI_PRESENT(DerivedPointerTable::clear());
if (ClassUnloading) { if (ClassUnloading) {
nmethod::oops_do_marking_prologue(); nmethod::oops_do_marking_prologue();
} else { } else {
@ -207,7 +207,7 @@ ZRootsIterator::~ZRootsIterator() {
ZNMethod::oops_do_end(); ZNMethod::oops_do_end();
} }
COMPILER2_PRESENT(DerivedPointerTable::update_pointers()); COMPILER2_OR_JVMCI_PRESENT(DerivedPointerTable::update_pointers());
Threads::assert_all_threads_claimed(); Threads::assert_all_threads_claimed();
} }

10
src/hotspot/share/jvmci/jvmci_globals.cpp
View file

@ -114,6 +114,16 @@ bool JVMCIGlobals::check_jvmci_flags_are_consistent() {
CHECK_NOT_SET(JVMCILibPath, EnableJVMCI) CHECK_NOT_SET(JVMCILibPath, EnableJVMCI)
CHECK_NOT_SET(JVMCILibDumpJNIConfig, EnableJVMCI) CHECK_NOT_SET(JVMCILibDumpJNIConfig, EnableJVMCI)
#ifndef COMPILER2
JVMCI_FLAG_CHECKED(MaxVectorSize)
JVMCI_FLAG_CHECKED(ReduceInitialCardMarks)
JVMCI_FLAG_CHECKED(UseMultiplyToLenIntrinsic)
JVMCI_FLAG_CHECKED(UseSquareToLenIntrinsic)
JVMCI_FLAG_CHECKED(UseMulAddIntrinsic)
JVMCI_FLAG_CHECKED(UseMontgomeryMultiplyIntrinsic)
JVMCI_FLAG_CHECKED(UseMontgomerySquareIntrinsic)
#endif // !COMPILER2
#ifndef PRODUCT #ifndef PRODUCT
#define JVMCI_CHECK4(type, name, value, doc) assert(name##checked, #name " flag not checked"); #define JVMCI_CHECK4(type, name, value, doc) assert(name##checked, #name " flag not checked");
#define JVMCI_CHECK3(type, name, doc) assert(name##checked, #name " flag not checked"); #define JVMCI_CHECK3(type, name, doc) assert(name##checked, #name " flag not checked");

4
src/hotspot/share/runtime/deoptimization.cpp
View file

@ -302,7 +302,7 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
// Reallocate the non-escaping objects and restore their fields. Then // Reallocate the non-escaping objects and restore their fields. Then
// relock objects if synchronization on them was eliminated. // relock objects if synchronization on them was eliminated.
if (jvmci_enabled || (DoEscapeAnalysis && EliminateAllocations)) { if (jvmci_enabled COMPILER2_PRESENT( || (DoEscapeAnalysis && EliminateAllocations) )) {
realloc_failures = eliminate_allocations(thread, exec_mode, cm, deoptee, map, chunk); realloc_failures = eliminate_allocations(thread, exec_mode, cm, deoptee, map, chunk);
} }
#endif // COMPILER2_OR_JVMCI #endif // COMPILER2_OR_JVMCI
@ -318,7 +318,7 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
NoSafepointVerifier no_safepoint; NoSafepointVerifier no_safepoint;
#if COMPILER2_OR_JVMCI #if COMPILER2_OR_JVMCI
if (jvmci_enabled || ((DoEscapeAnalysis || EliminateNestedLocks) && EliminateLocks)) { if (jvmci_enabled COMPILER2_PRESENT( || ((DoEscapeAnalysis || EliminateNestedLocks) && EliminateLocks) )) {
eliminate_locks(thread, chunk, realloc_failures); eliminate_locks(thread, chunk, realloc_failures);
} }
#endif // COMPILER2_OR_JVMCI #endif // COMPILER2_OR_JVMCI