Skip to content

Commit 399be80

Browse files
Move VM-side jvmci package to impl package
This avoids conflict with the guest JVMCI package
1 parent 0bb6ddc commit 399be80

7 files changed

+14
-14
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
* or visit www.oracle.com if you need additional information or have any
2121
* questions.
2222
*/
23-
package com.oracle.truffle.espresso.jvmci;
23+
package com.oracle.truffle.espresso.impl.jvmci;
2424

2525
import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.INVOKEDYNAMIC;
26-
import static com.oracle.truffle.espresso.jvmci.JVMCIUtils.LOGGER;
26+
import static com.oracle.truffle.espresso.impl.jvmci.JVMCIUtils.LOGGER;
2727

2828
import java.util.ArrayList;
2929
import java.util.Arrays;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* or visit www.oracle.com if you need additional information or have any
2121
* questions.
2222
*/
23-
package com.oracle.truffle.espresso.jvmci;
23+
package com.oracle.truffle.espresso.impl.jvmci;
2424

2525
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
2626
import com.oracle.truffle.api.TruffleLogger;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/jvmci/Target_com_oracle_truffle_espresso_jvmci_EspressoJVMCIRuntime.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
*/
2323
package com.oracle.truffle.espresso.substitutions.jvmci;
2424

25-
import static com.oracle.truffle.espresso.jvmci.JVMCIUtils.LOGGER;
26-
import static com.oracle.truffle.espresso.jvmci.JVMCIUtils.findObjectType;
25+
import static com.oracle.truffle.espresso.impl.jvmci.JVMCIUtils.LOGGER;
26+
import static com.oracle.truffle.espresso.impl.jvmci.JVMCIUtils.findObjectType;
2727
import static com.oracle.truffle.espresso.substitutions.jvmci.Target_com_oracle_truffle_espresso_jvmci_meta_EspressoMetaAccessProvider.toJVMCIInstanceType;
2828
import static com.oracle.truffle.espresso.substitutions.jvmci.Target_com_oracle_truffle_espresso_jvmci_meta_EspressoMetaAccessProvider.toJVMCIObjectType;
2929
import static com.oracle.truffle.espresso.substitutions.jvmci.Target_com_oracle_truffle_espresso_jvmci_meta_EspressoMetaAccessProvider.toJVMCIPrimitiveType;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/jvmci/Target_com_oracle_truffle_espresso_jvmci_meta_EspressoConstantPool.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.NEW;
4040
import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.PUTFIELD;
4141
import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.PUTSTATIC;
42-
import static com.oracle.truffle.espresso.jvmci.JVMCIIndyData.indyCpi;
43-
import static com.oracle.truffle.espresso.jvmci.JVMCIIndyData.isIndyCPI;
44-
import static com.oracle.truffle.espresso.jvmci.JVMCIUtils.LOGGER;
45-
import static com.oracle.truffle.espresso.jvmci.JVMCIUtils.findObjectType;
42+
import static com.oracle.truffle.espresso.impl.jvmci.JVMCIIndyData.indyCpi;
43+
import static com.oracle.truffle.espresso.impl.jvmci.JVMCIIndyData.isIndyCPI;
44+
import static com.oracle.truffle.espresso.impl.jvmci.JVMCIUtils.LOGGER;
45+
import static com.oracle.truffle.espresso.impl.jvmci.JVMCIUtils.findObjectType;
4646
import static com.oracle.truffle.espresso.substitutions.jvmci.Target_com_oracle_truffle_espresso_jvmci_meta_EspressoConstantReflectionProvider.wrapEspressoObjectConstant;
4747
import static com.oracle.truffle.espresso.substitutions.jvmci.Target_com_oracle_truffle_espresso_jvmci_meta_EspressoMetaAccessProvider.toJVMCIInstanceType;
4848
import static com.oracle.truffle.espresso.substitutions.jvmci.Target_com_oracle_truffle_espresso_jvmci_meta_EspressoMetaAccessProvider.toJVMCIObjectType;
@@ -73,7 +73,7 @@
7373
import com.oracle.truffle.espresso.impl.Klass;
7474
import com.oracle.truffle.espresso.impl.Method;
7575
import com.oracle.truffle.espresso.impl.ObjectKlass;
76-
import com.oracle.truffle.espresso.jvmci.JVMCIIndyData;
76+
import com.oracle.truffle.espresso.impl.jvmci.JVMCIIndyData;
7777
import com.oracle.truffle.espresso.meta.EspressoError;
7878
import com.oracle.truffle.espresso.meta.Meta;
7979
import com.oracle.truffle.espresso.nodes.methodhandle.MHInvokeGenericNode;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/jvmci/Target_com_oracle_truffle_espresso_jvmci_meta_EspressoMethodHandleAccessProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
package com.oracle.truffle.espresso.substitutions.jvmci;
2424

25-
import static com.oracle.truffle.espresso.jvmci.JVMCIUtils.LOGGER;
25+
import static com.oracle.truffle.espresso.impl.jvmci.JVMCIUtils.LOGGER;
2626
import static com.oracle.truffle.espresso.substitutions.jvmci.Target_com_oracle_truffle_espresso_jvmci_meta_EspressoMetaAccessProvider.toJVMCIInstanceType;
2727
import static com.oracle.truffle.espresso.substitutions.jvmci.Target_com_oracle_truffle_espresso_jvmci_meta_EspressoResolvedInstanceType.toJVMCIMethod;
2828

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/jvmci/Target_com_oracle_truffle_espresso_jvmci_meta_EspressoResolvedJavaField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
*/
2323
package com.oracle.truffle.espresso.substitutions.jvmci;
2424

25-
import static com.oracle.truffle.espresso.jvmci.JVMCIUtils.LOGGER;
26-
import static com.oracle.truffle.espresso.jvmci.JVMCIUtils.findType;
25+
import static com.oracle.truffle.espresso.impl.jvmci.JVMCIUtils.LOGGER;
26+
import static com.oracle.truffle.espresso.impl.jvmci.JVMCIUtils.findType;
2727
import static com.oracle.truffle.espresso.substitutions.jvmci.Target_com_oracle_truffle_espresso_jvmci_meta_EspressoMetaAccessProvider.toJVMCIType;
2828
import static com.oracle.truffle.espresso.substitutions.jvmci.Target_com_oracle_truffle_espresso_jvmci_meta_EspressoResolvedInstanceType.getRawAnnotationBytes;
2929
import static com.oracle.truffle.espresso.substitutions.jvmci.Target_jdk_vm_ci_runtime_JVMCI.checkJVMCIAvailable;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/jvmci/Target_com_oracle_truffle_espresso_jvmci_meta_EspressoResolvedJavaMethod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
import com.oracle.truffle.espresso.impl.Klass;
5353
import com.oracle.truffle.espresso.impl.Method;
5454
import com.oracle.truffle.espresso.impl.ObjectKlass;
55-
import com.oracle.truffle.espresso.jvmci.JVMCIIndyData;
55+
import com.oracle.truffle.espresso.impl.jvmci.JVMCIIndyData;
5656
import com.oracle.truffle.espresso.meta.EspressoError;
5757
import com.oracle.truffle.espresso.meta.Meta;
5858
import com.oracle.truffle.espresso.runtime.EspressoContext;

0 commit comments

Comments
 (0)