Skip to content

Commit 7d7feee

Browse files
committed
Hardcode extnet exception for onLoad.
1 parent 668c722 commit 7d7feee

2 files changed

Lines changed: 3 additions & 8 deletions

File tree

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNILibraryInitializer.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
package com.oracle.svm.core.jni;
2626

2727
import java.util.Collection;
28-
import java.util.function.Predicate;
2928

3029
import org.graalvm.collections.EconomicMap;
3130
import org.graalvm.collections.Equivalence;
@@ -69,10 +68,10 @@ public static boolean isBuiltinOnLoadName(String symbol) {
6968
}
7069

7170
@Platforms(Platform.HOSTED_ONLY.class)
72-
public boolean fillCGlobalDataMap(Collection<String> staticLibNames, Predicate<String> hasOnLoadSymbol) {
71+
public boolean fillCGlobalDataMap(Collection<String> staticLibNames) {
7372
boolean mapIsChanged = false;
7473
for (String libName : staticLibNames) {
75-
if (!onLoadCGlobalDataMap.containsKey(libName) && hasOnLoadSymbol.test(libName)) {
74+
if (!onLoadCGlobalDataMap.containsKey(libName) && !(Platform.includedIn(Platform.WINDOWS.class) && libName.equals("extnet"))) {
7675
CGlobalData<PointerBase> onLoadCGlobalData = CGlobalDataFactory.forSymbol(getOnLoadName(libName, true), true);
7776
onLoadCGlobalDataMap.put(libName, onLoadCGlobalData);
7877
mapIsChanged = true;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNILibraryLoadFeature.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import java.util.LinkedHashSet;
3030
import java.util.List;
3131
import java.util.Set;
32-
import java.util.function.Predicate;
3332

3433
import org.graalvm.nativeimage.ImageSingletons;
3534
import org.graalvm.nativeimage.Platform;
@@ -88,10 +87,7 @@ public void duringSetup(DuringSetupAccess access) {
8887

8988
@Override
9089
public void duringAnalysis(DuringAnalysisAccess access) {
91-
NativeLibraries nativeLibraries = NativeLibraries.singleton();
92-
Predicate<String> hasOnLoadSymbol = library -> nativeLibraries.getStaticLibrarySymbols(library)
93-
.contains(JNILibraryInitializer.getOnLoadName(library, true));
94-
boolean isChanged = jniLibraryInitializer.fillCGlobalDataMap(NativeLibraries.singleton().getReachableBuiltinLibraryNames(), hasOnLoadSymbol);
90+
boolean isChanged = jniLibraryInitializer.fillCGlobalDataMap(NativeLibraries.singleton().getReachableBuiltinLibraryNames());
9591
if (isChanged) {
9692
access.requireAnalysisIteration();
9793
}

0 commit comments

Comments
 (0)