Skip to content

Commit 2ea10ab

Browse files
committed
fixed gates.
1 parent a5b439f commit 2ea10ab

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/truffle/LibGraalTruffleHostEnvironmentLookup.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.graalvm.jniutils.JNI.JObject;
3737
import org.graalvm.jniutils.JNIMethodScope;
3838
import org.graalvm.jniutils.JNIUtil;
39-
import org.graalvm.word.WordFactory;
4039

4140
/**
4241
* This handles the Truffle host environment lookup on HotSpot with Libgraal.
@@ -91,7 +90,7 @@ public TruffleHostEnvironment lookup(ResolvedJavaType forType) {
9190
* per type. So in theory multiple truffle runtimes can be loaded.
9291
*/
9392
try (TruffleRuntimeScope truffleRuntimeScope = LibGraalTruffleHostEnvironment.openTruffleRuntimeScopeImpl()) {
94-
HSTruffleCompilerRuntime runtime = new HSTruffleCompilerRuntime(env, runtimeLocalRef, runtimeType, runtimeClass, WordFactory.pointer(JAVA_INSTRUMENTATION_ACTIVE_ADDRESS.get()));
93+
HSTruffleCompilerRuntime runtime = new HSTruffleCompilerRuntime(env, runtimeLocalRef, runtimeType, runtimeClass, Word.pointer(JAVA_INSTRUMENTATION_ACTIVE_ADDRESS.get()));
9594
this.previousRuntime = environment = new LibGraalTruffleHostEnvironment(runtime, HotSpotJVMCIRuntime.runtime().getHostJVMCIBackend().getMetaAccess());
9695
assert JNIUtil.IsSameObject(env, hsRuntime(environment).getHandle(), runtimeLocalRef);
9796
return environment;

substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleRuntime.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@
5858
import com.oracle.truffle.api.impl.ThreadLocalHandshake;
5959
import com.oracle.truffle.api.nodes.RootNode;
6060
import com.oracle.truffle.api.utilities.TriState;
61+
import com.oracle.truffle.compiler.ConstantFieldInfo;
6162
import com.oracle.truffle.compiler.HostMethodInfo;
6263
import com.oracle.truffle.compiler.OptimizedAssumptionDependency;
64+
import com.oracle.truffle.compiler.PartialEvaluationMethodInfo;
6365
import com.oracle.truffle.compiler.TruffleCompilable;
6466
import com.oracle.truffle.compiler.TruffleCompiler;
6567
import com.oracle.truffle.runtime.AbstractCompilationTask;
@@ -79,6 +81,7 @@
7981
import jdk.vm.ci.meta.JavaConstant;
8082
import jdk.vm.ci.meta.JavaKind;
8183
import jdk.vm.ci.meta.MetaAccessProvider;
84+
import jdk.vm.ci.meta.ResolvedJavaField;
8285
import jdk.vm.ci.meta.ResolvedJavaMethod;
8386
import jdk.vm.ci.meta.SpeculationLog;
8487

@@ -178,12 +181,24 @@ protected EngineCacheSupport loadEngineCacheSupport(List<OptionDescriptors> opti
178181
return null;
179182
}
180183

184+
@Override
185+
@Platforms(Platform.HOSTED_ONLY.class)
186+
public PartialEvaluationMethodInfo getPartialEvaluationMethodInfo(ResolvedJavaMethod method) {
187+
return super.getPartialEvaluationMethodInfo(method);
188+
}
189+
181190
@Override
182191
@Platforms(Platform.HOSTED_ONLY.class)
183192
public HostMethodInfo getHostMethodInfo(ResolvedJavaMethod method) {
184193
return super.getHostMethodInfo(method);
185194
}
186195

196+
@Override
197+
@Platforms(Platform.HOSTED_ONLY.class)
198+
public ConstantFieldInfo getConstantFieldInfo(ResolvedJavaField field) {
199+
return super.getConstantFieldInfo(field);
200+
}
201+
187202
private void teardownCompilerIsolate() {
188203
TruffleCompiler tcp = truffleCompiler;
189204
if (tcp != null) {

0 commit comments

Comments
 (0)