--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp Mon Nov 06 20:29:49 2017 -0800
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp Mon Nov 06 21:28:03 2017 -0800
@@ -151,7 +151,7 @@
if (UseAVX < 3) {
num_xmm_regs = num_xmm_regs/2;
}
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
if (save_vectors) {
assert(UseAVX > 0, "Vectors larger than 16 byte long are supported only with AVX");
assert(MaxVectorSize <= 64, "Only up to 64 byte long vectors are supported");
@@ -260,7 +260,7 @@
}
}
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
if (save_vectors) {
off = ymm0_off;
int delta = ymm1_off - off;
@@ -270,7 +270,7 @@
off += delta;
}
}
-#endif // COMPILER2 || INCLUDE_JVMCI
+#endif // COMPILER2_OR_JVMCI
// %%% These should all be a waste but we'll keep things as they were for now
if (true) {
@@ -323,7 +323,7 @@
__ addptr(rsp, frame::arg_reg_save_area_bytes);
}
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
if (restore_vectors) {
assert(UseAVX > 0, "Vectors larger than 16 byte long are supported only with AVX");
assert(MaxVectorSize <= 64, "Only up to 64 byte long vectors are supported");