[riscv64-8u]riscv.ad:8846:22: error: ‘class StrEqualsNode’ has no member named ‘encoding’

[sendaoYan]

/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm/riscv.ad: In member function ‘void State::_sub_Op_StrEquals(const Node*)’:
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm/riscv.ad:8846:22: error: ‘class StrEqualsNode’ has no member named ‘encoding’
 8846 |   predicate(((StrEqualsNode*)n)->encoding() == StrIntrinsicNode::LL);
      |                      ^~~~~~~~
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm/riscv.ad:8846:54: error: ‘LL’ is not a member of ‘StrIntrinsicNode’
 8846 |   predicate(((StrEqualsNode*)n)->encoding() == StrIntrinsicNode::LL);
      |                                                      ^~

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

[sendaoYan]

diff --git a/hotspot/src/cpu/riscv/vm/riscv.ad b/hotspot/src/cpu/riscv/vm/riscv.ad
index e40e033d5e3..5c11ed45c3b 100644
--- a/hotspot/src/cpu/riscv/vm/riscv.ad
+++ b/hotspot/src/cpu/riscv/vm/riscv.ad
@@ -8843,7 +8843,7 @@ instruct clearArray_imm_reg(immL cnt, iRegP_R28 base, Universe dummy, rFlagsReg
 instruct string_equalsL(iRegP_R11 str1, iRegP_R13 str2, iRegI_R14 cnt,
                         iRegI_R10 result, rFlagsReg cr)
 %{
-  predicate(((StrEqualsNode*)n)->encoding() == StrIntrinsicNode::LL);
+  // predicate(((StrEqualsNode*)n)->encoding() == StrIntrinsicNode::LL);
   match(Set result (StrEquals (Binary str1 str2) cnt));
   effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt, KILL cr);

@@ -8856,9 +8856,10 @@ instruct string_equalsL(iRegP_R11 str1, iRegP_R13 str2, iRegI_R14 cnt,
   ins_pipe(pipe_class_memory);
 %}

-instruct string_equals(iRegP_R11 str1, iRegP_R13 str2, iRegI_R14 cnt,
+instruct string_equalsU(iRegP_R11 str1, iRegP_R13 str2, iRegI_R14 cnt,
                         iRegI_R10 result, rFlagsReg cr)
 %{
+  // predicate(((StrEqualsNode*)n)->encoding() == StrIntrinsicNode::UU);
   match(Set result (StrEquals (Binary str1 str2) cnt));
   effect(USE_KILL str1, USE_KILL str2, USE_KILL cnt, KILL cr);

88.patch

[sendaoYan]

To github.com:sendaoYan/riscv-port-jdk8u-ysd.git 65fec8fd41e..f11aa8ab58b minus-jbs8276799 -> minus-jbs8276799

[sendaoYan]

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