Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions test/hotspot/jtreg/ProblemList-zgc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,11 @@ private Boolean initNmethodEntryBarrierConcurrentPatch(Architecture arch) {
// 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);
Expand Down