Skip to content

Commit 69e1d8b

Browse files
committed
[GR-55999] Remove duplicate throw_internal_error symbol.
PullRequest: graal/18399
2 parents 44cb1e0 + b3201aa commit 69e1d8b

File tree

2 files changed

+0
-89
lines changed

2 files changed

+0
-89
lines changed

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/LibManagementExtSupport.java

Lines changed: 0 additions & 72 deletions
This file was deleted.

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationManagementExt.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,12 @@
2424
*/
2525
package com.oracle.svm.hosted.jdk;
2626

27-
import java.lang.reflect.Method;
28-
29-
import org.graalvm.nativeimage.IsolateThread;
30-
import org.graalvm.nativeimage.c.type.CCharPointer;
31-
3227
import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
3328
import com.oracle.svm.core.feature.InternalFeature;
3429
import com.oracle.svm.core.jdk.JNIRegistrationUtil;
3530
import com.oracle.svm.core.jdk.PlatformNativeLibrarySupport;
36-
import com.oracle.svm.core.jdk.management.LibManagementExtSupport;
3731
import com.oracle.svm.hosted.FeatureImpl.DuringAnalysisAccessImpl;
3832
import com.oracle.svm.hosted.c.NativeLibraries;
39-
import com.oracle.svm.hosted.code.CEntryPointCallStubSupport;
40-
import com.oracle.svm.hosted.code.CEntryPointData;
41-
import com.oracle.svm.util.ReflectionUtil;
4233

4334
@AutomaticallyRegisteredFeature
4435
public class JNIRegistrationManagementExt extends JNIRegistrationUtil implements InternalFeature {
@@ -60,14 +51,6 @@ private void linkManagementExt(DuringAnalysisAccess access) {
6051
nativeLibraries.addStaticNonJniLibrary("management_ext", "java");
6152
if (isWindows()) {
6253
nativeLibraries.addDynamicNonJniLibrary("psapi");
63-
} else {
64-
/*
65-
* Register our port of the native function `throw_internal_error`. This avoids linking
66-
* the entire object file of the original function, which is necessary to prevent linker
67-
* errors such as JDK-8264047.
68-
*/
69-
Method method = ReflectionUtil.lookupMethod(LibManagementExtSupport.class, "throwInternalError", IsolateThread.class, CCharPointer.class);
70-
CEntryPointCallStubSupport.singleton().registerStubForMethod(method, () -> CEntryPointData.create(method));
7154
}
7255
}
7356
}

0 commit comments

Comments
 (0)