--- a/src/hotspot/share/runtime/deoptimization.cpp Mon Apr 30 15:55:21 2018 +0200
+++ b/src/hotspot/share/runtime/deoptimization.cpp Thu May 03 09:07:40 2018 -0700
@@ -200,7 +200,7 @@
#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 @@
// 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 @@
#endif // !PRODUCT
}
}
-#ifndef INCLUDE_JVMCI
+#if !INCLUDE_JVMCI
}
}
#endif // INCLUDE_JVMCI
@@ -491,7 +491,7 @@
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;