Skip to content

Commit e9cee97

Browse files
committed
Move BootstrapMethodConfiguration to hosted package
1 parent 6b97134 commit e9cee97

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/bootstrap/BootstrapMethodConfiguration.java renamed to substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/bootstrap/BootstrapMethodConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* or visit www.oracle.com if you need additional information or have any
2323
* questions.
2424
*/
25-
package com.oracle.svm.core.bootstrap;
25+
package com.oracle.svm.hosted.bootstrap;
2626

2727
import java.lang.invoke.LambdaMetafactory;
2828
import java.lang.invoke.MethodHandle;
@@ -41,6 +41,7 @@
4141

4242
import org.graalvm.nativeimage.ImageSingletons;
4343

44+
import com.oracle.svm.core.bootstrap.BootstrapMethodInfo;
4445
import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
4546
import com.oracle.svm.core.feature.InternalFeature;
4647
import com.oracle.svm.core.traits.BuiltinTraits.BuildtimeAccessOnly;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/AnalysisGraphBuilderPhase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
import java.lang.invoke.WrongMethodTypeException;
3131
import java.util.List;
3232

33-
import com.oracle.svm.util.OriginalMethodProvider;
3433
import com.oracle.graal.pointsto.meta.AnalysisMethod;
35-
import com.oracle.svm.core.bootstrap.BootstrapMethodConfiguration;
3634
import com.oracle.svm.hosted.SVMHost;
35+
import com.oracle.svm.hosted.bootstrap.BootstrapMethodConfiguration;
3736
import com.oracle.svm.hosted.code.SubstrateCompilationDirectives;
3837
import com.oracle.svm.hosted.dynamicaccessinference.ConstantExpressionRegistry;
3938
import com.oracle.svm.util.ModuleSupport;
39+
import com.oracle.svm.util.OriginalMethodProvider;
4040

4141
import jdk.graal.compiler.core.common.type.StampFactory;
4242
import jdk.graal.compiler.core.common.type.TypeReference;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SharedGraphBuilderPhase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@
5252
import com.oracle.graal.pointsto.meta.AnalysisType;
5353
import com.oracle.svm.common.meta.MultiMethod;
5454
import com.oracle.svm.core.ForeignSupport;
55-
import com.oracle.svm.core.bootstrap.BootstrapMethodConfiguration;
56-
import com.oracle.svm.core.bootstrap.BootstrapMethodConfiguration.BootstrapMethodRecord;
5755
import com.oracle.svm.core.bootstrap.BootstrapMethodInfo;
5856
import com.oracle.svm.core.bootstrap.BootstrapMethodInfo.ExceptionWrapper;
5957
import com.oracle.svm.core.deopt.DeoptimizationSupport;
@@ -72,6 +70,8 @@
7270
import com.oracle.svm.hosted.ExceptionSynthesizer;
7371
import com.oracle.svm.hosted.LinkAtBuildTimeSupport;
7472
import com.oracle.svm.hosted.SharedArenaSupport;
73+
import com.oracle.svm.hosted.bootstrap.BootstrapMethodConfiguration;
74+
import com.oracle.svm.hosted.bootstrap.BootstrapMethodConfiguration.BootstrapMethodRecord;
7575
import com.oracle.svm.hosted.code.FactoryMethodSupport;
7676
import com.oracle.svm.hosted.code.SubstrateCompilationDirectives;
7777
import com.oracle.svm.hosted.nodes.DeoptProxyNode;

0 commit comments

Comments
 (0)