archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8202552: [AOT][JVMCI] Incorrect usage of INCLUDE_JVMCI and INCLUDE_AOT

Browse source 
Reviewed-by: stefank, ihse
This commit is contained in:
Vladimir Kozlov 2018-05-03 09:07:40 -07:00
parent 6a12519d84
commit 8ebfc59cfa
8 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -200,7 +200,7 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
#if COMPILER2_OR_JVMCI
// Reallocate the non-escaping objects and restore their fields. Then
// relock objects if synchronization on them was eliminated.
#ifndef INCLUDE_JVMCI
#if !INCLUDE_JVMCI
if (DoEscapeAnalysis || EliminateNestedLocks) {
if (EliminateAllocations) {
#endif // INCLUDE_JVMCI
@ -248,7 +248,7 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
// Restore result.
deoptee.set_saved_oop_result(&map, return_value());
}
#ifndef INCLUDE_JVMCI
#if !INCLUDE_JVMCI
}
if (EliminateLocks) {
#endif // INCLUDE_JVMCI
@ -283,7 +283,7 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
#endif // !PRODUCT
}
}
#ifndef INCLUDE_JVMCI
#if !INCLUDE_JVMCI
}
}
#endif // INCLUDE_JVMCI
@ -491,7 +491,7 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
assert(CodeCache::find_blob_unsafe(frame_pcs[0]) != NULL, "bad pc");
#ifdef INCLUDE_JVMCI
#if INCLUDE_JVMCI
if (exceptionObject() != NULL) {
thread->set_exception_oop(exceptionObject());
exec_mode = Unpack_exception;