Skip to content

Commit 734d3c3

Browse files
JornVerneeJornVernee
committedNov 26, 2020
8256862: Several java/foreign tests fail on x86_32 platforms
Reviewed-by: sundar
·
jdk-25+17jdk-16-ga
1 parent 7946c94 commit 734d3c3

21 files changed

+95
-11
lines changed
 

‎src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/CLinker.java

+2
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@
9595
* {@link #asVarArg(MemoryLayout)} is used to create the memory layouts for each parameter corresponding to a variadic
9696
* argument in a specialized function descriptor.
9797
*
98+
* <p>On unsupported platforms this class will fail to initialize with an {@link ExceptionInInitializerError}.
99+
*
98100
* <p> Unless otherwise specified, passing a {@code null} argument, or an array argument containing one or more {@code null}
99101
* elements to a method in this class causes a {@link NullPointerException NullPointerException} to be thrown. </p>
100102
*

‎src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/CABI.java

+10-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
*/
2626
package jdk.internal.foreign;
2727

28+
import jdk.internal.foreign.abi.SharedUtils;
29+
30+
import static jdk.incubator.foreign.MemoryLayouts.ADDRESS;
31+
2832
public enum CABI {
2933
SysV,
3034
Win64,
@@ -35,7 +39,10 @@ public enum CABI {
3539
static {
3640
String arch = System.getProperty("os.arch");
3741
String os = System.getProperty("os.name");
38-
if (arch.equals("amd64") || arch.equals("x86_64")) {
42+
long addressSize = ADDRESS.bitSize();
43+
// might be running in a 32-bit VM on a 64-bit platform.
44+
// addressSize will be correctly 32
45+
if ((arch.equals("amd64") || arch.equals("x86_64")) && addressSize == 64) {
3946
if (os.startsWith("Windows")) {
4047
current = Win64;
4148
} else {
@@ -44,7 +51,8 @@ public enum CABI {
4451
} else if (arch.equals("aarch64")) {
4552
current = AArch64;
4653
} else {
47-
throw new ExceptionInInitializerError("Unsupported os or arch: " + os + ", " + arch);
54+
throw new ExceptionInInitializerError(
55+
"Unsupported os, arch, or address size: " + os + ", " + arch + ", " + addressSize);
4856
}
4957
}
5058

‎src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/PlatformLayouts.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ private SysV() {
141141
/**
142142
* The {@code T*} native type.
143143
*/
144-
public static final ValueLayout C_POINTER = ofPointer(LITTLE_ENDIAN, ADDRESS.bitSize());
144+
public static final ValueLayout C_POINTER = ofPointer(LITTLE_ENDIAN, 64);
145145

146146
/**
147147
* The {@code va_list} native type, as it is passed to a function.
@@ -201,7 +201,7 @@ private Win64() {
201201
/**
202202
* The {@code T*} native type.
203203
*/
204-
public static final ValueLayout C_POINTER = ofPointer(LITTLE_ENDIAN, ADDRESS.bitSize());
204+
public static final ValueLayout C_POINTER = ofPointer(LITTLE_ENDIAN, 64);
205205

206206
/**
207207
* The {@code va_list} native type, as it is passed to a function.
@@ -266,7 +266,7 @@ private AArch64() {
266266
/**
267267
* The {@code T*} native type.
268268
*/
269-
public static final ValueLayout C_POINTER = ofPointer(LITTLE_ENDIAN, ADDRESS.bitSize());
269+
public static final ValueLayout C_POINTER = ofPointer(LITTLE_ENDIAN, 64);
270270

271271
/**
272272
* The {@code va_list} native type, as it is passed to a function.

‎test/jdk/java/foreign/StdLibTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
/*
2525
* @test
26+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2627
* @run testng/othervm -Dforeign.restricted=permit StdLibTest
2728
*/
2829

‎test/jdk/java/foreign/TestCircularInit1.java

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
/*
2525
* @test
26+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2627
* @modules jdk.incubator.foreign/jdk.internal.foreign
2728
* @run testng/othervm TestCircularInit1
2829
*/

‎test/jdk/java/foreign/TestCircularInit2.java

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
/*
2525
* @test
26+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2627
* @modules jdk.incubator.foreign/jdk.internal.foreign
2728
* @run testng/othervm TestCircularInit2
2829
*/

‎test/jdk/java/foreign/TestCondy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
/*
2525
* @test
26-
*
26+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2727
* @run testng TestCondy
2828
*/
2929

‎test/jdk/java/foreign/TestDowncall.java

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
/*
2626
* @test
27+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2728
* @modules jdk.incubator.foreign/jdk.internal.foreign
2829
* @build NativeTestHelper CallGeneratorHelper TestDowncall
2930
*

‎test/jdk/java/foreign/TestFunctionDescriptor.java

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
/*
2626
* @test
27+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2728
* @run testng TestFunctionDescriptor
2829
*/
2930

‎test/jdk/java/foreign/TestIllegalLink.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
/*
2626
* @test
27-
*
27+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2828
* @run testng/othervm -Dforeign.restricted=permit TestIllegalLink
2929
*/
3030

‎test/jdk/java/foreign/TestLibraryLookup.java

+6
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
/*
2525
* @test
26+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2627
* @modules jdk.incubator.foreign/jdk.internal.foreign
2728
* @run testng/othervm -Dforeign.restricted=permit TestLibraryLookup
2829
*/
@@ -41,6 +42,11 @@
4142

4243
import static org.testng.Assert.*;
4344

45+
// FYI this test is run on 64-bit platforms only for now,
46+
// since the windows 32-bit linker fails and there
47+
// is some fallback behaviour to use the 64-bit linker,
48+
// where cygwin gets in the way and we accidentally pick up its
49+
// link.exe
4450
public class TestLibraryLookup {
4551

4652
@Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Library not found.*")

‎test/jdk/java/foreign/TestNative.java

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
/*
2626
* @test
27+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2728
* @modules jdk.incubator.foreign/jdk.internal.foreign
2829
* @run testng/othervm -Dforeign.restricted=permit TestNative
2930
*/

‎test/jdk/java/foreign/TestNativeScope.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
public class TestNativeScope {
6060

6161
final static int ELEMS = 128;
62+
final static Class<?> ADDRESS_CARRIER = MemoryLayouts.ADDRESS.bitSize() == 64 ? long.class : int.class;
6263

6364
@Test(dataProvider = "nativeScopes")
6465
public <Z> void testAllocation(Z value, ScopeFactory scopeFactory, ValueLayout layout, AllocationFunction<Z> allocationFunction, Function<MemoryLayout, VarHandle> handleFactory) {
@@ -221,7 +222,7 @@ static Object[][] nativeScopes() {
221222
(Function<MemoryLayout, VarHandle>)l -> l.varHandle(double.class) },
222223
{ MemoryAddress.ofLong(42), (ScopeFactory) NativeScope::boundedScope, MemoryLayouts.ADDRESS.withOrder(ByteOrder.BIG_ENDIAN),
223224
(AllocationFunction<MemoryAddress>) NativeScope::allocate,
224-
(Function<MemoryLayout, VarHandle>)l -> MemoryHandles.asAddressVarHandle(l.varHandle(long.class)) },
225+
(Function<MemoryLayout, VarHandle>)l -> MemoryHandles.asAddressVarHandle(l.varHandle(ADDRESS_CARRIER)) },
225226

226227
{ (byte)42, (ScopeFactory) NativeScope::boundedScope, MemoryLayouts.BITS_8_LE,
227228
(AllocationFunction<Byte>) NativeScope::allocate,
@@ -247,7 +248,7 @@ static Object[][] nativeScopes() {
247248
(Function<MemoryLayout, VarHandle>)l -> l.varHandle(double.class) },
248249
{ MemoryAddress.ofLong(42), (ScopeFactory) NativeScope::boundedScope, MemoryLayouts.ADDRESS.withOrder(ByteOrder.LITTLE_ENDIAN),
249250
(AllocationFunction<MemoryAddress>) NativeScope::allocate,
250-
(Function<MemoryLayout, VarHandle>)l -> MemoryHandles.asAddressVarHandle(l.varHandle(long.class)) },
251+
(Function<MemoryLayout, VarHandle>)l -> MemoryHandles.asAddressVarHandle(l.varHandle(ADDRESS_CARRIER)) },
251252

252253
{ (byte)42, (ScopeFactory)size -> NativeScope.unboundedScope(), MemoryLayouts.BITS_8_BE,
253254
(AllocationFunction<Byte>) NativeScope::allocate,
@@ -273,7 +274,7 @@ static Object[][] nativeScopes() {
273274
(Function<MemoryLayout, VarHandle>)l -> l.varHandle(double.class) },
274275
{ MemoryAddress.ofLong(42), (ScopeFactory)size -> NativeScope.unboundedScope(), MemoryLayouts.ADDRESS.withOrder(ByteOrder.BIG_ENDIAN),
275276
(AllocationFunction<MemoryAddress>) NativeScope::allocate,
276-
(Function<MemoryLayout, VarHandle>)l -> MemoryHandles.asAddressVarHandle(l.varHandle(long.class)) },
277+
(Function<MemoryLayout, VarHandle>)l -> MemoryHandles.asAddressVarHandle(l.varHandle(ADDRESS_CARRIER)) },
277278

278279
{ (byte)42, (ScopeFactory)size -> NativeScope.unboundedScope(), MemoryLayouts.BITS_8_LE,
279280
(AllocationFunction<Byte>) NativeScope::allocate,
@@ -299,7 +300,7 @@ static Object[][] nativeScopes() {
299300
(Function<MemoryLayout, VarHandle>)l -> l.varHandle(double.class) },
300301
{ MemoryAddress.ofLong(42), (ScopeFactory)size -> NativeScope.unboundedScope(), MemoryLayouts.ADDRESS.withOrder(ByteOrder.LITTLE_ENDIAN),
301302
(AllocationFunction<MemoryAddress>) NativeScope::allocate,
302-
(Function<MemoryLayout, VarHandle>)l -> MemoryHandles.asAddressVarHandle(l.varHandle(long.class)) },
303+
(Function<MemoryLayout, VarHandle>)l -> MemoryHandles.asAddressVarHandle(l.varHandle(ADDRESS_CARRIER)) },
303304
};
304305
}
305306

‎test/jdk/java/foreign/TestNulls.java

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
/*
2525
* @test
26+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2627
* @modules java.base/jdk.internal.ref
2728
* jdk.incubator.foreign
2829
* @run testng/othervm -Dforeign.restricted=permit TestNulls

‎test/jdk/java/foreign/TestUnsupportedPlatform.java

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/*
2+
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*
23+
*/
24+
25+
/*
26+
* @test
27+
* @requires !(((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64")
28+
* @modules jdk.incubator.foreign/jdk.internal.foreign
29+
* @run testng/othervm -Dforeign.restricted=permit TestUnsupportedPlatform
30+
*/
31+
32+
import jdk.incubator.foreign.CLinker;
33+
import jdk.incubator.foreign.MemoryLayout;
34+
import jdk.incubator.foreign.NativeScope;
35+
import org.testng.annotations.DataProvider;
36+
import org.testng.annotations.Test;
37+
38+
import java.lang.reflect.Field;
39+
import java.util.ArrayList;
40+
import java.util.List;
41+
42+
import static jdk.incubator.foreign.MemoryAddress.NULL;
43+
import static jdk.incubator.foreign.MemoryLayouts.JAVA_BYTE;
44+
import static org.testng.Assert.assertNull;
45+
46+
// tests run on 32-bit platforms, which are currently not supported
47+
public class TestUnsupportedPlatform {
48+
49+
@Test(expectedExceptions = ExceptionInInitializerError.class)
50+
public void testNoInitialization() {
51+
CLinker.getInstance(); // trigger initialization
52+
}
53+
54+
}

‎test/jdk/java/foreign/TestUpcall.java

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
/*
2626
* @test
27+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2728
* @modules jdk.incubator.foreign/jdk.internal.foreign
2829
* @build NativeTestHelper CallGeneratorHelper TestUpcall
2930
*

‎test/jdk/java/foreign/TestUpcallHighArity.java

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
/*
2626
* @test
27+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2728
* @modules jdk.incubator.foreign/jdk.internal.foreign
2829
* @build NativeTestHelper CallGeneratorHelper TestUpcallHighArity
2930
*

‎test/jdk/java/foreign/TestUpcallStubs.java

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
/*
2626
* @test
27+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2728
* @run testng/othervm -Dforeign.restricted=permit TestUpcallStubs
2829
*/
2930

‎test/jdk/java/foreign/TestVarArgs.java

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
/*
2626
* @test
27+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2728
* @run testng/othervm -Dforeign.restricted=permit TestVarArgs
2829
*/
2930

‎test/jdk/java/foreign/stackwalk/TestStackWalk.java

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
/*
2525
* @test
26+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2627
* @library /test/lib
2728
* @build sun.hotspot.WhiteBox
2829
* @run driver ClassFileInstaller sun.hotspot.WhiteBox

‎test/jdk/java/foreign/valist/VaListTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
/*
2626
* @test
27+
* @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
2728
* @modules jdk.incubator.foreign/jdk.internal.foreign
2829
* jdk.incubator.foreign/jdk.internal.foreign.abi
2930
* jdk.incubator.foreign/jdk.internal.foreign.abi.aarch64

1 commit comments

Comments
 (1)

openjdk-notifier[bot] commented on Nov 26, 2020

@openjdk-notifier[bot]
openjdk-notifier[bot]
on Nov 26, 2020

Review

Issues

Please sign in to comment.