8360049: CodeInvalidationReasonTest.java fails with ZGC on AArch64

Reviewed-by: aph, shade
This commit is contained in:
Doug Simon 2025-06-20 13:25:38 +00:00
parent c11f36e620
commit ff54a6493a
2 changed files with 3 additions and 4 deletions

View File

@ -125,5 +125,3 @@ compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java
compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java 8343233 generic-aarch64
compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java 8343233 generic-aarch64
compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java 8343233 generic-aarch64
compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/CodeInvalidationReasonTest.java 8360049 generic-aarch64

View File

@ -67,10 +67,11 @@ public class TestHotSpotVMConfig extends HotSpotVMConfigAccess {
// There currently only 2 variants in use that differ only by the presence of a
// dmb instruction
int stw = getConstant("NMethodPatchingType::stw_instruction_and_data_patch", Integer.class);
int conc = getConstant("NMethodPatchingType::conc_data_patch", Integer.class);
int conc1 = getConstant("NMethodPatchingType::conc_data_patch", Integer.class);
int conc2 = getConstant("NMethodPatchingType::conc_instruction_and_data_patch", Integer.class);
if (patchingType == stw) {
patchConcurrent = false;
} else if (patchingType == conc) {
} else if (patchingType == conc1 || patchingType == conc2) {
patchConcurrent = true;
} else {
throw new IllegalArgumentException("unsupported barrier sequence " + patchingType);