Skip to content

Commit 1f431a0

Browse files
gilles-duboscqzapster
authored andcommitted
Espresso: Stub implementations of new JVMCI methods
1 parent 4a2e07f commit 1f431a0

File tree

7 files changed

+47
-1
lines changed

7 files changed

+47
-1
lines changed

espresso/mx.espresso/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@
606606
"layout": {
607607
"bin/": [
608608
"dependency:espresso:espresso",
609-
"dependency:ESPRESSO_JVM_STANDALONE_JAVA_LINKS/bin/*",
609+
"dependency:espresso:ESPRESSO_JVM_STANDALONE_JAVA_LINKS/bin/*",
610610
],
611611
"./": [{
612612
"source_type": "dependency",

espresso/src/com.oracle.truffle.espresso.jvmci/src/com/oracle/truffle/espresso/jvmci/meta/EspressoBootstrapMethodInvocation.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.util.List;
2828
import java.util.StringJoiner;
2929

30+
import jdk.vm.ci.common.JVMCIError;
3031
import jdk.vm.ci.meta.ConstantPool;
3132
import jdk.vm.ci.meta.JavaConstant;
3233

@@ -74,6 +75,16 @@ public List<JavaConstant> getStaticArguments() {
7475
return staticArguments;
7576
}
7677

78+
@Override
79+
public void resolve() {
80+
throw JVMCIError.unimplemented();
81+
}
82+
83+
@Override
84+
public JavaConstant lookup() {
85+
throw JVMCIError.unimplemented();
86+
}
87+
7788
@Override
7889
public String toString() {
7990
StringJoiner joiner = new StringJoiner(", ", "[", "]");

espresso/src/com.oracle.truffle.espresso.jvmci/src/com/oracle/truffle/espresso/jvmci/meta/EspressoConstantPool.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
import static com.oracle.truffle.espresso.jvmci.EspressoJVMCIRuntime.runtime;
2626

2727
import java.lang.invoke.MethodHandle;
28+
import java.util.List;
2829

30+
import jdk.vm.ci.common.JVMCIError;
2931
import jdk.vm.ci.meta.ConstantPool;
3032
import jdk.vm.ci.meta.JavaConstant;
3133
import jdk.vm.ci.meta.JavaField;
@@ -112,6 +114,11 @@ public JavaMethod lookupMethod(int cpi, int opcode, ResolvedJavaMethod caller) {
112114
@Override
113115
public native EspressoBootstrapMethodInvocation lookupBootstrapMethodInvocation(int cpi, int opcode);
114116

117+
@Override
118+
public List<BootstrapMethodInvocation> lookupBootstrapMethodInvocations(boolean invokeDynamic) {
119+
throw JVMCIError.unimplemented();
120+
}
121+
115122
@Override
116123
public native JavaType lookupType(int cpi, int opcode);
117124

espresso/src/com.oracle.truffle.espresso.jvmci/src/com/oracle/truffle/espresso/jvmci/meta/EspressoResolvedArrayType.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
import java.lang.annotation.Annotation;
2828
import java.lang.reflect.Modifier;
29+
import java.util.Collections;
30+
import java.util.List;
2931
import java.util.Objects;
3032

3133
import jdk.vm.ci.common.JVMCIError;
@@ -285,6 +287,11 @@ public ResolvedJavaMethod[] getDeclaredMethods(boolean forceLink) {
285287
return NO_METHODS;
286288
}
287289

290+
@Override
291+
public List<ResolvedJavaMethod> getAllMethods(boolean forceLink) {
292+
return Collections.emptyList();
293+
}
294+
288295
@Override
289296
public ResolvedJavaMethod getClassInitializer() {
290297
return null;

espresso/src/com.oracle.truffle.espresso.jvmci/src/com/oracle/truffle/espresso/jvmci/meta/EspressoResolvedInstanceType.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import java.lang.reflect.Modifier;
3838
import java.util.Arrays;
3939
import java.util.Comparator;
40+
import java.util.List;
4041

4142
import jdk.vm.ci.common.JVMCIError;
4243
import jdk.vm.ci.meta.Assumptions;
@@ -482,6 +483,14 @@ public EspressoResolvedJavaMethod[] getDeclaredMethods(boolean forceLink) {
482483

483484
private native EspressoResolvedJavaMethod[] getDeclaredMethods0();
484485

486+
@Override
487+
public List<ResolvedJavaMethod> getAllMethods(boolean forceLink) {
488+
if (forceLink) {
489+
link();
490+
}
491+
throw JVMCIError.unimplemented();
492+
}
493+
485494
@Override
486495
public native EspressoResolvedJavaMethod getClassInitializer();
487496

espresso/src/com.oracle.truffle.espresso.jvmci/src/com/oracle/truffle/espresso/jvmci/meta/EspressoResolvedJavaMethod.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,11 @@ public boolean isDefault() {
146146
return ((getModifiers() & mask) == Modifier.PUBLIC) && getDeclaringClass().isInterface();
147147
}
148148

149+
@Override
150+
public boolean isDeclared() {
151+
throw JVMCIError.unimplemented();
152+
}
153+
149154
@Override
150155
public boolean isClassInitializer() {
151156
return isStatic() && "<clinit>".equals(getName());

espresso/src/com.oracle.truffle.espresso.jvmci/src/com/oracle/truffle/espresso/jvmci/meta/EspressoResolvedPrimitiveType.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
import java.lang.annotation.Annotation;
2828
import java.lang.reflect.Modifier;
29+
import java.util.Collections;
30+
import java.util.List;
2931

3032
import jdk.vm.ci.common.JVMCIError;
3133
import jdk.vm.ci.meta.Assumptions;
@@ -248,6 +250,11 @@ public ResolvedJavaMethod[] getDeclaredMethods(boolean forceLink) {
248250
return NO_METHODS;
249251
}
250252

253+
@Override
254+
public List<ResolvedJavaMethod> getAllMethods(boolean forceLink) {
255+
return Collections.emptyList();
256+
}
257+
251258
@Override
252259
public ResolvedJavaMethod getClassInitializer() {
253260
return null;

0 commit comments

Comments
 (0)