changeset 60687:53568400fec3

8241665: Configuring --with-jvm-features=-compiler2 fails to build on AArch64 Summary: Build config --with-jvm-features=-compiler2 fails on AArch64 because JVMCI path includes opto and ad headers Reviewed-by: kvn, aph
author adinn
date Thu, 26 Mar 2020 15:26:51 +0000
parents dd5198db2e5b
children 4c21f29c72fd
files src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
diffstat 1 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp	Sat Mar 28 21:07:55 2020 -0700
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp	Thu Mar 26 15:26:51 2020 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, 2019, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
 #endif
-#if COMPILER2_OR_JVMCI
+#ifdef COMPILER2
 #include "adfiles/ad_aarch64.hpp"
 #include "opto/runtime.hpp"
 #endif
@@ -170,11 +170,12 @@
 }
 
 void RegisterSaver::restore_live_registers(MacroAssembler* masm, bool restore_vectors) {
-#ifndef COMPILER2
+#if COMPILER2_OR_JVMCI
+  __ pop_CPU_state(restore_vectors);
+  __ leave();
+#else
   assert(!restore_vectors, "vectors are generated only by C2 and JVMCI");
 #endif
-  __ pop_CPU_state(restore_vectors);
-  __ leave();
 }
 
 void RegisterSaver::restore_result_registers(MacroAssembler* masm) {
@@ -2537,7 +2538,7 @@
   return 0;
 }
 
-#if COMPILER2_OR_JVMCI
+#ifdef COMPILER2
 //------------------------------generate_uncommon_trap_blob--------------------
 void SharedRuntime::generate_uncommon_trap_blob() {
   // Allocate space for the code
@@ -2728,7 +2729,7 @@
   _uncommon_trap_blob =  UncommonTrapBlob::create(&buffer, oop_maps,
                                                  SimpleRuntimeFrame::framesize >> 1);
 }
-#endif // COMPILER2_OR_JVMCI
+#endif // COMPILER2
 
 
 //------------------------------generate_handler_blob------
@@ -2936,7 +2937,7 @@
   return RuntimeStub::new_runtime_stub(name, &buffer, frame_complete, frame_size_in_words, oop_maps, true);
 }
 
-#if COMPILER2_OR_JVMCI
+#ifdef COMPILER2
 // This is here instead of runtime_x86_64.cpp because it uses SimpleRuntimeFrame
 //
 //------------------------------generate_exception_blob---------------------------
@@ -3065,4 +3066,4 @@
   // Set exception blob
   _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
 }
-#endif // COMPILER2_OR_JVMCI
+#endif // COMPILER2