[riscv64-8u]riscv.ad:695:10: fatal error: gc/shared/cardTableBarrierSet.hpp: No such file or directory

[sendaoYan]

+ cd build/linux-riscv64-normal-server-release/hotspot/linux_riscv_compiler2/generated
+ /usr/bin/g++ -DLINUX -D_GNU_SOURCE -DRISCV64 -DPRODUCT -I. -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/prims -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/precompiled -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os_cpu/linux_riscv/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os/linux/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os/posix/vm -I../generated '-DHOTSPOT_RELEASE_VERSION="25.412-b00"' '-DHOTSPOT_BUILD_TARGET="product"' '-DHOTSPOT_BUILD_USER="yansendao"' '-DHOTSPOT_LIB_ARCH="riscv64"' '-DHOTSPOT_VM_DISTRO="OpenJDK"' -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_riscv -DTARGET_ARCH_MODEL_riscv -DTARGET_OS_ARCH_linux_riscv -DTARGET_OS_ARCH_MODEL_linux_riscv64 -DTARGET_COMPILER_gcc -DINCLUDE_JFR=1 -DCOMPILER2 -DCOMPILER1 -fPIC -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -pipe -fno-strict-aliasing -fno-omit-frame-pointer -O3 -g -DVM_LITTLE_ENDIAN -D_LP64=1 -Werror -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wformat=2 -Wreturn-type -fstack-protector -fno-delete-null-pointer-checks -fno-lifetime-dse -std=gnu++98 -DDTRACE_ENABLED -c -MMD -MP -MF ../generated/dependencies/ad_riscv.o.d -fpch-deps -o ad_riscv-tmp.o ../generated/adfiles/ad_riscv.cpp
In file included from ../generated/adfiles/ad_riscv.cpp:31:
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm/riscv.ad:695:10: fatal error: gc/shared/cardTableBarrierSet.hpp: No such file or directory
  695 | #include "gc/shared/cardTableBarrierSet.hpp"
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.

ad_riscv.log make-fastdebug-aarch64.log make-fastdebug-x86_64.log make-release-aarch64.log make-release-x86_64.log make-riscv64.log make-slowdebug-aarch64.log make-slowdebug-x86_64.log

[sendaoYan]

diff --git a/hotspot/src/cpu/riscv/vm/macroAssembler_riscv.cpp b/hotspot/src/cpu/riscv/vm/macroAssembler_riscv.cpp
index 01fe0155ee2..9744797aa47 100644
--- a/hotspot/src/cpu/riscv/vm/macroAssembler_riscv.cpp
+++ b/hotspot/src/cpu/riscv/vm/macroAssembler_riscv.cpp
@@ -2647,7 +2647,7 @@ void MacroAssembler::get_thread(Register thread) {

 void MacroAssembler::load_byte_map_base(Register reg) {
   jbyte *byte_map_base =
-    ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base();
+    ((CardTableModRefBS*)(Universe::heap()->barrier_set()))->card_table()->byte_map_base();
   li(reg, (uint64_t)byte_map_base);
 }

diff --git a/hotspot/src/cpu/riscv/vm/riscv.ad b/hotspot/src/cpu/riscv/vm/riscv.ad
index 4bdeed4f8d0..be2332bce2f 100644
--- a/hotspot/src/cpu/riscv/vm/riscv.ad
+++ b/hotspot/src/cpu/riscv/vm/riscv.ad
@@ -692,7 +692,7 @@ definitions %{
 source_hpp %{

 #include "asm/macroAssembler.hpp"
-#include "gc/shared/cardTableBarrierSet.hpp"
+#include "gc/shared/cardTableModRefBS.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "opto/addnode.hpp"
 #include "opto/convertnode.hpp"
@@ -2654,8 +2654,8 @@ operand immPollPage()
 operand immByteMapBase()
 %{
   // Get base of card map
-  predicate(BarrierSet::barrier_set()->is_a(BarrierSet::CardTableBarrierSet) &&
-    (jbyte*)n->get_ptr() == ((CardTableModRefBS*)(Universe::heap()->barrier_set()))->byte_map_base);
+  predicate(Universe::heap()->barrier_set()->is_a(BarrierSet::CardTableModRef) &&
+            (jbyte*)n->get_ptr() == ((CardTableModRefBS*)(Universe::heap()->barrier_set()))->card_table()->byte_map_base());
   match(ConP);

   op_cost(0);

[sendaoYan]

8199604: Rename CardTableModRefBS to CardTableBarrierSet ad_riscv.log make-riscv64.log 15.patch To github.com:sendaoYan/riscv-port-jdk8u-ysd.git 3c187757e61..db26745e70a minus-jbs8276799 -> minus-jbs8276799

[sendaoYan]

make-fastdebug-aarch64.log make-fastdebug-x86_64.log make-release-aarch64.log make-release-x86_64.log make-slowdebug-aarch64.log make-slowdebug-x86_64.log