[11u] RFR (XS) 8257565: epsilonBarrierSet.hpp should not include barrierSetAssembler

[Hohensee, Paul]

Lgtm.

Thanks,
Paul

-----Original Message-----
From: jdk-updates-dev <jdk-updates-dev-retn at openjdk.java.net> on behalf of Aleksey Shipilev <shade at redhat.com>
Date: Friday, January 8, 2021 at 3:55 AM
To: "jdk-updates-dev at openjdk.java.net" <jdk-updates-dev at openjdk.java.net>
Subject: [11u] RFR (XS) 8257565: epsilonBarrierSet.hpp should not include barrierSetAssembler

Original RFE:
   https://bugs.openjdk.java.net/browse/JDK-8257565
   https://git.openjdk.java.net/jdk/commit/67042664

There is a conflict in jvmciCodeInstaller_aarch64.cpp that I needed to resolve by hand. Otherwise
patch applies cleanly.

11u variant:

diff -r cae22982b4b5 src/hotspot/cpu/aarch64/aarch64.ad
--- a/src/hotspot/cpu/aarch64/aarch64.ad        Wed Sep 16 11:15:40 2020 +0000
+++ b/src/hotspot/cpu/aarch64/aarch64.ad        Fri Jan 08 12:52:16 2021 +0100
@@ -997,4 +997,5 @@

  #include "asm/macroAssembler.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
  #include "gc/shared/cardTable.hpp"
  #include "gc/shared/cardTableBarrierSet.hpp"
diff -r cae22982b4b5 src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp
--- a/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp    Wed Sep 16 11:15:40 2020 +0000
+++ b/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp    Fri Jan 08 12:52:16 2021 +0100
@@ -22,4 +22,5 @@
   */

+#include "asm/macroAssembler.hpp"
  #include "jvmci/jvmciCodeInstaller.hpp"
  #include "jvmci/jvmciRuntime.hpp"
diff -r cae22982b4b5 src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp
--- a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp        Wed Sep 16 11:15:40 2020 +0000
+++ b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp        Fri Jan 08 12:52:16 2021 +0100
@@ -26,5 +26,4 @@
  #define SHARE_VM_GC_EPSILON_BARRIERSET_HPP

-#include "gc/shared/barrierSetAssembler.hpp"
  #include "gc/shared/barrierSet.hpp"


Testing: gc/epsilon {fastdebug,release} x {x86_64,aarch64}

--
Thanks,
-Aleksey