test/hotspot/jtreg/compiler/runtime/TestConstantsInError.java

@@ -128,11 +128,11 @@
  
          public void process(OutputAnalyzer results, boolean isC1) {
              results.shouldMatch("Test_C1/.*::test \\(3 bytes\\)$")
                     .shouldMatch("Test_C2/.*::test \\(3 bytes\\)$");
  
-             if (isC1 && Platform.isAArch64()) { // no code patching
+             if (isC1 && (Platform.isAArch64() || Platform.isRISCV64())) { // no code patching
                  results.shouldMatch("Test_C1/.*::test \\(3 bytes\\)   made not entrant")
                         .shouldMatch("Test_C2/.*::test \\(3 bytes\\)   made not entrant");
              } else {
                  results.shouldNotContain("made not entrant");
              }

@@ -166,11 +166,11 @@
              results.shouldMatch("Test_MH1/.*::test \\(3 bytes\\)$")
                     .shouldMatch("Test_MH2/.*::test \\(3 bytes\\)$")
                     .shouldMatch("Test_MH3/.*::test \\(3 bytes\\)$")
                     .shouldMatch("Test_MH4/.*::test \\(3 bytes\\)$");
  
-             if (isC1 && Platform.isAArch64()) { // no code patching
+             if (isC1 && (Platform.isAArch64() || Platform.isRISCV64())) { // no code patching
                  results.shouldMatch("Test_MH1/.*::test \\(3 bytes\\)   made not entrant")
                         .shouldMatch("Test_MH2/.*::test \\(3 bytes\\)   made not entrant")
                         .shouldMatch("Test_MH3/.*::test \\(3 bytes\\)   made not entrant")
                         .shouldMatch("Test_MH4/.*::test \\(3 bytes\\)   made not entrant");
              } else {

@@ -189,11 +189,11 @@
  
          public void process(OutputAnalyzer results, boolean isC1) {
              results.shouldMatch("Test_MT1/.*::test \\(3 bytes\\)$")
                     .shouldMatch("Test_MT2/.*::test \\(3 bytes\\)$");
  
-             if (isC1 && Platform.isAArch64()) { // no code patching
+             if (isC1 && (Platform.isAArch64() || Platform.isRISCV64())) { // no code patching
                  results.shouldMatch("Test_MT1/.*::test \\(3 bytes\\)   made not entrant")
                         .shouldMatch("Test_MT2/.*::test \\(3 bytes\\)   made not entrant");
              } else {
                  results.shouldNotContain("made not entrant");
              }