[GR-35573] AArch64: Relax version checks for zvaLength too

PullRequest: graal/10515
dedis · Dec 11, 2021 · 368fcbd · 368fcbd
2 parents ee87cfd + c744c5f
commit 368fcbd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...c/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java b/...c/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
@@ -565,7 +565,7 @@ public int threadTlabTopOffset() {
     public final int psrInfoDczidValue = access.getFieldValue("VM_Version::_psr_info.dczid_el0", Integer.class, "uint32_t", 0x10);
     // psrInfoDczidValue has been removed in a JDK11 update and >=JDK16, zvaLength should be used if
     // available
-    public final int zvaLength = getFieldValue("VM_Version::_zva_length", Integer.class, "int", Integer.MAX_VALUE, JDK >= 16 && osArch.equals("aarch64"));
+    public final int zvaLength = access.getFieldValue("VM_Version::_zva_length", Integer.class, "int", Integer.MAX_VALUE);
 
     public final long inlineCacheMissStub = getFieldValue("CompilerToVM::Data::SharedRuntime_ic_miss_stub", Long.class, "address");
     public final long handleWrongMethodStub = getFieldValue("CompilerToVM::Data::SharedRuntime_handle_wrong_method_stub", Long.class, "address");