Skip to content

Commit 4c4d01d

Browse files
[GR-36423] Fix: scala-dotty benchmark.
PullRequest: graal/10836
2 parents bf17700 + 823f5e2 commit 4c4d01d

File tree

3 files changed

+47
-0
lines changed

3 files changed

+47
-0
lines changed

substratevm/mx.substratevm/mx_substratevm_benchmark.py

+3
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ def list_jars(path):
9494
'--allow-incomplete-classpath',
9595
'--report-unsupported-elements-at-runtime'
9696
],
97+
'dotty' : [
98+
'-H:+AllowJRTFileSystem'
99+
]
97100
}
98101

99102
_renaissance_config = {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/PlatformNativeLibrarySupport.java

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public abstract class PlatformNativeLibrarySupport {
6767
"jdk_internal_org",
6868
"jdk_internal_misc",
6969
"jdk_internal_util",
70+
"jdk_internal_jimage",
7071
"jdk_net",
7172
"sun_invoke",
7273
"sun_launcher",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* Copyright (c) 2021, 2021, 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. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
package com.oracle.svm.hosted.jdk;
26+
27+
import org.graalvm.nativeimage.hosted.Feature;
28+
29+
import com.oracle.svm.core.annotate.AutomaticFeature;
30+
import com.oracle.svm.hosted.FeatureImpl;
31+
32+
@AutomaticFeature
33+
public class JRTFeature implements Feature {
34+
35+
@Override
36+
public void beforeAnalysis(BeforeAnalysisAccess access) {
37+
access.registerReachabilityHandler(duringAnalysisAccess -> {
38+
FeatureImpl.BeforeAnalysisAccessImpl beforeAnalysisAccess = (FeatureImpl.BeforeAnalysisAccessImpl) access;
39+
beforeAnalysisAccess.getNativeLibraries().addStaticJniLibrary("jimage");
40+
beforeAnalysisAccess.getNativeLibraries().addDynamicNonJniLibrary("stdc++");
41+
}, access.findClassByName("jdk.internal.jimage.NativeImageBuffer"));
42+
}
43+
}

0 commit comments

Comments
 (0)