8233888: jdk.vm.ci.hotspot.test.VirtualObjectLayoutTest.testFormat(): Unexpected error verifying
authornever
Thu, 14 Nov 2019 16:34:24 -0800
changeset 59103 4a09d4df104c
parent 59102 9afab9bf3e6a
child 59104 046e4024e55a
8233888: jdk.vm.ci.hotspot.test.VirtualObjectLayoutTest.testFormat(): Unexpected error verifying Reviewed-by: kvn, iignatyev
test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectTestBase.java
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectTestBase.java	Thu Nov 14 15:07:37 2019 +0800
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectTestBase.java	Thu Nov 14 16:34:24 2019 -0800
@@ -97,9 +97,9 @@
         JavaValue[] values = getJavaValues(kinds);
         test(simple, values, kinds, false);
 
-        // Spread a long value across two int fields
+        // Spread a long value across two int fields starting at an aligned field
         kinds = Arrays.copyOf(fieldKinds, fieldKinds.length - 1);
-        kinds[1] = JavaKind.Long;
+        kinds[fields[0].getOffset() % 8 == 0 ? 0 : 1] = JavaKind.Long;
         test(simple, getJavaValues(kinds), kinds, false);
 
         // Produce a long value for the final int field so there is no matching int field for the