Skip to content

Commit 9bff2d9

Browse files
tzezulatzezula
committed
[GR-52827] Failure of gate-vm-ee-external-polyglot-native-api-jdklatest-linux-amd64 gate.
PullRequest: graalpython/3264
2 parents fffa889 + a18007f commit 9bff2d9

File tree

14 files changed

+173
-122
lines changed

14 files changed

+173
-122
lines changed

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/BouncyCastleFeature.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -42,18 +42,18 @@
4242

4343
import java.security.Security;
4444

45+
import com.oracle.graal.python.runtime.PythonImageBuildOptions;
4546
import org.graalvm.nativeimage.ImageSingletons;
4647
import org.graalvm.nativeimage.hosted.Feature;
4748
import org.graalvm.nativeimage.hosted.RuntimeReflection;
4849
import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;
4950

5051
import com.oracle.graal.python.builtins.objects.ssl.CertUtils;
51-
import com.oracle.graal.python.runtime.PythonOptions;
5252

5353
public class BouncyCastleFeature implements Feature {
5454
@Override
5555
public void afterRegistration(AfterRegistrationAccess access) {
56-
if (!PythonOptions.WITHOUT_SSL) {
56+
if (!PythonImageBuildOptions.WITHOUT_SSL) {
5757
RuntimeClassInitializationSupport support = ImageSingletons.lookup(RuntimeClassInitializationSupport.class);
5858
support.initializeAtBuildTime("org.bouncycastle", "security provider");
5959
support.rerunInitialization("org.bouncycastle.jcajce.provider.drbg.DRBG$Default", "RNG");

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/JNIFeature.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -40,17 +40,17 @@
4040
*/
4141
package com.oracle.graal.python;
4242

43+
import com.oracle.graal.python.runtime.PythonImageBuildOptions;
4344
import org.graalvm.nativeimage.hosted.Feature;
4445
import org.graalvm.nativeimage.hosted.RuntimeJNIAccess;
4546

4647
import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContext;
4748
import com.oracle.graal.python.builtins.objects.cext.hpy.jni.GraalHPyJNIContext;
48-
import com.oracle.graal.python.runtime.PythonOptions;
4949

5050
public final class JNIFeature implements Feature {
5151
@Override
5252
public void afterRegistration(AfterRegistrationAccess access) {
53-
if (!PythonOptions.WITHOUT_JNI) {
53+
if (!PythonImageBuildOptions.WITHOUT_JNI) {
5454
try {
5555
// {{start jni upcall config}}
5656
// @formatter:off

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import java.util.concurrent.Semaphore;
5151
import java.util.logging.Level;
5252

53+
import com.oracle.graal.python.runtime.PythonImageBuildOptions;
5354
import org.graalvm.home.Version;
5455
import org.graalvm.nativeimage.ImageInfo;
5556
import org.graalvm.options.OptionDescriptors;
@@ -1006,7 +1007,7 @@ protected void exitContext(PythonContext context, ExitMode exitMode, int exitCod
10061007
if (context.getCApiContext() != null) {
10071008
context.getCApiContext().exitCApiContext();
10081009
}
1009-
if (!PythonOptions.WITHOUT_PLATFORM_ACCESS && !ImageInfo.inImageBuildtimeCode()) {
1010+
if (!PythonImageBuildOptions.WITHOUT_PLATFORM_ACCESS && !ImageInfo.inImageBuildtimeCode()) {
10101011
// Reset signal handlers back to what they were
10111012
PythonModule signalModule = context.lookupBuiltinModule(T__SIGNAL);
10121013
if (signalModule != null) {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858

5959
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromPythonObjectNode;
6060
import com.oracle.graal.python.nodes.attributes.WriteAttributeToPythonObjectNode;
61+
import com.oracle.graal.python.runtime.PythonImageBuildOptions;
6162
import org.graalvm.nativeimage.ImageInfo;
6263

6364
import com.oracle.graal.python.PythonLanguage;
@@ -625,10 +626,10 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
625626
new JSONModuleBuiltins(),
626627
new SREModuleBuiltins(),
627628
new AstModuleBuiltins(),
628-
PythonOptions.WITHOUT_NATIVE_POSIX && (PythonOptions.WITHOUT_JAVA_INET || !socketIOAllowed) ? null : new SelectModuleBuiltins(),
629-
PythonOptions.WITHOUT_NATIVE_POSIX && (PythonOptions.WITHOUT_JAVA_INET || !socketIOAllowed) ? null : new SocketModuleBuiltins(),
630-
PythonOptions.WITHOUT_NATIVE_POSIX && (PythonOptions.WITHOUT_JAVA_INET || !socketIOAllowed) ? null : new SocketBuiltins(),
631-
PythonOptions.WITHOUT_PLATFORM_ACCESS ? null : new SignalModuleBuiltins(),
629+
PythonImageBuildOptions.WITHOUT_NATIVE_POSIX && (PythonImageBuildOptions.WITHOUT_JAVA_INET || !socketIOAllowed) ? null : new SelectModuleBuiltins(),
630+
PythonImageBuildOptions.WITHOUT_NATIVE_POSIX && (PythonImageBuildOptions.WITHOUT_JAVA_INET || !socketIOAllowed) ? null : new SocketModuleBuiltins(),
631+
PythonImageBuildOptions.WITHOUT_NATIVE_POSIX && (PythonImageBuildOptions.WITHOUT_JAVA_INET || !socketIOAllowed) ? null : new SocketBuiltins(),
632+
PythonImageBuildOptions.WITHOUT_PLATFORM_ACCESS ? null : new SignalModuleBuiltins(),
632633
new TracebackBuiltins(),
633634
new GcModuleBuiltins(),
634635
new AtexitModuleBuiltins(),
@@ -638,30 +639,30 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
638639
new SysModuleBuiltins(),
639640
new MemoryViewBuiltins(),
640641
new SuperBuiltins(),
641-
PythonOptions.WITHOUT_SSL ? null : new SSLModuleBuiltins(),
642-
PythonOptions.WITHOUT_SSL ? null : new SSLContextBuiltins(),
643-
PythonOptions.WITHOUT_SSL ? null : new SSLErrorBuiltins(),
644-
PythonOptions.WITHOUT_SSL ? null : new SSLSocketBuiltins(),
645-
PythonOptions.WITHOUT_SSL ? null : new MemoryBIOBuiltins(),
642+
PythonImageBuildOptions.WITHOUT_SSL ? null : new SSLModuleBuiltins(),
643+
PythonImageBuildOptions.WITHOUT_SSL ? null : new SSLContextBuiltins(),
644+
PythonImageBuildOptions.WITHOUT_SSL ? null : new SSLErrorBuiltins(),
645+
PythonImageBuildOptions.WITHOUT_SSL ? null : new SSLSocketBuiltins(),
646+
PythonImageBuildOptions.WITHOUT_SSL ? null : new MemoryBIOBuiltins(),
646647
new BinasciiModuleBuiltins(),
647648
new PosixShMemModuleBuiltins(),
648-
PythonOptions.WITHOUT_PLATFORM_ACCESS ? null : new PosixSubprocessModuleBuiltins(),
649+
PythonImageBuildOptions.WITHOUT_PLATFORM_ACCESS ? null : new PosixSubprocessModuleBuiltins(),
649650
new ReadlineModuleBuiltins(),
650651
new OperatorModuleBuiltins(),
651652

652653
// hashlib
653-
PythonOptions.WITHOUT_DIGEST ? null : new Md5ModuleBuiltins(),
654-
PythonOptions.WITHOUT_DIGEST ? null : new Sha1ModuleBuiltins(),
655-
PythonOptions.WITHOUT_DIGEST ? null : new Sha256ModuleBuiltins(),
656-
PythonOptions.WITHOUT_DIGEST ? null : new Sha512ModuleBuiltins(),
657-
PythonOptions.WITHOUT_DIGEST ? null : new Sha3ModuleBuiltins(),
658-
PythonOptions.WITHOUT_DIGEST ? null : new Blake2ModuleBuiltins(),
659-
PythonOptions.WITHOUT_DIGEST ? null : new DigestObjectBuiltins(),
660-
PythonOptions.WITHOUT_DIGEST ? null : new HashObjectBuiltins(),
661-
PythonOptions.WITHOUT_DIGEST ? null : new ShakeDigestObjectBuiltins(),
662-
PythonOptions.WITHOUT_DIGEST ? null : new Blake2bObjectBuiltins(),
663-
PythonOptions.WITHOUT_DIGEST ? null : new Blake2sObjectBuiltins(),
664-
PythonOptions.WITHOUT_DIGEST ? null : new HashlibModuleBuiltins(),
654+
PythonImageBuildOptions.WITHOUT_DIGEST ? null : new Md5ModuleBuiltins(),
655+
PythonImageBuildOptions.WITHOUT_DIGEST ? null : new Sha1ModuleBuiltins(),
656+
PythonImageBuildOptions.WITHOUT_DIGEST ? null : new Sha256ModuleBuiltins(),
657+
PythonImageBuildOptions.WITHOUT_DIGEST ? null : new Sha512ModuleBuiltins(),
658+
PythonImageBuildOptions.WITHOUT_DIGEST ? null : new Sha3ModuleBuiltins(),
659+
PythonImageBuildOptions.WITHOUT_DIGEST ? null : new Blake2ModuleBuiltins(),
660+
PythonImageBuildOptions.WITHOUT_DIGEST ? null : new DigestObjectBuiltins(),
661+
PythonImageBuildOptions.WITHOUT_DIGEST ? null : new HashObjectBuiltins(),
662+
PythonImageBuildOptions.WITHOUT_DIGEST ? null : new ShakeDigestObjectBuiltins(),
663+
PythonImageBuildOptions.WITHOUT_DIGEST ? null : new Blake2bObjectBuiltins(),
664+
PythonImageBuildOptions.WITHOUT_DIGEST ? null : new Blake2sObjectBuiltins(),
665+
PythonImageBuildOptions.WITHOUT_DIGEST ? null : new HashlibModuleBuiltins(),
665666

666667
new PyExpatModuleBuiltins(),
667668

@@ -688,9 +689,9 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
688689
new ZipLongestBuiltins(),
689690

690691
// zlib
691-
PythonOptions.WITHOUT_COMPRESSION_LIBRARIES ? null : new ZLibModuleBuiltins(),
692-
PythonOptions.WITHOUT_COMPRESSION_LIBRARIES ? null : new ZlibCompressBuiltins(),
693-
PythonOptions.WITHOUT_COMPRESSION_LIBRARIES ? null : new ZlibDecompressBuiltins(),
692+
PythonImageBuildOptions.WITHOUT_COMPRESSION_LIBRARIES ? null : new ZLibModuleBuiltins(),
693+
PythonImageBuildOptions.WITHOUT_COMPRESSION_LIBRARIES ? null : new ZlibCompressBuiltins(),
694+
PythonImageBuildOptions.WITHOUT_COMPRESSION_LIBRARIES ? null : new ZlibDecompressBuiltins(),
694695

695696
new MMapModuleBuiltins(),
696697
new FcntlModuleBuiltins(),
@@ -715,13 +716,13 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
715716
new UnpicklerMemoProxyBuiltins(),
716717

717718
// lzma
718-
PythonOptions.WITHOUT_COMPRESSION_LIBRARIES ? null : new LZMAModuleBuiltins(),
719-
PythonOptions.WITHOUT_COMPRESSION_LIBRARIES ? null : new LZMACompressorBuiltins(),
720-
PythonOptions.WITHOUT_COMPRESSION_LIBRARIES ? null : new LZMADecompressorBuiltins(),
719+
PythonImageBuildOptions.WITHOUT_COMPRESSION_LIBRARIES ? null : new LZMAModuleBuiltins(),
720+
PythonImageBuildOptions.WITHOUT_COMPRESSION_LIBRARIES ? null : new LZMACompressorBuiltins(),
721+
PythonImageBuildOptions.WITHOUT_COMPRESSION_LIBRARIES ? null : new LZMADecompressorBuiltins(),
721722

722723
// _multiprocessing
723-
PythonOptions.WITHOUT_NATIVE_POSIX ? null : new MultiprocessingModuleBuiltins(),
724-
PythonOptions.WITHOUT_NATIVE_POSIX ? null : new SemLockBuiltins(),
724+
PythonImageBuildOptions.WITHOUT_NATIVE_POSIX ? null : new MultiprocessingModuleBuiltins(),
725+
PythonImageBuildOptions.WITHOUT_NATIVE_POSIX ? null : new SemLockBuiltins(),
725726
new MultiprocessingGraalPyModuleBuiltins(),
726727
new GraalPySemLockBuiltins(),
727728

@@ -775,7 +776,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed,
775776
builtins.add(new LsprofModuleBuiltins());
776777
builtins.add(LsprofModuleBuiltins.newProfilerBuiltins());
777778
}
778-
if (!PythonOptions.WITHOUT_COMPRESSION_LIBRARIES && (nativeAccessAllowed || ImageInfo.inImageBuildtimeCode())) {
779+
if (!PythonImageBuildOptions.WITHOUT_COMPRESSION_LIBRARIES && (nativeAccessAllowed || ImageInfo.inImageBuildtimeCode())) {
779780
builtins.add(new BZ2CompressorBuiltins());
780781
builtins.add(new BZ2DecompressorBuiltins());
781782
builtins.add(new BZ2ModuleBuiltins());
@@ -939,7 +940,7 @@ private void initializeImportlib() {
939940

940941
// see CPython's init_importlib_external
941942
callNode.execute(null, null, bootstrap, toTruffleStringUncached("_install_external_importers"));
942-
if (!PythonOptions.WITHOUT_COMPRESSION_LIBRARIES) {
943+
if (!PythonImageBuildOptions.WITHOUT_COMPRESSION_LIBRARIES) {
943944
// see CPython's _PyImportZip_Init
944945
Object pathHooks = readNode.execute(sysModule, toTruffleStringUncached("path_hooks"));
945946
if (!(pathHooks instanceof PList pathHooksList)) {
@@ -1001,7 +1002,7 @@ public final void postInitialize() {
10011002
* would never include the intrinsified _bz2 module in the native image since native
10021003
* access is never allowed during native image build time.
10031004
*/
1004-
if (!PythonOptions.WITHOUT_COMPRESSION_LIBRARIES && ImageInfo.inImageCode() && !getContext().isNativeAccessAllowed()) {
1005+
if (!PythonImageBuildOptions.WITHOUT_COMPRESSION_LIBRARIES && ImageInfo.inImageCode() && !getContext().isNativeAccessAllowed()) {
10051006
removeBuiltinModule(BuiltinNames.T_BZ2);
10061007
}
10071008

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
import java.util.List;
7979
import java.util.logging.Level;
8080

81+
import com.oracle.graal.python.runtime.PythonImageBuildOptions;
8182
import org.graalvm.home.Version;
8283
import org.graalvm.nativeimage.ImageInfo;
8384

@@ -263,7 +264,7 @@ public void postInitialize(Python3Core core) {
263264
mod.setAttribute(tsLiteral("dump_heap"), PNone.NO_VALUE);
264265
mod.setAttribute(tsLiteral("is_native_object"), PNone.NO_VALUE);
265266
}
266-
if (PythonOptions.WITHOUT_PLATFORM_ACCESS || !context.getOption(PythonOptions.RunViaLauncher)) {
267+
if (PythonImageBuildOptions.WITHOUT_PLATFORM_ACCESS || !context.getOption(PythonOptions.RunViaLauncher)) {
267268
mod.setAttribute(tsLiteral("list_files"), PNone.NO_VALUE);
268269
}
269270
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TimeModuleBuiltins.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import java.util.List;
5252
import java.util.TimeZone;
5353

54+
import com.oracle.graal.python.runtime.PythonImageBuildOptions;
5455
import org.graalvm.nativeimage.ImageInfo;
5556

5657
import com.oracle.graal.python.annotations.ArgumentClinic;
@@ -93,7 +94,6 @@
9394
import com.oracle.graal.python.nodes.util.CastToJavaDoubleNode;
9495
import com.oracle.graal.python.runtime.GilNode;
9596
import com.oracle.graal.python.runtime.PythonContext;
96-
import com.oracle.graal.python.runtime.PythonOptions;
9797
import com.oracle.graal.python.runtime.object.PythonObjectFactory;
9898
import com.oracle.graal.python.util.PythonUtils;
9999
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -315,7 +315,7 @@ public abstract static class TzSetNode extends PythonBuiltinNode {
315315
@Specialization
316316
@TruffleBoundary
317317
Object tzset() {
318-
if (!PythonOptions.WITHOUT_PLATFORM_ACCESS) {
318+
if (!PythonImageBuildOptions.WITHOUT_PLATFORM_ACCESS) {
319319
String tzEnv = getContext().getEnv().getEnvironment().get("TZ");
320320
if (tzEnv == null) {
321321
tzEnv = "";

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContext.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
import com.oracle.graal.python.runtime.AsyncHandler;
9393
import com.oracle.graal.python.runtime.GilNode;
9494
import com.oracle.graal.python.runtime.PythonContext;
95+
import com.oracle.graal.python.runtime.PythonImageBuildOptions;
9596
import com.oracle.graal.python.runtime.PythonOptions;
9697
import com.oracle.graal.python.runtime.PythonOptions.HPyBackendMode;
9798
import com.oracle.graal.python.runtime.exception.PException;
@@ -448,7 +449,7 @@ public GraalHPyContext(PythonContext context, Object hpyLibrary) throws ApiInitE
448449

449450
LOGGER.config("Using HPy backend:" + backendMode.name());
450451
if (backendMode == HPyBackendMode.JNI) {
451-
if (!PythonOptions.WITHOUT_JNI) {
452+
if (!PythonImageBuildOptions.WITHOUT_JNI) {
452453
this.useNativeFastPaths = useNativeFastPaths;
453454
backend = new GraalHPyJNIContext(this, traceUpcallsInterval > 0);
454455
} else {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyNodes.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@
149149
import com.oracle.graal.python.runtime.PythonContext;
150150
import com.oracle.graal.python.runtime.PythonContext.GetThreadStateNode;
151151
import com.oracle.graal.python.runtime.PythonContext.PythonThreadState;
152+
import com.oracle.graal.python.runtime.PythonImageBuildOptions;
152153
import com.oracle.graal.python.runtime.PythonOptions;
153154
import com.oracle.graal.python.runtime.exception.PException;
154155
import com.oracle.graal.python.runtime.exception.PythonErrorType;
@@ -2705,7 +2706,7 @@ public static HPyAttachFunctionTypeNode create() {
27052706
PythonLanguage language = PythonLanguage.get(null);
27062707
switch (language.getEngineOption(PythonOptions.HPyBackend)) {
27072708
case JNI:
2708-
if (!PythonOptions.WITHOUT_JNI) {
2709+
if (!PythonImageBuildOptions.WITHOUT_JNI) {
27092710
return HPyAttachJNIFunctionTypeNodeGen.create();
27102711
}
27112712
throw CompilerDirectives.shouldNotReachHere();
@@ -2721,7 +2722,7 @@ public static HPyAttachFunctionTypeNode getUncached() {
27212722
PythonLanguage language = PythonLanguage.get(null);
27222723
switch (language.getEngineOption(PythonOptions.HPyBackend)) {
27232724
case JNI:
2724-
if (!PythonOptions.WITHOUT_JNI) {
2725+
if (!PythonImageBuildOptions.WITHOUT_JNI) {
27252726
return HPyAttachJNIFunctionTypeNodeGen.getUncached();
27262727
}
27272728
throw CompilerDirectives.shouldNotReachHere();

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/jni/GraalHPyJNIContext.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
import java.util.List;
6464
import java.util.Objects;
6565

66+
import com.oracle.graal.python.runtime.PythonImageBuildOptions;
6667
import org.graalvm.nativeimage.ImageInfo;
6768

6869
import com.oracle.graal.python.PythonLanguage;
@@ -275,7 +276,7 @@ public final class GraalHPyJNIContext extends GraalHPyNativeContext {
275276

276277
public GraalHPyJNIContext(GraalHPyContext context, boolean traceUpcalls) {
277278
super(context, traceUpcalls);
278-
assert !PythonOptions.WITHOUT_JNI;
279+
assert !PythonImageBuildOptions.WITHOUT_JNI;
279280
this.slowPathFactory = context.getContext().factory();
280281
this.counts = traceUpcalls ? new int[HPyJNIUpcall.VALUES.length] : null;
281282
this.ctypeSizes = new int[HPyContextSignatureType.values().length];

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/jni/GraalHPyJNIFunctionPointer.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -42,7 +42,7 @@
4242

4343
import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContext.LLVMType;
4444
import com.oracle.graal.python.builtins.objects.cext.hpy.HPyMode;
45-
import com.oracle.graal.python.runtime.PythonOptions;
45+
import com.oracle.graal.python.runtime.PythonImageBuildOptions;
4646
import com.oracle.truffle.api.CompilerDirectives;
4747
import com.oracle.truffle.api.dsl.Cached;
4848
import com.oracle.truffle.api.dsl.Specialization;
@@ -72,7 +72,7 @@ public final class GraalHPyJNIFunctionPointer implements TruffleObject {
7272
final HPyMode mode;
7373

7474
public GraalHPyJNIFunctionPointer(long pointer, LLVMType signature, HPyMode mode) {
75-
assert !PythonOptions.WITHOUT_JNI;
75+
assert !PythonImageBuildOptions.WITHOUT_JNI;
7676
this.pointer = pointer;
7777
this.signature = signature;
7878
this.mode = mode;
@@ -93,7 +93,7 @@ static Object doCached(GraalHPyJNIFunctionPointer receiver, Object[] arguments,
9393
@Cached("receiver.signature") LLVMType cachedSignature,
9494
@Cached(parameters = "receiver.signature") GraalHPyJNIConvertArgNode convertArgNode) {
9595
// Make it explicit, that we cannot to JNI calls if WITHOUT_JNI is true.
96-
if (PythonOptions.WITHOUT_JNI) {
96+
if (PythonImageBuildOptions.WITHOUT_JNI) {
9797
throw CompilerDirectives.shouldNotReachHere();
9898
}
9999
return switch (receiver.mode) {

0 commit comments

Comments
 (0)