Mercurial > hg > graal-compiler
changeset 22790:615f3bbbb174
Update jvmci and truffle import: Rename jdk.internal.jvmci to jdk.vm.ci
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -31,7 +31,7 @@ import java.util.Collections; import java.util.List; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/DeoptimizeDirectiveTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.api.directives.test/src/com/oracle/graal/api/directives/test/DeoptimizeDirectiveTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.api.directives.test; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/MethodSubstitution.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/MethodSubstitution.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,7 +27,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jdk.internal.jvmci.meta.Signature; +import jdk.vm.ci.meta.Signature; /** * Denotes a substitute method. A substitute method can call the original/substituted method by
--- a/graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/SnippetReflectionProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.api.replacements/src/com/oracle/graal/api/replacements/SnippetReflectionProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,12 +29,12 @@ import java.lang.reflect.Method; import java.util.Objects; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaField; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaField; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; /** * Reflection operations on values represented as {@linkplain JavaConstant constants} for the
--- a/graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Graal.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.api.runtime/src/com/oracle/graal/api/runtime/Graal.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.Formatter; -import jdk.internal.jvmci.service.Services; +import jdk.vm.ci.service.Services; /** * Access point for {@linkplain #getRuntime() retrieving} the single {@link GraalRuntime} instance.
--- a/graal/com.oracle.graal.asm.amd64.test/src/com/oracle/graal/asm/amd64/test/BitOpsTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.asm.amd64.test/src/com/oracle/graal/asm/amd64/test/BitOpsTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,20 +27,20 @@ import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp.TZCNT; import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.DWORD; import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.QWORD; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.asRegister; import static org.junit.Assume.assumeTrue; import java.lang.reflect.Field; import java.util.EnumSet; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.amd64.AMD64.CPUFeature; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.amd64.AMD64.CPUFeature; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.JavaKind; import org.junit.Before; import org.junit.Test;
--- a/graal/com.oracle.graal.asm.amd64.test/src/com/oracle/graal/asm/amd64/test/IncrementDecrementMacroTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.asm.amd64.test/src/com/oracle/graal/asm/amd64/test/IncrementDecrementMacroTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,18 +22,18 @@ */ package com.oracle.graal.asm.amd64.test; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.asRegister; import static org.junit.Assume.assumeTrue; import java.lang.reflect.Field; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.JavaKind; import org.junit.Before; import org.junit.Test;
--- a/graal/com.oracle.graal.asm.amd64.test/src/com/oracle/graal/asm/amd64/test/SimpleAssemblerTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.asm.amd64.test/src/com/oracle/graal/asm/amd64/test/SimpleAssemblerTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,17 +27,17 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.CompilationResult.DataSectionReference; -import jdk.internal.jvmci.code.DataSection.Data; -import jdk.internal.jvmci.code.DataSection.DataBuilder; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult.DataSectionReference; +import jdk.vm.ci.code.DataSection.Data; +import jdk.vm.ci.code.DataSection.DataBuilder; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; import org.junit.Before; import org.junit.Test;
--- a/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Address.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Address.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.asm.amd64; -import jdk.internal.jvmci.code.Register; +import jdk.vm.ci.code.Register; import com.oracle.graal.asm.AbstractAddress;
--- a/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java Thu Oct 08 17:41:33 2015 -0700 @@ -42,20 +42,20 @@ import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.SD; import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.SS; import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.WORD; -import static jdk.internal.jvmci.amd64.AMD64.CPU; -import static jdk.internal.jvmci.amd64.AMD64.XMM; -import static jdk.internal.jvmci.amd64.AMD64.r12; -import static jdk.internal.jvmci.amd64.AMD64.r13; -import static jdk.internal.jvmci.amd64.AMD64.rbp; -import static jdk.internal.jvmci.amd64.AMD64.rip; -import static jdk.internal.jvmci.amd64.AMD64.rsp; -import static jdk.internal.jvmci.code.MemoryBarriers.STORE_LOAD; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.amd64.AMD64.CPUFeature; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.Register.RegisterCategory; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; +import static jdk.vm.ci.amd64.AMD64.CPU; +import static jdk.vm.ci.amd64.AMD64.XMM; +import static jdk.vm.ci.amd64.AMD64.r12; +import static jdk.vm.ci.amd64.AMD64.r13; +import static jdk.vm.ci.amd64.AMD64.rbp; +import static jdk.vm.ci.amd64.AMD64.rip; +import static jdk.vm.ci.amd64.AMD64.rsp; +import static jdk.vm.ci.code.MemoryBarriers.STORE_LOAD; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.amd64.AMD64.CPUFeature; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.Register.RegisterCategory; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.asm.Assembler; import com.oracle.graal.asm.Label;
--- a/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64MacroAssembler.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64MacroAssembler.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,11 +25,11 @@ import static com.oracle.graal.asm.amd64.AMD64AsmOptions.UseIncDec; import static com.oracle.graal.asm.amd64.AMD64AsmOptions.UseXmmLoadAndClearUpper; import static com.oracle.graal.asm.amd64.AMD64AsmOptions.UseXmmRegToRegMoveAll; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.asm.NumUtil;
--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAddress.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAddress.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.asm.sparc; -import static jdk.internal.jvmci.sparc.SPARC.STACK_BIAS; -import static jdk.internal.jvmci.sparc.SPARC.fp; -import static jdk.internal.jvmci.sparc.SPARC.sp; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.sparc.SPARC; +import static jdk.vm.ci.sparc.SPARC.STACK_BIAS; +import static jdk.vm.ci.sparc.SPARC.fp; +import static jdk.vm.ci.sparc.SPARC.sp; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.sparc.SPARC; import com.oracle.graal.asm.AbstractAddress;
--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java Thu Oct 08 17:41:33 2015 -0700 @@ -119,28 +119,28 @@ import static com.oracle.graal.asm.sparc.SPARCAssembler.Ops.ArithOp; import static com.oracle.graal.asm.sparc.SPARCAssembler.Ops.LdstOp; import static java.lang.String.format; -import static jdk.internal.jvmci.sparc.SPARC.INSTRUCTION_SIZE; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import static jdk.internal.jvmci.sparc.SPARC.isCPURegister; -import static jdk.internal.jvmci.sparc.SPARC.isDoubleFloatRegister; -import static jdk.internal.jvmci.sparc.SPARC.isSingleFloatRegister; -import static jdk.internal.jvmci.sparc.SPARC.r15; -import static jdk.internal.jvmci.sparc.SPARC.r2; -import static jdk.internal.jvmci.sparc.SPARC.r5; +import static jdk.vm.ci.sparc.SPARC.INSTRUCTION_SIZE; +import static jdk.vm.ci.sparc.SPARC.g0; +import static jdk.vm.ci.sparc.SPARC.isCPURegister; +import static jdk.vm.ci.sparc.SPARC.isDoubleFloatRegister; +import static jdk.vm.ci.sparc.SPARC.isSingleFloatRegister; +import static jdk.vm.ci.sparc.SPARC.r15; +import static jdk.vm.ci.sparc.SPARC.r2; +import static jdk.vm.ci.sparc.SPARC.r5; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.sparc.SPARC; -import jdk.internal.jvmci.sparc.SPARC.CPUFeature; -import jdk.internal.jvmci.sparc.SPARCKind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.sparc.SPARC; +import jdk.vm.ci.sparc.SPARC.CPUFeature; +import jdk.vm.ci.sparc.SPARCKind; import com.oracle.graal.asm.Assembler; import com.oracle.graal.asm.Label;
--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCMacroAssembler.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCMacroAssembler.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,19 +29,19 @@ import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.Always; import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.Equal; import static com.oracle.graal.asm.sparc.SPARCAssembler.RCondition.Rc_z; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import static jdk.internal.jvmci.sparc.SPARC.g3; -import static jdk.internal.jvmci.sparc.SPARC.i7; -import static jdk.internal.jvmci.sparc.SPARC.isCPURegister; -import static jdk.internal.jvmci.sparc.SPARC.o7; +import static jdk.vm.ci.sparc.SPARC.g0; +import static jdk.vm.ci.sparc.SPARC.g3; +import static jdk.vm.ci.sparc.SPARC.i7; +import static jdk.vm.ci.sparc.SPARC.isCPURegister; +import static jdk.vm.ci.sparc.SPARC.o7; import java.util.function.Consumer; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.sparc.SPARC; -import jdk.internal.jvmci.sparc.SPARC.CPUFeature; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.sparc.SPARC; +import jdk.vm.ci.sparc.SPARC.CPUFeature; import com.oracle.graal.asm.AbstractAddress; import com.oracle.graal.asm.Label;
--- a/graal/com.oracle.graal.asm.test/src/com/oracle/graal/asm/test/AssemblerTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.asm.test/src/com/oracle/graal/asm/test/AssemblerTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,19 +24,19 @@ import java.lang.reflect.Method; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.InvalidInstalledCodeException; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.runtime.JVMCI; -import jdk.internal.jvmci.runtime.JVMCIBackend; -import jdk.internal.jvmci.service.Services; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.InvalidInstalledCodeException; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.runtime.JVMCI; +import jdk.vm.ci.runtime.JVMCIBackend; +import jdk.vm.ci.service.Services; import org.junit.Assert;
--- a/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Assembler.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/Assembler.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,9 +28,9 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.TargetDescription; /** * The platform-independent base class for the assembler.
--- a/graal/com.oracle.graal.code/src/com/oracle/graal/code/DisassemblerProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.code/src/com/oracle/graal/code/DisassemblerProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.code; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; /** * Interface providing capability for disassembling machine code.
--- a/graal/com.oracle.graal.code/src/com/oracle/graal/code/HexCodeFile.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.code/src/com/oracle/graal/code/HexCodeFile.java Thu Oct 08 17:41:33 2015 -0700 @@ -32,10 +32,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.code.CompilationResult.CodeAnnotation; -import jdk.internal.jvmci.code.CompilationResult.CodeComment; -import jdk.internal.jvmci.code.CompilationResult.JumpTable; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.code.CompilationResult.CodeAnnotation; +import jdk.vm.ci.code.CompilationResult.CodeComment; +import jdk.vm.ci.code.CompilationResult.JumpTable; /** * A HexCodeFile is a textual format for representing a chunk of machine code along with extra
--- a/graal/com.oracle.graal.code/src/com/oracle/graal/code/HexCodeFileDisassemblerProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.code/src/com/oracle/graal/code/HexCodeFileDisassemblerProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,20 +26,20 @@ import java.lang.invoke.MethodHandles; import java.util.Arrays; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.code.CodeUtil.DefaultRefMapFormatter; -import jdk.internal.jvmci.code.CodeUtil.RefMapFormatter; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.CompilationResult.Call; -import jdk.internal.jvmci.code.CompilationResult.DataPatch; -import jdk.internal.jvmci.code.CompilationResult.Infopoint; -import jdk.internal.jvmci.code.CompilationResult.Mark; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.code.CodeUtil.DefaultRefMapFormatter; +import jdk.vm.ci.code.CodeUtil.RefMapFormatter; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult.Call; +import jdk.vm.ci.code.CompilationResult.DataPatch; +import jdk.vm.ci.code.CompilationResult.Infopoint; +import jdk.vm.ci.code.CompilationResult.Mark; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.service.ServiceProvider; /** * {@link HexCodeFile} based implementation of {@link DisassemblerProvider}.
--- a/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/AMD64AllocatorTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/AMD64AllocatorTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import static com.oracle.graal.compiler.common.BackendOptions.UserOptions.TraceRA; import static com.oracle.graal.compiler.common.GraalOptions.RegisterPressure; import static org.junit.Assume.assumeTrue; -import jdk.internal.jvmci.amd64.AMD64; +import jdk.vm.ci.amd64.AMD64; import org.junit.Before; import org.junit.Ignore;
--- a/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/ConstantStackMoveTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/ConstantStackMoveTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,10 +23,10 @@ package com.oracle.graal.compiler.amd64.test; import static org.junit.Assume.assumeTrue; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.PrimitiveConstant; import org.junit.Before; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/StackStoreTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.amd64.test/src/com/oracle/graal/compiler/amd64/test/StackStoreTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,12 +23,12 @@ package com.oracle.graal.compiler.amd64.test; import static org.junit.Assume.assumeTrue; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import org.junit.Before; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64AddressLowering.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64AddressLowering.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,8 +23,8 @@ package com.oracle.graal.compiler.amd64; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.meta.JavaConstant; import com.oracle.graal.asm.NumUtil; import com.oracle.graal.asm.amd64.AMD64Address.Scale;
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64AddressNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64AddressNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,9 +23,9 @@ package com.oracle.graal.compiler.amd64; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64Address.Scale; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64ArithmeticLIRGenerator.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64ArithmeticLIRGenerator.java Thu Oct 08 17:41:33 2015 -0700 @@ -62,17 +62,17 @@ import static com.oracle.graal.lir.amd64.AMD64MathIntrinsicOp.IntrinsicOpcode.LOG10; import static com.oracle.graal.lir.amd64.AMD64MathIntrinsicOp.IntrinsicOpcode.SIN; import static com.oracle.graal.lir.amd64.AMD64MathIntrinsicOp.IntrinsicOpcode.TAN; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.NumUtil; import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic;
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java Thu Oct 08 17:41:33 2015 -0700 @@ -42,30 +42,30 @@ import static com.oracle.graal.lir.LIRValueUtil.asConstantValue; import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.internal.jvmci.code.ValueUtil.isAllocatableValue; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isAllocatableValue; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; import java.util.HashMap; import java.util.Map; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.NumUtil; import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MIOp;
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRKindTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRKindTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler.amd64; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.LIRKind; import com.oracle.graal.compiler.common.spi.LIRKindTool;
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64NodeLIRBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64NodeLIRBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,11 +23,11 @@ package com.oracle.graal.compiler.amd64; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.gen.NodeLIRBuilder; import com.oracle.graal.lir.LIRFrameState;
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64NodeMatchRules.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64NodeMatchRules.java Thu Oct 08 17:41:33 2015 -0700 @@ -35,13 +35,13 @@ import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.QWORD; import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.SD; import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.SS; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.NumUtil; import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MIOp;
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/BackendOptions.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/BackendOptions.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.compiler.common; -import jdk.internal.jvmci.options.DerivedOptionValue; -import jdk.internal.jvmci.options.DerivedOptionValue.OptionSupplier; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.StableOptionValue; +import jdk.vm.ci.options.DerivedOptionValue; +import jdk.vm.ci.options.DerivedOptionValue.OptionSupplier; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.StableOptionValue; /** * Options to control the backend configuration.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/Fields.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/Fields.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,7 +27,7 @@ import java.util.ArrayList; import java.util.Collections; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import sun.misc.Unsafe; /**
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.compiler.common; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.StableOptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.StableOptionValue; /** * This class encapsulates options that control the behavior of the Graal compiler.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/RegisterAllocationConfig.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/alloc/RegisterAllocationConfig.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,9 +27,9 @@ import java.util.HashMap; import java.util.Map; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.meta.PlatformKind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.meta.PlatformKind; import com.oracle.graal.compiler.common.GraalOptions;
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/calc/Condition.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/calc/Condition.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.compiler.common.calc; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.PrimitiveConstant; /** * Condition codes used in conditionals.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/calc/FloatConvert.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/calc/FloatConvert.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.common.calc; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; public enum FloatConvert { F2I,
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/CodeGenProviders.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/CodeGenProviders.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler.common.spi; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.MetaAccessProvider; /** * A set of providers which are required for LIR and/or code generation. Some may not be present
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/ForeignCallLinkage.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/ForeignCallLinkage.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler.common.spi; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.meta.InvokeTarget; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.meta.InvokeTarget; +import jdk.vm.ci.meta.Value; /** * The runtime specific details of a {@linkplain ForeignCallDescriptor foreign} call.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/ForeignCallsProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/ForeignCallsProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.common.spi; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; /** * Details about a set of supported {@link ForeignCallDescriptor foreign calls}.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/LIRKindTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/spi/LIRKindTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.common.spi; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.meta.LIRKind; /** * This interface can be used to access platform and VM specific kinds.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/AbstractObjectStamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/AbstractObjectStamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,11 +26,11 @@ import java.util.Objects; import java.util.RandomAccess; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; /** * Type describing all pointers to Java objects.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/AbstractPointerStamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/AbstractPointerStamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; /** * Abstract base class of all pointer types.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ArithmeticOpTable.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ArithmeticOpTable.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.common.type; -import static jdk.internal.jvmci.meta.MetaUtil.getSimpleName; +import static jdk.vm.ci.meta.MetaUtil.getSimpleName; import java.util.Arrays; import java.util.Objects; @@ -30,8 +30,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.calc.FloatConvert; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp.Add;
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ArithmeticStamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ArithmeticStamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import java.nio.ByteBuffer; import java.util.Objects; -import jdk.internal.jvmci.meta.SerializableConstant; +import jdk.vm.ci.meta.SerializableConstant; /** * Type describing values that support arithmetic operations.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/FloatStamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/FloatStamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -32,15 +32,15 @@ import java.nio.ByteBuffer; import java.util.function.DoubleBinaryOperator; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.PrimitiveConstant; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.SerializableConstant; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.PrimitiveConstant; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.SerializableConstant; import com.oracle.graal.compiler.common.spi.LIRKindTool; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp;
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/IllegalStamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/IllegalStamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,14 +22,14 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MemoryAccessProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.PrimitiveConstant; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MemoryAccessProvider; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.PrimitiveConstant; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.spi.LIRKindTool;
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/IntegerStamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/IntegerStamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,16 +30,16 @@ import java.nio.ByteBuffer; import java.util.Formatter; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.PrimitiveConstant; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.SerializableConstant; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.PrimitiveConstant; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.SerializableConstant; import com.oracle.graal.compiler.common.spi.LIRKindTool; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp;
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ObjectStamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ObjectStamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MemoryAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MemoryAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.spi.LIRKindTool;
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/PrimitiveStamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/PrimitiveStamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.MemoryAccessProvider; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.MemoryAccessProvider; /** * Type describing primitive values.
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/RawPointerStamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/RawPointerStamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MemoryAccessProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MemoryAccessProvider; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.spi.LIRKindTool;
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/Stamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/Stamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MemoryAccessProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MemoryAccessProvider; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.spi.LIRKindTool;
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/StampFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/StampFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,15 +22,15 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Signature; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Signature; public class StampFactory {
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/VoidStamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/VoidStamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,13 +22,13 @@ */ package com.oracle.graal.compiler.common.type; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MemoryAccessProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MemoryAccessProvider; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.spi.LIRKindTool;
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/util/Util.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/util/Util.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,8 +26,8 @@ import java.util.Comparator; import java.util.List; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.CodeUtil; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.CodeUtil; import com.oracle.graal.debug.TTY;
--- a/graal/com.oracle.graal.compiler.match.processor/src/com/oracle/graal/compiler/match/processor/MatchProcessor.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.match.processor/src/com/oracle/graal/compiler/match/processor/MatchProcessor.java Thu Oct 08 17:41:33 2015 -0700 @@ -63,8 +63,8 @@ import javax.tools.JavaFileObject; import javax.tools.StandardLocation; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.graal.compiler.gen.NodeMatchRules; import com.oracle.graal.compiler.match.ComplexMatchResult;
--- a/graal/com.oracle.graal.compiler.sparc.test/src/com/oracle/graal/compiler/sparc/test/SPARCAllocatorTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.sparc.test/src/com/oracle/graal/compiler/sparc/test/SPARCAllocatorTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import static com.oracle.graal.compiler.common.BackendOptions.UserOptions.TraceRA; import static com.oracle.graal.compiler.common.GraalOptions.RegisterPressure; import static org.junit.Assume.assumeTrue; -import jdk.internal.jvmci.sparc.SPARC; +import jdk.vm.ci.sparc.SPARC; import org.junit.Before; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCAddressLowering.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCAddressLowering.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,8 +23,8 @@ package com.oracle.graal.compiler.sparc; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.meta.JavaConstant; import com.oracle.graal.asm.sparc.SPARCAssembler; import com.oracle.graal.nodes.ValueNode;
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCArithmeticLIRGenerator.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCArithmeticLIRGenerator.java Thu Oct 08 17:41:33 2015 -0700 @@ -55,22 +55,22 @@ import static com.oracle.graal.lir.sparc.SPARCBitManipulationOp.IntrinsicOpcode.BSF; import static com.oracle.graal.lir.sparc.SPARCBitManipulationOp.IntrinsicOpcode.IBSR; import static com.oracle.graal.lir.sparc.SPARCBitManipulationOp.IntrinsicOpcode.LBSR; -import static jdk.internal.jvmci.code.CodeUtil.mask; -import static jdk.internal.jvmci.meta.JavaConstant.forLong; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import static jdk.internal.jvmci.sparc.SPARCKind.DOUBLE; -import static jdk.internal.jvmci.sparc.SPARCKind.DWORD; -import static jdk.internal.jvmci.sparc.SPARCKind.SINGLE; -import static jdk.internal.jvmci.sparc.SPARCKind.WORD; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.sparc.SPARC; -import jdk.internal.jvmci.sparc.SPARC.CPUFeature; -import jdk.internal.jvmci.sparc.SPARCKind; +import static jdk.vm.ci.code.CodeUtil.mask; +import static jdk.vm.ci.meta.JavaConstant.forLong; +import static jdk.vm.ci.sparc.SPARC.g0; +import static jdk.vm.ci.sparc.SPARCKind.DOUBLE; +import static jdk.vm.ci.sparc.SPARCKind.DWORD; +import static jdk.vm.ci.sparc.SPARCKind.SINGLE; +import static jdk.vm.ci.sparc.SPARCKind.WORD; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.sparc.SPARC; +import jdk.vm.ci.sparc.SPARC.CPUFeature; +import jdk.vm.ci.sparc.SPARCKind; import com.oracle.graal.asm.sparc.SPARCAssembler.Op3s; import com.oracle.graal.asm.sparc.SPARCAssembler.Opfs;
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCImmediateAddressNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCImmediateAddressNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,8 +23,8 @@ package com.oracle.graal.compiler.sparc; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; import com.oracle.graal.asm.sparc.SPARCAssembler; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCIndexedAddressNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCIndexedAddressNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,8 +23,8 @@ package com.oracle.graal.compiler.sparc; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.lir.sparc.SPARCIndexedAddressValue;
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java Thu Oct 08 17:41:33 2015 -0700 @@ -32,21 +32,21 @@ import static com.oracle.graal.asm.sparc.SPARCAssembler.Opfs.Fcmps; import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import static jdk.internal.jvmci.sparc.SPARCKind.DWORD; -import static jdk.internal.jvmci.sparc.SPARCKind.SINGLE; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.sparc.SPARC; -import jdk.internal.jvmci.sparc.SPARCKind; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.sparc.SPARCKind.DWORD; +import static jdk.vm.ci.sparc.SPARCKind.SINGLE; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.sparc.SPARC; +import jdk.vm.ci.sparc.SPARCKind; import com.oracle.graal.asm.sparc.SPARCAssembler; import com.oracle.graal.asm.sparc.SPARCAssembler.CC;
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRKindTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRKindTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler.sparc; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.sparc.SPARCKind; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.sparc.SPARCKind; import com.oracle.graal.compiler.common.spi.LIRKindTool;
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCNodeLIRBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCNodeLIRBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,9 +23,9 @@ package com.oracle.graal.compiler.sparc; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.gen.NodeLIRBuilder; import com.oracle.graal.lir.LabelRef;
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCNodeMatchRules.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCNodeMatchRules.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,14 +23,14 @@ package com.oracle.graal.compiler.sparc; -import static jdk.internal.jvmci.sparc.SPARCKind.BYTE; -import static jdk.internal.jvmci.sparc.SPARCKind.DWORD; -import static jdk.internal.jvmci.sparc.SPARCKind.HWORD; -import static jdk.internal.jvmci.sparc.SPARCKind.WORD; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.sparc.SPARCKind; +import static jdk.vm.ci.sparc.SPARCKind.BYTE; +import static jdk.vm.ci.sparc.SPARCKind.DWORD; +import static jdk.vm.ci.sparc.SPARCKind.HWORD; +import static jdk.vm.ci.sparc.SPARCKind.WORD; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.sparc.SPARCKind; import com.oracle.graal.compiler.gen.NodeMatchRules; import com.oracle.graal.compiler.match.ComplexMatchResult;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CheckGraalInvariants.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CheckGraalInvariants.java Thu Oct 08 17:41:33 2015 -0700 @@ -40,18 +40,18 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.Register.RegisterCategory; -import jdk.internal.jvmci.meta.JavaField; -import jdk.internal.jvmci.meta.JavaMethod; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.Register.RegisterCategory; +import jdk.vm.ci.meta.JavaField; +import jdk.vm.ci.meta.JavaMethod; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Value; import org.junit.Assert; import org.junit.Assume; @@ -98,7 +98,7 @@ private static boolean shouldVerifyEquals(ResolvedJavaMethod m) { if (m.getName().equals("identityEquals")) { ResolvedJavaType c = m.getDeclaringClass(); - if (c.getName().equals("Ljdk/internal/jvmci/meta/AbstractValue;") || c.getName().equals("jdk/internal/jvmci/meta/Value")) { + if (c.getName().equals("Ljdk/vm/ci/meta/AbstractValue;") || c.getName().equals("jdk/vm/ci/meta/Value")) { return false; } }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CommonedConstantsTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CommonedConstantsTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.lang.reflect.Array; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConcreteSubtypeTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConcreteSubtypeTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.meta.Assumptions.Assumption; -import jdk.internal.jvmci.meta.Assumptions.ConcreteSubtype; +import jdk.vm.ci.meta.Assumptions.Assumption; +import jdk.vm.ci.meta.Assumptions.ConcreteSubtype; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,7 +28,7 @@ import java.util.Random; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaConstant; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CountedLoopTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/CountedLoopTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FinalizableSubclassTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FinalizableSubclassTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,10 +28,10 @@ import java.lang.reflect.Constructor; import java.util.HashMap; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.Assumptions.Assumption; -import jdk.internal.jvmci.meta.Assumptions.NoFinalizableSubclass; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions.Assumption; +import jdk.vm.ci.meta.Assumptions.NoFinalizableSubclass; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FindUniqueConcreteMethodBugTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FindUniqueConcreteMethodBugTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import org.junit.Assert; import org.junit.Ignore;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FindUniqueDefaultMethodTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FindUniqueDefaultMethodTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import org.junit.Ignore; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerAssumptionsTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerAssumptionsTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.Assumptions.Assumption; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.Assumptions.Assumption; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import static com.oracle.graal.compiler.GraalCompiler.getProfilingInfo; import static com.oracle.graal.nodes.ConstantNode.getConstantNodes; -import static jdk.internal.jvmci.code.CodeUtil.getCallingConvention; -import static jdk.internal.jvmci.compiler.Compiler.PrintCompilation; +import static jdk.vm.ci.code.CodeUtil.getCallingConvention; +import static jdk.vm.ci.compiler.Compiler.PrintCompilation; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -41,24 +41,24 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CallingConvention.Type; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ProfilingInfo; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.SpeculationLog; -import jdk.internal.jvmci.options.DerivedOptionValue; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CallingConvention.Type; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ProfilingInfo; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.SpeculationLog; +import jdk.vm.ci.options.DerivedOptionValue; import org.junit.After; import org.junit.Assert;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraphEncoderTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraphEncoderTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InfopointReasonTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InfopointReasonTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,15 +25,15 @@ import static com.oracle.graal.compiler.GraalCompiler.compileGraph; import static com.oracle.graal.compiler.GraalCompiler.getProfilingInfo; import static com.oracle.graal.compiler.common.GraalOptions.OptAssumptions; -import static jdk.internal.jvmci.code.CodeUtil.getCallingConvention; +import static jdk.vm.ci.code.CodeUtil.getCallingConvention; import static org.junit.Assert.assertNotNull; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CallingConvention.Type; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.CompilationResult.Call; -import jdk.internal.jvmci.code.CompilationResult.Infopoint; -import jdk.internal.jvmci.code.InfopointReason; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CallingConvention.Type; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult.Call; +import jdk.vm.ci.code.CompilationResult.Infopoint; +import jdk.vm.ci.code.InfopointReason; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InstalledCodeInvalidationTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InstalledCodeInvalidationTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.InvalidInstalledCodeException; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.InvalidInstalledCodeException; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LockEliminationTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LockEliminationTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LongNodeChainTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LongNodeChainTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaConstant; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MarkUnsafeAccessTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MarkUnsafeAccessTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -33,10 +33,10 @@ import java.nio.file.Files; import java.nio.file.Path; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.InvalidInstalledCodeException; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.InvalidInstalledCodeException; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import org.junit.Assert; import org.junit.Assume;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryArithmeticTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryArithmeticTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryScheduleTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/MemoryScheduleTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -31,8 +31,8 @@ import java.util.ArrayList; import java.util.List; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.OptionValue.OverrideScope; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.OptionValue.OverrideScope; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/OptionsVerifierTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/OptionsVerifierTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -42,9 +42,9 @@ import java.util.zip.ZipException; import java.util.zip.ZipFile; -import jdk.internal.jvmci.options.OptionDescriptor; -import jdk.internal.jvmci.options.OptionDescriptors; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.options.OptionDescriptor; +import jdk.vm.ci.options.OptionDescriptors; +import jdk.vm.ci.options.OptionValue; import jdk.internal.org.objectweb.asm.ClassReader; import jdk.internal.org.objectweb.asm.ClassVisitor; import jdk.internal.org.objectweb.asm.Label;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ProfilingInfoTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ProfilingInfoTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,11 +24,11 @@ import java.io.Serializable; -import jdk.internal.jvmci.meta.JavaTypeProfile; -import jdk.internal.jvmci.meta.ProfilingInfo; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.meta.JavaTypeProfile; +import jdk.vm.ci.meta.ProfilingInfo; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.TriState; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/PushNodesThroughPiTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/PushNodesThroughPiTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaType; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/StaticInterfaceFieldTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/StaticInterfaceFieldTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,8 +26,8 @@ import java.lang.reflect.Method; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assume; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/UnbalancedMonitorsTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/UnbalancedMonitorsTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.compiler.test; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.internal.org.objectweb.asm.ClassWriter; import jdk.internal.org.objectweb.asm.Label; import jdk.internal.org.objectweb.asm.MethodVisitor;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/AllocatorTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/AllocatorTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.HashSet; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.meta.Value; import org.junit.Assert;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/BackendTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/BackendTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.compiler.test.backend; -import static jdk.internal.jvmci.code.CodeUtil.getCallingConvention; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CallingConvention.Type; +import static jdk.vm.ci.code.CodeUtil.getCallingConvention; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CallingConvention.Type; import com.oracle.graal.compiler.GraalCompiler; import com.oracle.graal.compiler.test.GraalCompilerTest;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/CompiledMethodTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/CompiledMethodTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.compiler.test.deopt; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.InvalidInstalledCodeException; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.InvalidInstalledCodeException; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/MonitorDeoptTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/MonitorDeoptTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ */ package com.oracle.graal.compiler.test.deopt; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EATestBase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EATestBase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.List; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EscapeAnalysisTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EscapeAnalysisTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test.ea; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaConstant; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PEAAssertionsTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PEAAssertionsTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test.ea; -import jdk.internal.jvmci.code.SourceStackTrace; +import jdk.vm.ci.code.SourceStackTrace; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/UnsafeEATest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/UnsafeEATest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.test.ea; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaConstant; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/inlining/InliningTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/inlining/InliningTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.compiler.test.inlining; -import jdk.internal.jvmci.code.InfopointReason; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.InfopointReason; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Ignore; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/GraalTutorial.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/GraalTutorial.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler.test.tutorial; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.InvalidInstalledCodeException; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.InvalidInstalledCodeException; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/InvokeGraal.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/InvokeGraal.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,15 +25,15 @@ import java.lang.reflect.Method; import java.util.concurrent.atomic.AtomicInteger; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CallingConvention.Type; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ProfilingInfo; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CallingConvention.Type; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ProfilingInfo; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.api.runtime.Graal; import com.oracle.graal.compiler.GraalCompiler;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/StaticAnalysis.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/StaticAnalysis.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,13 +30,13 @@ import java.util.Map; import java.util.Set; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope;
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/StaticAnalysisTests.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/StaticAnalysisTests.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,10 +27,10 @@ import java.util.Arrays; import java.util.Collection; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu Oct 08 17:41:33 2015 -0700 @@ -31,22 +31,22 @@ import java.util.List; import java.util.Set; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.CompilationResult.ConstantReference; -import jdk.internal.jvmci.code.CompilationResult.DataPatch; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.DefaultProfilingInfo; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ProfilingInfo; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.TriState; -import jdk.internal.jvmci.meta.VMConstant; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.OptionValue.OverrideScope; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult.ConstantReference; +import jdk.vm.ci.code.CompilationResult.DataPatch; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.DefaultProfilingInfo; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ProfilingInfo; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.TriState; +import jdk.vm.ci.meta.VMConstant; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.OptionValue.OverrideScope; import com.oracle.graal.compiler.LIRGenerationPhase.LIRGenerationContext; import com.oracle.graal.compiler.common.alloc.ComputeBlockOrder;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompilerOptions.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompilerOptions.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.compiler; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; /** * Options related to {@link GraalCompiler}.
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalDebugInitializationPropertyProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalDebugInitializationPropertyProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.DebugInitializationPropertyProvider;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/LIRGenerationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/LIRGenerationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,7 +26,7 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.compiler.common.cfg.BlockMap;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeLIRBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeLIRBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,15 +22,15 @@ */ package com.oracle.graal.compiler.gen; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Signature; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Signature; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.gen.LIRGeneratorTool;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeParserTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeParserTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.gen; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; /** * visible interface of bytecode parsers.
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,16 +27,16 @@ import java.util.Map; import java.util.Queue; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.code.VirtualObject; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.JavaValue; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.code.VirtualObject; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.JavaValue; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Value; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.DebugMetric;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,9 +26,9 @@ import static com.oracle.graal.compiler.common.GraalOptions.MatchExpressions; import static com.oracle.graal.debug.GraalDebugConfig.Options.LogVerbose; import static com.oracle.graal.lir.LIR.verifyBlock; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isLegal; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isLegal; +import static jdk.vm.ci.code.ValueUtil.isRegister; import java.util.ArrayList; import java.util.Collection; @@ -36,17 +36,17 @@ import java.util.Map; import java.util.Map.Entry; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.cfg.BlockMap;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeMatchRules.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeMatchRules.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.gen; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.match.MatchableNode; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/ComplexMatchResult.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/ComplexMatchResult.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.compiler.match; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.gen.NodeLIRBuilder;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/ComplexMatchValue.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/ComplexMatchValue.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.compiler.match; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.gen.NodeLIRBuilder;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchContext.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchContext.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.gen.NodeLIRBuilder; import com.oracle.graal.compiler.match.MatchPattern.Result;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchRuleRegistry.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchRuleRegistry.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,8 +30,8 @@ import java.util.Map; import java.util.Map.Entry; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.service.Services; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.service.Services; import com.oracle.graal.compiler.gen.NodeMatchRules; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchStatement.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchStatement.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,7 +26,7 @@ import java.util.List; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.gen.NodeLIRBuilder; import com.oracle.graal.compiler.match.MatchPattern.MatchResultCode;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/HighTier.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/HighTier.java Thu Oct 08 17:41:33 2015 -0700 @@ -33,9 +33,9 @@ import static com.oracle.graal.compiler.common.GraalOptions.PartialEscapeAnalysis; import static com.oracle.graal.compiler.common.GraalOptions.UseGraalInstrumentation; import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.loop.phases.LoopFullUnrollPhase; import com.oracle.graal.loop.phases.LoopPeelingPhase;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LowTier.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/LowTier.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,9 +27,9 @@ import static com.oracle.graal.compiler.common.GraalOptions.OptCanonicalizer; import static com.oracle.graal.compiler.common.GraalOptions.UseGraalInstrumentation; import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.nodes.spi.LoweringTool; import com.oracle.graal.phases.PhaseSuite;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,15 +22,15 @@ */ package com.oracle.graal.compiler.target; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.asm.Assembler; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig;
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java Thu Oct 08 17:41:33 2015 -0700 @@ -40,7 +40,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import jdk.internal.jvmci.service.Services; +import jdk.vm.ci.service.Services; import com.oracle.graal.debug.DelegatingDebugConfig.Level; import com.oracle.graal.debug.internal.DebugHistogramImpl;
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugEnvironment.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugEnvironment.java Thu Oct 08 17:41:33 2015 -0700 @@ -34,8 +34,8 @@ import java.util.ArrayList; import java.util.List; -import jdk.internal.jvmci.runtime.JVMCI; -import jdk.internal.jvmci.service.Services; +import jdk.vm.ci.runtime.JVMCI; +import jdk.vm.ci.service.Services; public class DebugEnvironment {
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/GraalDebugConfig.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/GraalDebugConfig.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,11 +29,11 @@ import java.util.List; import java.util.Set; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.meta.JavaMethod; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.meta.JavaMethod; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; public class GraalDebugConfig implements DebugConfig { @SuppressWarnings("all")
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/JavaMethodContext.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/JavaMethodContext.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.debug; -import jdk.internal.jvmci.meta.JavaMethod; +import jdk.vm.ci.meta.JavaMethod; /** * Interface for objects used in Debug {@linkplain Debug#context() context} that can provide a
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/MethodFilter.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/MethodFilter.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,9 +25,9 @@ import java.util.Arrays; import java.util.regex.Pattern; -import jdk.internal.jvmci.meta.JavaMethod; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.Signature; +import jdk.vm.ci.meta.JavaMethod; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.Signature; /** * This class implements a method filter that can filter based on class name, method name and
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/TTY.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/TTY.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,7 +30,7 @@ import java.util.Map; import java.util.regex.Pattern; -import jdk.internal.jvmci.service.Services; +import jdk.vm.ci.service.Services; /** * A collection of static methods for printing debug and informational output to a global
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/GraalGraphJVMCIError.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/GraalGraphJVMCIError.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.graph; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; /** * This error is the graph/node aware extension of JVMCIError.
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java Thu Oct 08 17:41:33 2015 -0700 @@ -31,10 +31,10 @@ import java.util.Map; import java.util.function.Consumer; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,7 +28,7 @@ import static com.oracle.graal.graph.Node.WithAllEdges; import static com.oracle.graal.graph.Node.newIdentityMap; import static com.oracle.graal.graph.UnsafeAccess.UNSAFE; -import static jdk.internal.jvmci.common.JVMCIError.shouldNotReachHere; +import static jdk.vm.ci.common.JVMCIError.shouldNotReachHere; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; @@ -40,7 +40,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.FieldIntrospection; import com.oracle.graal.compiler.common.Fields;
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/Canonicalizable.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/Canonicalizable.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.graph.spi; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.graph.Graph; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/CanonicalizerTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/spi/CanonicalizerTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.graph.spi; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/ForeignCallPlugin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/ForeignCallPlugin.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.graphbuilderconf; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider;
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/GraphBuilderConfiguration.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/GraphBuilderConfiguration.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.Arrays; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.GraalOptions; import com.oracle.graal.nodes.FullInfopointNode;
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/GraphBuilderContext.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/GraphBuilderContext.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,16 +23,16 @@ package com.oracle.graal.graphbuilderconf; import static com.oracle.graal.compiler.common.type.StampFactory.objectNonNull; -import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; -import static jdk.internal.jvmci.meta.DeoptimizationReason.NullCheckException; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.vm.ci.meta.DeoptimizationReason.NullCheckException; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InlineInvokePlugin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InlineInvokePlugin.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.graphbuilderconf; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.nodes.Invoke; import com.oracle.graal.nodes.ValueNode;
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/IntrinsicContext.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/IntrinsicContext.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,10 +24,10 @@ import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.ROOT_COMPILATION; -import static jdk.internal.jvmci.code.BytecodeFrame.AFTER_BCI; -import static jdk.internal.jvmci.code.BytecodeFrame.BEFORE_BCI; -import static jdk.internal.jvmci.code.BytecodeFrame.INVALID_FRAMESTATE_BCI; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import static jdk.vm.ci.code.BytecodeFrame.AFTER_BCI; +import static jdk.vm.ci.code.BytecodeFrame.BEFORE_BCI; +import static jdk.vm.ci.code.BytecodeFrame.INVALID_FRAMESTATE_BCI; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.nodes.AbstractMergeNode; import com.oracle.graal.nodes.FrameState;
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InvocationPlugin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InvocationPlugin.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,9 +25,9 @@ import java.lang.invoke.MethodHandle; import java.lang.reflect.Method; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.nodes.Invoke; import com.oracle.graal.nodes.ValueNode;
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InvocationPlugins.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InvocationPlugins.java Thu Oct 08 17:41:33 2015 -0700 @@ -35,9 +35,9 @@ import java.util.Map; import java.util.stream.Collectors; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Node; import com.oracle.graal.graph.iterators.NodeIterable;
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/LoopExplosionPlugin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/LoopExplosionPlugin.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.graphbuilderconf; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; public interface LoopExplosionPlugin extends GraphBuilderPlugin { boolean shouldExplodeLoops(ResolvedJavaMethod method);
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/MethodSubstitutionPlugin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/MethodSubstitutionPlugin.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,9 +27,9 @@ import java.util.Arrays; import java.util.stream.Collectors; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; import sun.misc.Launcher; import com.oracle.graal.nodes.ValueNode;
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/NodePlugin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/NodePlugin.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.graphbuilderconf; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaTypeProfile; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Signature; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaTypeProfile; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Signature; import com.oracle.graal.nodes.ValueNode;
--- a/graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,17 +22,17 @@ */ package com.oracle.graal.hotspot.amd64.test; -import static jdk.internal.jvmci.amd64.AMD64.rax; +import static jdk.vm.ci.amd64.AMD64.rax; import java.util.Arrays; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Ignore;
--- a/graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/CompressedNullCheckTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/CompressedNullCheckTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.amd64.test; -import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.OptionValue.OverrideScope; +import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.OptionValue.OverrideScope; import org.junit.Assert; import org.junit.Assume;
--- a/graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/DataPatchInConstantsTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/DataPatchInConstantsTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,10 +25,10 @@ import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.config; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; import org.junit.Assume; import org.junit.Before;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64DeoptimizationStub.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64DeoptimizationStub.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,22 +22,22 @@ */ package com.oracle.graal.hotspot.amd64; -import static jdk.internal.jvmci.amd64.AMD64.r10; -import static jdk.internal.jvmci.amd64.AMD64.r11; -import static jdk.internal.jvmci.amd64.AMD64.r13; -import static jdk.internal.jvmci.amd64.AMD64.r14; -import static jdk.internal.jvmci.amd64.AMD64.r8; -import static jdk.internal.jvmci.amd64.AMD64.r9; -import static jdk.internal.jvmci.amd64.AMD64.rbx; -import static jdk.internal.jvmci.amd64.AMD64.rcx; -import static jdk.internal.jvmci.amd64.AMD64.rdi; -import static jdk.internal.jvmci.amd64.AMD64.rdx; -import static jdk.internal.jvmci.amd64.AMD64.rsi; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.hotspot.amd64.AMD64HotSpotRegisterConfig; +import static jdk.vm.ci.amd64.AMD64.r10; +import static jdk.vm.ci.amd64.AMD64.r11; +import static jdk.vm.ci.amd64.AMD64.r13; +import static jdk.vm.ci.amd64.AMD64.r14; +import static jdk.vm.ci.amd64.AMD64.r8; +import static jdk.vm.ci.amd64.AMD64.r9; +import static jdk.vm.ci.amd64.AMD64.rbx; +import static jdk.vm.ci.amd64.AMD64.rcx; +import static jdk.vm.ci.amd64.AMD64.rdi; +import static jdk.vm.ci.amd64.AMD64.rdx; +import static jdk.vm.ci.amd64.AMD64.rsi; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.hotspot.amd64.AMD64HotSpotRegisterConfig; import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; import com.oracle.graal.hotspot.meta.HotSpotProviders;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,10 +23,10 @@ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.vm.ci.meta.LIRKind; import com.oracle.graal.asm.NumUtil; import com.oracle.graal.asm.amd64.AMD64Address.Scale;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,25 +24,25 @@ import static com.oracle.graal.compiler.common.GraalOptions.CanOmitFrame; import static com.oracle.graal.compiler.common.GraalOptions.ZapStackOnMethodEntry; -import static jdk.internal.jvmci.amd64.AMD64.r10; -import static jdk.internal.jvmci.amd64.AMD64.rax; -import static jdk.internal.jvmci.amd64.AMD64.rsp; -import static jdk.internal.jvmci.code.CallingConvention.Type.JavaCallee; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; +import static jdk.vm.ci.amd64.AMD64.r10; +import static jdk.vm.ci.amd64.AMD64.rax; +import static jdk.vm.ci.amd64.AMD64.rsp; +import static jdk.vm.ci.code.CallingConvention.Type.JavaCallee; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; import java.lang.reflect.Field; import java.util.Set; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import sun.misc.Unsafe; import com.oracle.graal.asm.Assembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,27 +22,27 @@ */ package com.oracle.graal.hotspot.amd64; -import static jdk.internal.jvmci.inittimer.InitTimer.timer; +import static jdk.vm.ci.inittimer.InitTimer.timer; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; -import jdk.internal.jvmci.hotspot.HotSpotConstantReflectionProvider; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.hotspot.HotSpotMetaAccessProvider; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.inittimer.InitTimer; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.runtime.JVMCIBackend; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; +import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.inittimer.InitTimer; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.runtime.JVMCIBackend; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.compiler.amd64.AMD64SuitesProvider;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBinaryConsumer.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBinaryConsumer.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,9 +23,9 @@ package com.oracle.graal.hotspot.amd64; import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.DWORD; -import jdk.internal.jvmci.hotspot.HotSpotConstant; -import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; -import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.vm.ci.hotspot.HotSpotConstant; +import jdk.vm.ci.hotspot.HotSpotObjectConstant; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MIOp; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBytecodeLIRBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBytecodeLIRBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,19 +22,19 @@ */ package com.oracle.graal.hotspot.amd64; -import static jdk.internal.jvmci.amd64.AMD64.rbp; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaField; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Signature; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.amd64.AMD64.rbp; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaField; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Signature; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.gen.BytecodeLIRBuilder; import com.oracle.graal.compiler.gen.BytecodeParserTool;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.Register; +import jdk.vm.ci.code.Register; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot.amd64; -import static jdk.internal.jvmci.amd64.AMD64.rsp; -import jdk.internal.jvmci.code.Register; +import static jdk.vm.ci.amd64.AMD64.rsp; +import jdk.vm.ci.code.Register; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCardTableAddressOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCardTableAddressOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.PlatformKind; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.PlatformKind; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCardTableShiftOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCardTableShiftOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.PlatformKind; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.PlatformKind; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCounterOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCounterOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,16 +24,16 @@ import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.internal.jvmci.amd64.AMD64.rax; -import static jdk.internal.jvmci.amd64.AMD64.rbx; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.common.JVMCIError.unimplemented; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.amd64.AMD64.rax; +import static jdk.vm.ci.amd64.AMD64.rbx; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.common.JVMCIError.unimplemented; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRFrameState;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEnterUnpackFramesStackFrameOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEnterUnpackFramesStackFrameOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,15 +23,15 @@ package com.oracle.graal.hotspot.amd64; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.amd64.AMD64.rax; -import static jdk.internal.jvmci.amd64.AMD64.rbp; -import static jdk.internal.jvmci.amd64.AMD64.rip; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.RegisterSaveLayout; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaKind; +import static jdk.vm.ci.amd64.AMD64.rax; +import static jdk.vm.ci.amd64.AMD64.rbp; +import static jdk.vm.ci.amd64.AMD64.rip; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.RegisterSaveLayout; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEpilogueOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotEpilogueOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,11 +24,11 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.internal.jvmci.amd64.AMD64.rbp; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.AllocatableValue; +import static jdk.vm.ci.amd64.AMD64.rbp; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -32,21 +32,21 @@ import static com.oracle.graal.hotspot.HotSpotHostBackend.DEOPTIMIZATION_HANDLER; import static com.oracle.graal.hotspot.HotSpotHostBackend.UNCOMMON_TRAP_HANDLER; import static com.oracle.graal.hotspot.replacements.CRC32Substitutions.UPDATE_BYTES_CRC32; -import static jdk.internal.jvmci.amd64.AMD64.rax; -import static jdk.internal.jvmci.amd64.AMD64.rdx; -import static jdk.internal.jvmci.code.CallingConvention.Type.NativeCall; -import static jdk.internal.jvmci.meta.LocationIdentity.any; -import static jdk.internal.jvmci.meta.Value.ILLEGAL; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.amd64.AMD64.rax; +import static jdk.vm.ci.amd64.AMD64.rdx; +import static jdk.vm.ci.code.CallingConvention.Type.NativeCall; +import static jdk.vm.ci.meta.LocationIdentity.any; +import static jdk.vm.ci.meta.Value.ILLEGAL; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.hotspot.HotSpotForeignCallLinkageImpl; import com.oracle.graal.hotspot.HotSpotGraalRuntimeProvider;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,11 +23,11 @@ package com.oracle.graal.hotspot.amd64; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.amd64.AMD64.rbp; -import static jdk.internal.jvmci.amd64.AMD64.rsp; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.AllocatableValue; +import static jdk.vm.ci.amd64.AMD64.rbp; +import static jdk.vm.ci.amd64.AMD64.rsp; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64Assembler.ConditionFlag;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerationResult.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerationResult.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.Map; -import jdk.internal.jvmci.code.StackSlot; +import jdk.vm.ci.code.StackSlot; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.hotspot.stubs.Stub;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,38 +30,38 @@ import static com.oracle.graal.hotspot.HotSpotBackend.UNCOMMON_TRAP; import static com.oracle.graal.lir.LIRValueUtil.asConstant; import static com.oracle.graal.lir.LIRValueUtil.isConstantValue; -import static jdk.internal.jvmci.amd64.AMD64.rbp; +import static jdk.vm.ci.amd64.AMD64.rbp; import java.util.ArrayList; import java.util.List; import java.util.Map; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotCompressedNullConstant; -import jdk.internal.jvmci.hotspot.HotSpotConstant; -import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; -import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.PrimitiveConstant; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotCompressedNullConstant; +import jdk.vm.ci.hotspot.HotSpotConstant; +import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; +import jdk.vm.ci.hotspot.HotSpotObjectConstant; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.PrimitiveConstant; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64Address.Scale; import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MIOp;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRKindTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRKindTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.meta.LIRKind; import com.oracle.graal.compiler.amd64.AMD64LIRKindTool; import com.oracle.graal.hotspot.nodes.type.HotSpotLIRKindTool;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveCurrentStackFrameOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveCurrentStackFrameOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.hotspot.amd64; -import static jdk.internal.jvmci.amd64.AMD64.rdx; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.RegisterSaveLayout; -import jdk.internal.jvmci.meta.JavaKind; +import static jdk.vm.ci.amd64.AMD64.rdx; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.RegisterSaveLayout; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveDeoptimizedStackFrameOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveDeoptimizedStackFrameOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,10 +23,10 @@ package com.oracle.graal.hotspot.amd64; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.amd64.AMD64.rbp; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.AllocatableValue; +import static jdk.vm.ci.amd64.AMD64.rbp; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveUnpackFramesStackFrameOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLeaveUnpackFramesStackFrameOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.RegisterSaveLayout; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.RegisterSaveLayout; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotMove.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotMove.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,17 +26,17 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; -import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; +import jdk.vm.ci.hotspot.HotSpotObjectConstant; +import jdk.vm.ci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; import com.oracle.graal.asm.Label; import com.oracle.graal.asm.amd64.AMD64Address;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,21 +23,21 @@ package com.oracle.graal.hotspot.amd64; import static com.oracle.graal.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER; -import static jdk.internal.jvmci.amd64.AMD64.rbp; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.amd64.AMD64.rbp; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.amd64.AMD64NodeLIRBuilder; import com.oracle.graal.compiler.amd64.AMD64NodeMatchRules;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,9 +23,9 @@ package com.oracle.graal.hotspot.amd64; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.amd64.AMD64.rsp; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.meta.AllocatableValue; +import static jdk.vm.ci.amd64.AMD64.rsp; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,11 +23,11 @@ package com.oracle.graal.hotspot.amd64; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.amd64.AMD64.rsp; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.AllocatableValue; +import static jdk.vm.ci.amd64.AMD64.rsp; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,42 +22,42 @@ */ package com.oracle.graal.hotspot.amd64; -import static jdk.internal.jvmci.amd64.AMD64.r10; -import static jdk.internal.jvmci.amd64.AMD64.r11; -import static jdk.internal.jvmci.amd64.AMD64.r12; -import static jdk.internal.jvmci.amd64.AMD64.r13; -import static jdk.internal.jvmci.amd64.AMD64.r14; -import static jdk.internal.jvmci.amd64.AMD64.r8; -import static jdk.internal.jvmci.amd64.AMD64.r9; -import static jdk.internal.jvmci.amd64.AMD64.rax; -import static jdk.internal.jvmci.amd64.AMD64.rbp; -import static jdk.internal.jvmci.amd64.AMD64.rbx; -import static jdk.internal.jvmci.amd64.AMD64.rcx; -import static jdk.internal.jvmci.amd64.AMD64.rdi; -import static jdk.internal.jvmci.amd64.AMD64.rdx; -import static jdk.internal.jvmci.amd64.AMD64.rsi; -import static jdk.internal.jvmci.amd64.AMD64.xmm0; -import static jdk.internal.jvmci.amd64.AMD64.xmm1; -import static jdk.internal.jvmci.amd64.AMD64.xmm10; -import static jdk.internal.jvmci.amd64.AMD64.xmm11; -import static jdk.internal.jvmci.amd64.AMD64.xmm12; -import static jdk.internal.jvmci.amd64.AMD64.xmm13; -import static jdk.internal.jvmci.amd64.AMD64.xmm14; -import static jdk.internal.jvmci.amd64.AMD64.xmm15; -import static jdk.internal.jvmci.amd64.AMD64.xmm2; -import static jdk.internal.jvmci.amd64.AMD64.xmm3; -import static jdk.internal.jvmci.amd64.AMD64.xmm4; -import static jdk.internal.jvmci.amd64.AMD64.xmm5; -import static jdk.internal.jvmci.amd64.AMD64.xmm6; -import static jdk.internal.jvmci.amd64.AMD64.xmm7; -import static jdk.internal.jvmci.amd64.AMD64.xmm8; -import static jdk.internal.jvmci.amd64.AMD64.xmm9; +import static jdk.vm.ci.amd64.AMD64.r10; +import static jdk.vm.ci.amd64.AMD64.r11; +import static jdk.vm.ci.amd64.AMD64.r12; +import static jdk.vm.ci.amd64.AMD64.r13; +import static jdk.vm.ci.amd64.AMD64.r14; +import static jdk.vm.ci.amd64.AMD64.r8; +import static jdk.vm.ci.amd64.AMD64.r9; +import static jdk.vm.ci.amd64.AMD64.rax; +import static jdk.vm.ci.amd64.AMD64.rbp; +import static jdk.vm.ci.amd64.AMD64.rbx; +import static jdk.vm.ci.amd64.AMD64.rcx; +import static jdk.vm.ci.amd64.AMD64.rdi; +import static jdk.vm.ci.amd64.AMD64.rdx; +import static jdk.vm.ci.amd64.AMD64.rsi; +import static jdk.vm.ci.amd64.AMD64.xmm0; +import static jdk.vm.ci.amd64.AMD64.xmm1; +import static jdk.vm.ci.amd64.AMD64.xmm10; +import static jdk.vm.ci.amd64.AMD64.xmm11; +import static jdk.vm.ci.amd64.AMD64.xmm12; +import static jdk.vm.ci.amd64.AMD64.xmm13; +import static jdk.vm.ci.amd64.AMD64.xmm14; +import static jdk.vm.ci.amd64.AMD64.xmm15; +import static jdk.vm.ci.amd64.AMD64.xmm2; +import static jdk.vm.ci.amd64.AMD64.xmm3; +import static jdk.vm.ci.amd64.AMD64.xmm4; +import static jdk.vm.ci.amd64.AMD64.xmm5; +import static jdk.vm.ci.amd64.AMD64.xmm6; +import static jdk.vm.ci.amd64.AMD64.xmm7; +import static jdk.vm.ci.amd64.AMD64.xmm8; +import static jdk.vm.ci.amd64.AMD64.xmm9; import java.util.ArrayList; import java.util.BitSet; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; import com.oracle.graal.lir.Variable;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotReturnOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotReturnOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,17 +24,17 @@ import static com.oracle.graal.asm.NumUtil.isInt; import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; -import static jdk.internal.jvmci.amd64.AMD64.rax; -import static jdk.internal.jvmci.amd64.AMD64.rip; -import jdk.internal.jvmci.code.InfopointReason; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.amd64.AMD64.rax; +import static jdk.vm.ci.amd64.AMD64.rip; +import jdk.vm.ci.code.InfopointReason; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,11 +24,11 @@ import static com.oracle.graal.hotspot.HotSpotBackend.UNWIND_EXCEPTION_TO_CALLER; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.amd64.AMD64.rsp; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterValue; +import static jdk.vm.ci.amd64.AMD64.rsp; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterValue; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRFrameState;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64IndirectCallOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64IndirectCallOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,12 +23,12 @@ package com.oracle.graal.hotspot.amd64; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRFrameState;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64PrefetchOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64PrefetchOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ package com.oracle.graal.hotspot.amd64; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64RawNativeCallNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64RawNativeCallNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,13 +22,13 @@ */ package com.oracle.graal.hotspot.amd64; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CallingConvention.Type; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CallingConvention.Type; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.amd64.AMD64NodeLIRBuilder; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64TailcallOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64TailcallOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.amd64; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64UncommonTrapStub.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64UncommonTrapStub.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,22 +22,22 @@ */ package com.oracle.graal.hotspot.amd64; -import static jdk.internal.jvmci.amd64.AMD64.r10; -import static jdk.internal.jvmci.amd64.AMD64.r11; -import static jdk.internal.jvmci.amd64.AMD64.r13; -import static jdk.internal.jvmci.amd64.AMD64.r14; -import static jdk.internal.jvmci.amd64.AMD64.r8; -import static jdk.internal.jvmci.amd64.AMD64.r9; -import static jdk.internal.jvmci.amd64.AMD64.rbx; -import static jdk.internal.jvmci.amd64.AMD64.rcx; -import static jdk.internal.jvmci.amd64.AMD64.rdi; -import static jdk.internal.jvmci.amd64.AMD64.rdx; -import static jdk.internal.jvmci.amd64.AMD64.rsi; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.hotspot.amd64.AMD64HotSpotRegisterConfig; +import static jdk.vm.ci.amd64.AMD64.r10; +import static jdk.vm.ci.amd64.AMD64.r11; +import static jdk.vm.ci.amd64.AMD64.r13; +import static jdk.vm.ci.amd64.AMD64.r14; +import static jdk.vm.ci.amd64.AMD64.r8; +import static jdk.vm.ci.amd64.AMD64.r9; +import static jdk.vm.ci.amd64.AMD64.rbx; +import static jdk.vm.ci.amd64.AMD64.rcx; +import static jdk.vm.ci.amd64.AMD64.rdi; +import static jdk.vm.ci.amd64.AMD64.rdx; +import static jdk.vm.ci.amd64.AMD64.rsi; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.hotspot.amd64.AMD64HotSpotRegisterConfig; import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; import com.oracle.graal.hotspot.meta.HotSpotProviders;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCDeoptimizationStub.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCDeoptimizationStub.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,19 +22,19 @@ */ package com.oracle.graal.hotspot.sparc; -import static jdk.internal.jvmci.sparc.SPARC.g1; -import static jdk.internal.jvmci.sparc.SPARC.g3; -import static jdk.internal.jvmci.sparc.SPARC.g4; -import static jdk.internal.jvmci.sparc.SPARC.g5; -import static jdk.internal.jvmci.sparc.SPARC.o0; -import static jdk.internal.jvmci.sparc.SPARC.o1; -import static jdk.internal.jvmci.sparc.SPARC.o2; -import static jdk.internal.jvmci.sparc.SPARC.o3; -import static jdk.internal.jvmci.sparc.SPARC.o4; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.hotspot.sparc.SPARCHotSpotRegisterConfig; +import static jdk.vm.ci.sparc.SPARC.g1; +import static jdk.vm.ci.sparc.SPARC.g3; +import static jdk.vm.ci.sparc.SPARC.g4; +import static jdk.vm.ci.sparc.SPARC.g5; +import static jdk.vm.ci.sparc.SPARC.o0; +import static jdk.vm.ci.sparc.SPARC.o1; +import static jdk.vm.ci.sparc.SPARC.o2; +import static jdk.vm.ci.sparc.SPARC.o3; +import static jdk.vm.ci.sparc.SPARC.o4; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.sparc.SPARCHotSpotRegisterConfig; import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; import com.oracle.graal.hotspot.meta.HotSpotProviders;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCDeoptimizeOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCDeoptimizeOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,10 +23,10 @@ package com.oracle.graal.hotspot.sparc; import static com.oracle.graal.hotspot.HotSpotHostBackend.UNCOMMON_TRAP_HANDLER; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.sparc.SPARC; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.sparc.SPARC; import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.lir.LIRFrameState;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,14 +27,14 @@ import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.Xcc; import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.NotEqual; import static com.oracle.graal.compiler.common.GraalOptions.ZapStackOnMethodEntry; -import static jdk.internal.jvmci.code.CallingConvention.Type.JavaCall; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import static jdk.internal.jvmci.sparc.SPARC.g5; -import static jdk.internal.jvmci.sparc.SPARC.isGlobalRegister; -import static jdk.internal.jvmci.sparc.SPARC.sp; +import static jdk.vm.ci.code.CallingConvention.Type.JavaCall; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; +import static jdk.vm.ci.sparc.SPARC.g0; +import static jdk.vm.ci.sparc.SPARC.g5; +import static jdk.vm.ci.sparc.SPARC.isGlobalRegister; +import static jdk.vm.ci.sparc.SPARC.sp; import java.lang.reflect.Field; import java.util.HashSet; @@ -43,16 +43,16 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.DataSection; -import jdk.internal.jvmci.code.DataSection.Data; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.DataSection; +import jdk.vm.ci.code.DataSection.Data; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import sun.misc.Unsafe; import com.oracle.graal.asm.Assembler;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackendFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackendFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,20 +26,20 @@ import java.util.HashSet; import java.util.Set; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; -import jdk.internal.jvmci.hotspot.HotSpotConstantReflectionProvider; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.hotspot.HotSpotMetaAccessProvider; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.runtime.JVMCIBackend; -import jdk.internal.jvmci.service.ServiceProvider; -import jdk.internal.jvmci.sparc.SPARC; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; +import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.hotspot.HotSpotMetaAccessProvider; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.runtime.JVMCIBackend; +import jdk.vm.ci.service.ServiceProvider; +import jdk.vm.ci.sparc.SPARC; import com.oracle.graal.compiler.sparc.SPARCAddressLowering; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCRuntimeCallEpilogueOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCRuntimeCallEpilogueOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,11 +24,11 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import static jdk.internal.jvmci.sparc.SPARCKind.DWORD; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.sparc.SPARC.g0; +import static jdk.vm.ci.sparc.SPARCKind.DWORD; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.sparc.SPARCAddress; import com.oracle.graal.asm.sparc.SPARCMacroAssembler;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCRuntimeCallPrologueOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCRuntimeCallPrologueOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,13 +24,13 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.sparc.SPARC.STACK_BIAS; -import static jdk.internal.jvmci.sparc.SPARCKind.DWORD; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.sparc.SPARC.STACK_BIAS; +import static jdk.vm.ci.sparc.SPARCKind.DWORD; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.sparc.SPARCAddress; import com.oracle.graal.asm.sparc.SPARCMacroAssembler;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCounterOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotCounterOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,11 +25,11 @@ import static com.oracle.graal.asm.sparc.SPARCAssembler.isSimm13; import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.Assembler; import com.oracle.graal.asm.sparc.SPARCAddress;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotDeoptimizeCallerOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotDeoptimizeCallerOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,7 +23,7 @@ package com.oracle.graal.hotspot.sparc; import static com.oracle.graal.hotspot.HotSpotHostBackend.UNCOMMON_TRAP_HANDLER; -import jdk.internal.jvmci.code.Register; +import jdk.vm.ci.code.Register; import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.ScratchRegister;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotEnterUnpackFramesStackFrameOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotEnterUnpackFramesStackFrameOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,27 +23,27 @@ package com.oracle.graal.hotspot.sparc; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.meta.LIRKind.value; -import static jdk.internal.jvmci.sparc.SPARC.STACK_BIAS; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import static jdk.internal.jvmci.sparc.SPARC.i0; -import static jdk.internal.jvmci.sparc.SPARC.i1; -import static jdk.internal.jvmci.sparc.SPARC.i2; -import static jdk.internal.jvmci.sparc.SPARC.i3; -import static jdk.internal.jvmci.sparc.SPARC.i4; -import static jdk.internal.jvmci.sparc.SPARC.l7; -import static jdk.internal.jvmci.sparc.SPARC.o0; -import static jdk.internal.jvmci.sparc.SPARC.o1; -import static jdk.internal.jvmci.sparc.SPARC.o2; -import static jdk.internal.jvmci.sparc.SPARC.o3; -import static jdk.internal.jvmci.sparc.SPARC.o4; -import static jdk.internal.jvmci.sparc.SPARC.o5; -import static jdk.internal.jvmci.sparc.SPARC.o7; -import static jdk.internal.jvmci.sparc.SPARC.sp; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.PlatformKind; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.meta.LIRKind.value; +import static jdk.vm.ci.sparc.SPARC.STACK_BIAS; +import static jdk.vm.ci.sparc.SPARC.g0; +import static jdk.vm.ci.sparc.SPARC.i0; +import static jdk.vm.ci.sparc.SPARC.i1; +import static jdk.vm.ci.sparc.SPARC.i2; +import static jdk.vm.ci.sparc.SPARC.i3; +import static jdk.vm.ci.sparc.SPARC.i4; +import static jdk.vm.ci.sparc.SPARC.l7; +import static jdk.vm.ci.sparc.SPARC.o0; +import static jdk.vm.ci.sparc.SPARC.o1; +import static jdk.vm.ci.sparc.SPARC.o2; +import static jdk.vm.ci.sparc.SPARC.o3; +import static jdk.vm.ci.sparc.SPARC.o4; +import static jdk.vm.ci.sparc.SPARC.o5; +import static jdk.vm.ci.sparc.SPARC.o7; +import static jdk.vm.ci.sparc.SPARC.sp; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.PlatformKind; import com.oracle.graal.asm.sparc.SPARCAddress; import com.oracle.graal.asm.sparc.SPARCMacroAssembler;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotForeignCallsProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotForeignCallsProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -31,22 +31,22 @@ import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.Transition.LEAF_NOFP; import static com.oracle.graal.hotspot.HotSpotHostBackend.DEOPTIMIZATION_HANDLER; import static com.oracle.graal.hotspot.HotSpotHostBackend.UNCOMMON_TRAP_HANDLER; -import static jdk.internal.jvmci.meta.LocationIdentity.any; -import static jdk.internal.jvmci.meta.Value.ILLEGAL; -import static jdk.internal.jvmci.sparc.SPARC.i0; -import static jdk.internal.jvmci.sparc.SPARC.i1; -import static jdk.internal.jvmci.sparc.SPARC.o0; -import static jdk.internal.jvmci.sparc.SPARC.o1; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.meta.LocationIdentity.any; +import static jdk.vm.ci.meta.Value.ILLEGAL; +import static jdk.vm.ci.sparc.SPARC.i0; +import static jdk.vm.ci.sparc.SPARC.i1; +import static jdk.vm.ci.sparc.SPARC.o0; +import static jdk.vm.ci.sparc.SPARC.o1; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.hotspot.HotSpotForeignCallLinkageImpl; import com.oracle.graal.hotspot.HotSpotGraalRuntimeProvider;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerInCallerOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerInCallerOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,15 +23,15 @@ package com.oracle.graal.hotspot.sparc; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import static jdk.internal.jvmci.sparc.SPARC.i0; -import static jdk.internal.jvmci.sparc.SPARC.i1; -import static jdk.internal.jvmci.sparc.SPARC.i2; -import static jdk.internal.jvmci.sparc.SPARC.l7; -import static jdk.internal.jvmci.sparc.SPARC.sp; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.AllocatableValue; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.sparc.SPARC.g0; +import static jdk.vm.ci.sparc.SPARC.i0; +import static jdk.vm.ci.sparc.SPARC.i1; +import static jdk.vm.ci.sparc.SPARC.i2; +import static jdk.vm.ci.sparc.SPARC.l7; +import static jdk.vm.ci.sparc.SPARC.sp; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.sparc.SPARCAddress; import com.oracle.graal.asm.sparc.SPARCAssembler.CC;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotJumpToExceptionHandlerOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,10 +23,10 @@ package com.oracle.graal.hotspot.sparc; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.sparc.SPARCKind; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.sparc.SPARCKind; import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerationResult.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerationResult.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; -import jdk.internal.jvmci.code.StackSlot; +import jdk.vm.ci.code.StackSlot; import com.oracle.graal.hotspot.stubs.Stub; import com.oracle.graal.lir.LIR;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerator.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerator.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,72 +28,72 @@ import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; import static com.oracle.graal.lir.LIRValueUtil.isConstantValue; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.internal.jvmci.hotspot.HotSpotCompressedNullConstant.COMPRESSED_NULL; -import static jdk.internal.jvmci.meta.JavaConstant.INT_0; -import static jdk.internal.jvmci.sparc.SPARC.d32; -import static jdk.internal.jvmci.sparc.SPARC.d34; -import static jdk.internal.jvmci.sparc.SPARC.d36; -import static jdk.internal.jvmci.sparc.SPARC.d38; -import static jdk.internal.jvmci.sparc.SPARC.d40; -import static jdk.internal.jvmci.sparc.SPARC.d42; -import static jdk.internal.jvmci.sparc.SPARC.d44; -import static jdk.internal.jvmci.sparc.SPARC.d46; -import static jdk.internal.jvmci.sparc.SPARC.d48; -import static jdk.internal.jvmci.sparc.SPARC.d50; -import static jdk.internal.jvmci.sparc.SPARC.d52; -import static jdk.internal.jvmci.sparc.SPARC.d54; -import static jdk.internal.jvmci.sparc.SPARC.d56; -import static jdk.internal.jvmci.sparc.SPARC.d58; -import static jdk.internal.jvmci.sparc.SPARC.d60; -import static jdk.internal.jvmci.sparc.SPARC.d62; -import static jdk.internal.jvmci.sparc.SPARC.f0; -import static jdk.internal.jvmci.sparc.SPARC.f10; -import static jdk.internal.jvmci.sparc.SPARC.f12; -import static jdk.internal.jvmci.sparc.SPARC.f14; -import static jdk.internal.jvmci.sparc.SPARC.f16; -import static jdk.internal.jvmci.sparc.SPARC.f18; -import static jdk.internal.jvmci.sparc.SPARC.f2; -import static jdk.internal.jvmci.sparc.SPARC.f20; -import static jdk.internal.jvmci.sparc.SPARC.f22; -import static jdk.internal.jvmci.sparc.SPARC.f24; -import static jdk.internal.jvmci.sparc.SPARC.f26; -import static jdk.internal.jvmci.sparc.SPARC.f28; -import static jdk.internal.jvmci.sparc.SPARC.f30; -import static jdk.internal.jvmci.sparc.SPARC.f4; -import static jdk.internal.jvmci.sparc.SPARC.f6; -import static jdk.internal.jvmci.sparc.SPARC.f8; -import static jdk.internal.jvmci.sparc.SPARC.g1; -import static jdk.internal.jvmci.sparc.SPARC.g3; -import static jdk.internal.jvmci.sparc.SPARC.g4; -import static jdk.internal.jvmci.sparc.SPARC.g5; -import static jdk.internal.jvmci.sparc.SPARCKind.DWORD; -import static jdk.internal.jvmci.sparc.SPARCKind.WORD; +import static jdk.vm.ci.hotspot.HotSpotCompressedNullConstant.COMPRESSED_NULL; +import static jdk.vm.ci.meta.JavaConstant.INT_0; +import static jdk.vm.ci.sparc.SPARC.d32; +import static jdk.vm.ci.sparc.SPARC.d34; +import static jdk.vm.ci.sparc.SPARC.d36; +import static jdk.vm.ci.sparc.SPARC.d38; +import static jdk.vm.ci.sparc.SPARC.d40; +import static jdk.vm.ci.sparc.SPARC.d42; +import static jdk.vm.ci.sparc.SPARC.d44; +import static jdk.vm.ci.sparc.SPARC.d46; +import static jdk.vm.ci.sparc.SPARC.d48; +import static jdk.vm.ci.sparc.SPARC.d50; +import static jdk.vm.ci.sparc.SPARC.d52; +import static jdk.vm.ci.sparc.SPARC.d54; +import static jdk.vm.ci.sparc.SPARC.d56; +import static jdk.vm.ci.sparc.SPARC.d58; +import static jdk.vm.ci.sparc.SPARC.d60; +import static jdk.vm.ci.sparc.SPARC.d62; +import static jdk.vm.ci.sparc.SPARC.f0; +import static jdk.vm.ci.sparc.SPARC.f10; +import static jdk.vm.ci.sparc.SPARC.f12; +import static jdk.vm.ci.sparc.SPARC.f14; +import static jdk.vm.ci.sparc.SPARC.f16; +import static jdk.vm.ci.sparc.SPARC.f18; +import static jdk.vm.ci.sparc.SPARC.f2; +import static jdk.vm.ci.sparc.SPARC.f20; +import static jdk.vm.ci.sparc.SPARC.f22; +import static jdk.vm.ci.sparc.SPARC.f24; +import static jdk.vm.ci.sparc.SPARC.f26; +import static jdk.vm.ci.sparc.SPARC.f28; +import static jdk.vm.ci.sparc.SPARC.f30; +import static jdk.vm.ci.sparc.SPARC.f4; +import static jdk.vm.ci.sparc.SPARC.f6; +import static jdk.vm.ci.sparc.SPARC.f8; +import static jdk.vm.ci.sparc.SPARC.g1; +import static jdk.vm.ci.sparc.SPARC.g3; +import static jdk.vm.ci.sparc.SPARC.g4; +import static jdk.vm.ci.sparc.SPARC.g5; +import static jdk.vm.ci.sparc.SPARCKind.DWORD; +import static jdk.vm.ci.sparc.SPARCKind.WORD; import java.util.Map; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotCompressedNullConstant; -import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; -import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.sparc.SPARC; -import jdk.internal.jvmci.sparc.SPARCKind; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotCompressedNullConstant; +import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; +import jdk.vm.ci.hotspot.HotSpotObjectConstant; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.sparc.SPARC; +import jdk.vm.ci.sparc.SPARCKind; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.spi.ForeignCallLinkage;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRKindTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRKindTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.sparc.SPARCKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.sparc.SPARCKind; import com.oracle.graal.compiler.sparc.SPARCLIRKindTool; import com.oracle.graal.hotspot.nodes.type.HotSpotLIRKindTool;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLeaveCurrentStackFrameOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLeaveCurrentStackFrameOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,16 +22,16 @@ */ package com.oracle.graal.hotspot.sparc; -import static jdk.internal.jvmci.sparc.SPARC.i0; -import static jdk.internal.jvmci.sparc.SPARC.i1; -import static jdk.internal.jvmci.sparc.SPARC.i2; -import static jdk.internal.jvmci.sparc.SPARC.i3; -import static jdk.internal.jvmci.sparc.SPARC.i4; -import static jdk.internal.jvmci.sparc.SPARC.o0; -import static jdk.internal.jvmci.sparc.SPARC.o1; -import static jdk.internal.jvmci.sparc.SPARC.o2; -import static jdk.internal.jvmci.sparc.SPARC.o3; -import static jdk.internal.jvmci.sparc.SPARC.o4; +import static jdk.vm.ci.sparc.SPARC.i0; +import static jdk.vm.ci.sparc.SPARC.i1; +import static jdk.vm.ci.sparc.SPARC.i2; +import static jdk.vm.ci.sparc.SPARC.i3; +import static jdk.vm.ci.sparc.SPARC.i4; +import static jdk.vm.ci.sparc.SPARC.o0; +import static jdk.vm.ci.sparc.SPARC.o1; +import static jdk.vm.ci.sparc.SPARC.o2; +import static jdk.vm.ci.sparc.SPARC.o3; +import static jdk.vm.ci.sparc.SPARC.o4; import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLeaveDeoptimizedStackFrameOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLeaveDeoptimizedStackFrameOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,16 +22,16 @@ */ package com.oracle.graal.hotspot.sparc; -import static jdk.internal.jvmci.sparc.SPARC.i0; -import static jdk.internal.jvmci.sparc.SPARC.i1; -import static jdk.internal.jvmci.sparc.SPARC.i2; -import static jdk.internal.jvmci.sparc.SPARC.i3; -import static jdk.internal.jvmci.sparc.SPARC.i4; -import static jdk.internal.jvmci.sparc.SPARC.o0; -import static jdk.internal.jvmci.sparc.SPARC.o1; -import static jdk.internal.jvmci.sparc.SPARC.o2; -import static jdk.internal.jvmci.sparc.SPARC.o3; -import static jdk.internal.jvmci.sparc.SPARC.o4; +import static jdk.vm.ci.sparc.SPARC.i0; +import static jdk.vm.ci.sparc.SPARC.i1; +import static jdk.vm.ci.sparc.SPARC.i2; +import static jdk.vm.ci.sparc.SPARC.i3; +import static jdk.vm.ci.sparc.SPARC.i4; +import static jdk.vm.ci.sparc.SPARC.o0; +import static jdk.vm.ci.sparc.SPARC.o1; +import static jdk.vm.ci.sparc.SPARC.o2; +import static jdk.vm.ci.sparc.SPARC.o3; +import static jdk.vm.ci.sparc.SPARC.o4; import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLeaveUnpackFramesStackFrameOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLeaveUnpackFramesStackFrameOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.sparc; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import static jdk.internal.jvmci.sparc.SPARC.i0; -import static jdk.internal.jvmci.sparc.SPARC.l7; -import jdk.internal.jvmci.code.Register; +import static jdk.vm.ci.sparc.SPARC.g0; +import static jdk.vm.ci.sparc.SPARC.i0; +import static jdk.vm.ci.sparc.SPARC.l7; +import jdk.vm.ci.code.Register; import com.oracle.graal.asm.sparc.SPARCAddress; import com.oracle.graal.asm.sparc.SPARCMacroAssembler;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLoweringProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLoweringProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotMove.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotMove.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,10 +24,10 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; -import jdk.internal.jvmci.meta.AllocatableValue; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.Label; import com.oracle.graal.asm.sparc.SPARCAssembler.Annul;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotNodeLIRBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotNodeLIRBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,18 +23,18 @@ package com.oracle.graal.hotspot.sparc; import static com.oracle.graal.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER; -import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; -import static jdk.internal.jvmci.sparc.SPARC.g5; -import static jdk.internal.jvmci.sparc.SPARC.o7; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.sparc.SPARCKind; +import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; +import static jdk.vm.ci.sparc.SPARC.g5; +import static jdk.vm.ci.sparc.SPARC.o7; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.sparc.SPARCKind; import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; import com.oracle.graal.compiler.gen.DebugInfoBuilder;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotPatchReturnAddressOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotPatchReturnAddressOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,11 +23,11 @@ package com.oracle.graal.hotspot.sparc; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.sparc.SPARC.i7; -import static jdk.internal.jvmci.sparc.SPARCKind.DWORD; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.AllocatableValue; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.sparc.SPARC.i7; +import static jdk.vm.ci.sparc.SPARCKind.DWORD; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.sparc.SPARCAssembler; import com.oracle.graal.asm.sparc.SPARCMacroAssembler;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotPushInterpreterFrameOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotPushInterpreterFrameOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,22 +23,22 @@ package com.oracle.graal.hotspot.sparc; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.sparc.SPARC.i0; -import static jdk.internal.jvmci.sparc.SPARC.i1; -import static jdk.internal.jvmci.sparc.SPARC.i2; -import static jdk.internal.jvmci.sparc.SPARC.i3; -import static jdk.internal.jvmci.sparc.SPARC.i4; -import static jdk.internal.jvmci.sparc.SPARC.i7; -import static jdk.internal.jvmci.sparc.SPARC.o0; -import static jdk.internal.jvmci.sparc.SPARC.o1; -import static jdk.internal.jvmci.sparc.SPARC.o2; -import static jdk.internal.jvmci.sparc.SPARC.o3; -import static jdk.internal.jvmci.sparc.SPARC.o4; -import static jdk.internal.jvmci.sparc.SPARC.o5; -import static jdk.internal.jvmci.sparc.SPARC.sp; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.AllocatableValue; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.sparc.SPARC.i0; +import static jdk.vm.ci.sparc.SPARC.i1; +import static jdk.vm.ci.sparc.SPARC.i2; +import static jdk.vm.ci.sparc.SPARC.i3; +import static jdk.vm.ci.sparc.SPARC.i4; +import static jdk.vm.ci.sparc.SPARC.i7; +import static jdk.vm.ci.sparc.SPARC.o0; +import static jdk.vm.ci.sparc.SPARC.o1; +import static jdk.vm.ci.sparc.SPARC.o2; +import static jdk.vm.ci.sparc.SPARC.o3; +import static jdk.vm.ci.sparc.SPARC.o4; +import static jdk.vm.ci.sparc.SPARC.o5; +import static jdk.vm.ci.sparc.SPARC.sp; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotReturnOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotReturnOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotSafepointOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotSafepointOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,13 +22,13 @@ */ package com.oracle.graal.hotspot.sparc; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import jdk.internal.jvmci.code.InfopointReason; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.AllocatableValue; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.sparc.SPARC.g0; +import jdk.vm.ci.code.InfopointReason; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.sparc.SPARCAddress; import com.oracle.graal.asm.sparc.SPARCMacroAssembler;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotStrategySwitchOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotStrategySwitchOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,15 +26,15 @@ import static com.oracle.graal.asm.sparc.SPARCAssembler.Annul.ANNUL; import static com.oracle.graal.asm.sparc.SPARCAssembler.BranchPredict.PREDICT_TAKEN; import static com.oracle.graal.lir.sparc.SPARCMove.loadFromConstantTable; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.sparc.SPARC; -import jdk.internal.jvmci.sparc.SPARC.CPUFeature; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.sparc.SPARC.g0; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.sparc.SPARC; +import jdk.vm.ci.sparc.SPARC.CPUFeature; import com.oracle.graal.asm.Assembler.LabelHint; import com.oracle.graal.asm.Label;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotUnwindOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotUnwindOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,14 +24,14 @@ import static com.oracle.graal.hotspot.HotSpotBackend.UNWIND_EXCEPTION_TO_CALLER; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.sparc.SPARC.g5; -import static jdk.internal.jvmci.sparc.SPARC.i0; -import static jdk.internal.jvmci.sparc.SPARC.o0; -import static jdk.internal.jvmci.sparc.SPARC.o7; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterValue; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.sparc.SPARC.g5; +import static jdk.vm.ci.sparc.SPARC.i0; +import static jdk.vm.ci.sparc.SPARC.o0; +import static jdk.vm.ci.sparc.SPARC.o7; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterValue; import com.oracle.graal.asm.sparc.SPARCAssembler; import com.oracle.graal.asm.sparc.SPARCMacroAssembler;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotspotDirectStaticCallOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotspotDirectStaticCallOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.sparc; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.lir.LIRFrameState;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotspotDirectVirtualCallOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotspotDirectVirtualCallOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.hotspot.sparc; -import static jdk.internal.jvmci.sparc.SPARC.g5; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.sparc.SPARC.g5; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.asm.sparc.SPARCMacroAssembler.Setx;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCIndirectCallOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCIndirectCallOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,12 +23,12 @@ package com.oracle.graal.hotspot.sparc; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.sparc.SPARC.g5; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.sparc.SPARC.g5; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.lir.LIRFrameState;
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCUncommonTrapStub.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCUncommonTrapStub.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,19 +22,19 @@ */ package com.oracle.graal.hotspot.sparc; -import static jdk.internal.jvmci.sparc.SPARC.g1; -import static jdk.internal.jvmci.sparc.SPARC.g3; -import static jdk.internal.jvmci.sparc.SPARC.g4; -import static jdk.internal.jvmci.sparc.SPARC.g5; -import static jdk.internal.jvmci.sparc.SPARC.o0; -import static jdk.internal.jvmci.sparc.SPARC.o1; -import static jdk.internal.jvmci.sparc.SPARC.o2; -import static jdk.internal.jvmci.sparc.SPARC.o3; -import static jdk.internal.jvmci.sparc.SPARC.o4; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.hotspot.sparc.SPARCHotSpotRegisterConfig; +import static jdk.vm.ci.sparc.SPARC.g1; +import static jdk.vm.ci.sparc.SPARC.g3; +import static jdk.vm.ci.sparc.SPARC.g4; +import static jdk.vm.ci.sparc.SPARC.g5; +import static jdk.vm.ci.sparc.SPARC.o0; +import static jdk.vm.ci.sparc.SPARC.o1; +import static jdk.vm.ci.sparc.SPARC.o2; +import static jdk.vm.ci.sparc.SPARC.o3; +import static jdk.vm.ci.sparc.SPARC.o4; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.sparc.SPARCHotSpotRegisterConfig; import com.oracle.graal.hotspot.HotSpotForeignCallLinkage; import com.oracle.graal.hotspot.meta.HotSpotProviders;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,16 +26,16 @@ import static com.oracle.graal.compiler.GraalCompiler.getProfilingInfo; import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; import static com.oracle.graal.nodes.ConstantNode.getConstantNodes; -import static jdk.internal.jvmci.code.CodeUtil.getCallingConvention; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CallingConvention.Type; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.OptionValue.OverrideScope; +import static jdk.vm.ci.code.CodeUtil.getCallingConvention; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CallingConvention.Type; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.OptionValue.OverrideScope; import org.junit.Assert; import org.junit.Ignore;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ArrayCopyIntrinsificationTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ArrayCopyIntrinsificationTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,9 +26,9 @@ import java.util.ArrayList; import java.util.HashMap; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.JavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.JavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CompileTheWorldTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CompileTheWorldTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.test; -import static jdk.internal.jvmci.compiler.Compiler.ExitVMOnException; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; +import static jdk.vm.ci.compiler.Compiler.ExitVMOnException; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; import org.junit.Test;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CompressedOopTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/CompressedOopTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -31,8 +31,8 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import jdk.internal.jvmci.hotspot.HotSpotInstalledCode; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.hotspot.HotSpotInstalledCode; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/DataPatchTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/DataPatchTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,8 +23,8 @@ package com.oracle.graal.hotspot.test; -import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; +import jdk.vm.ci.hotspot.HotSpotVMConfig; import org.junit.Assume; import org.junit.Before;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ExplicitExceptionTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/ExplicitExceptionTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot.test; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,7 +23,7 @@ package com.oracle.graal.hotspot.test; import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.ROOT_COMPILATION; -import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; +import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; @@ -37,9 +37,9 @@ import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotMonitorValueTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotMonitorValueTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,14 +30,14 @@ import java.util.Arrays; import java.util.List; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.CompilationResult.Call; -import jdk.internal.jvmci.code.CompilationResult.Infopoint; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.StackLockValue; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult.Call; +import jdk.vm.ci.code.CompilationResult.Infopoint; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.StackLockValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotNmethodTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotNmethodTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.test; -import jdk.internal.jvmci.code.InvalidInstalledCodeException; -import jdk.internal.jvmci.hotspot.HotSpotNmethod; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.InvalidInstalledCodeException; +import jdk.vm.ci.hotspot.HotSpotNmethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedJavaFieldTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedJavaFieldTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,11 +24,11 @@ import java.lang.reflect.Field; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaField; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ModifiersProvider; -import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaField; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ModifiersProvider; +import jdk.vm.ci.meta.ResolvedJavaField; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,14 +22,14 @@ */ package com.oracle.graal.hotspot.test; -import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MemoryAccessProvider; -import jdk.internal.jvmci.meta.PrimitiveConstant; +import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MemoryAccessProvider; +import jdk.vm.ci.meta.PrimitiveConstant; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/InstalledCodeExecuteHelperTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/InstalledCodeExecuteHelperTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,11 +23,11 @@ package com.oracle.graal.hotspot.test; import static java.lang.reflect.Modifier.isStatic; -import jdk.internal.jvmci.code.InvalidInstalledCodeException; -import jdk.internal.jvmci.hotspot.HotSpotInstalledCode; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.InvalidInstalledCodeException; +import jdk.vm.ci.hotspot.HotSpotInstalledCode; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/LoadJavaMirrorWithKlassTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/LoadJavaMirrorWithKlassTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.Objects; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.OptionValue.OverrideScope; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.OptionValue.OverrideScope; import org.junit.Test;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/MemoryUsageBenchmark.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/MemoryUsageBenchmark.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,11 +23,11 @@ package com.oracle.graal.hotspot.test; import static com.oracle.graal.debug.internal.MemUseTrackerImpl.getCurrentThreadAllocatedBytes; -import jdk.internal.jvmci.compiler.Compiler; -import jdk.internal.jvmci.hotspot.HotSpotCompilationRequest; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; +import jdk.vm.ci.compiler.Compiler; +import jdk.vm.ci.hotspot.HotSpotCompilationRequest; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import com.oracle.graal.api.runtime.Graal; import com.oracle.graal.compiler.test.AllocSpy;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierAdditionTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierAdditionTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,10 +27,10 @@ import java.lang.ref.WeakReference; -import jdk.internal.jvmci.hotspot.HotSpotInstalledCode; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.hotspot.HotSpotInstalledCode; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierVerificationTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/WriteBarrierVerificationTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,13 +22,13 @@ */ package com.oracle.graal.hotspot.test; -import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; +import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; import java.util.List; import java.util.Map; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.LocationIdentity; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationStatistics.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationStatistics.java Thu Oct 08 17:41:33 2015 -0700 @@ -40,8 +40,8 @@ import java.util.Locale; import java.util.concurrent.ConcurrentLinkedDeque; -import jdk.internal.jvmci.hotspot.HotSpotInstalledCode; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; +import jdk.vm.ci.hotspot.HotSpotInstalledCode; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import com.oracle.graal.debug.Management; import com.sun.management.ThreadMXBean;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,34 +22,34 @@ */ package com.oracle.graal.hotspot; -import static jdk.internal.jvmci.compiler.Compiler.ExitVMOnBailout; -import static jdk.internal.jvmci.compiler.Compiler.ExitVMOnException; -import static jdk.internal.jvmci.compiler.Compiler.PrintAfterCompilation; -import static jdk.internal.jvmci.compiler.Compiler.PrintBailout; -import static jdk.internal.jvmci.compiler.Compiler.PrintCompilation; -import static jdk.internal.jvmci.compiler.Compiler.PrintFilter; -import static jdk.internal.jvmci.compiler.Compiler.PrintStackTraceOnException; +import static jdk.vm.ci.compiler.Compiler.ExitVMOnBailout; +import static jdk.vm.ci.compiler.Compiler.ExitVMOnException; +import static jdk.vm.ci.compiler.Compiler.PrintAfterCompilation; +import static jdk.vm.ci.compiler.Compiler.PrintBailout; +import static jdk.vm.ci.compiler.Compiler.PrintCompilation; +import static jdk.vm.ci.compiler.Compiler.PrintFilter; +import static jdk.vm.ci.compiler.Compiler.PrintStackTraceOnException; import java.lang.reflect.Field; import java.util.concurrent.TimeUnit; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.compiler.Compiler; -import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; -import jdk.internal.jvmci.hotspot.HotSpotCompilationRequest; -import jdk.internal.jvmci.hotspot.HotSpotInstalledCode; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.hotspot.HotSpotNmethod; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.hotspot.events.EmptyEventProvider; -import jdk.internal.jvmci.hotspot.events.EventProvider; -import jdk.internal.jvmci.hotspot.events.EventProvider.CompilationEvent; -import jdk.internal.jvmci.hotspot.events.EventProvider.CompilerFailureEvent; -import jdk.internal.jvmci.service.Services; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.compiler.Compiler; +import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; +import jdk.vm.ci.hotspot.HotSpotCompilationRequest; +import jdk.vm.ci.hotspot.HotSpotInstalledCode; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.hotspot.HotSpotNmethod; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.hotspot.events.EmptyEventProvider; +import jdk.vm.ci.hotspot.events.EventProvider; +import jdk.vm.ci.hotspot.events.EventProvider.CompilationEvent; +import jdk.vm.ci.hotspot.events.EventProvider.CompilerFailureEvent; +import jdk.vm.ci.service.Services; import sun.misc.Unsafe; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,10 +29,10 @@ import static com.oracle.graal.hotspot.CompileTheWorldOptions.CompileTheWorldStartAt; import static com.oracle.graal.hotspot.CompileTheWorldOptions.CompileTheWorldStopAt; import static com.oracle.graal.hotspot.CompileTheWorldOptions.CompileTheWorldVerbose; -import static jdk.internal.jvmci.compiler.Compiler.ExitVMOnException; -import static jdk.internal.jvmci.compiler.Compiler.PrintBailout; -import static jdk.internal.jvmci.compiler.Compiler.PrintStackTraceOnException; -import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; +import static jdk.vm.ci.compiler.Compiler.ExitVMOnException; +import static jdk.vm.ci.compiler.Compiler.PrintBailout; +import static jdk.vm.ci.compiler.Compiler.PrintStackTraceOnException; +import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; import java.io.File; import java.io.IOException; @@ -55,21 +55,21 @@ import java.util.jar.JarFile; import java.util.stream.Collectors; -import jdk.internal.jvmci.compiler.Compiler; -import jdk.internal.jvmci.hotspot.HotSpotCompilationRequest; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.ConstantPool; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.options.OptionDescriptor; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.OptionValue.OverrideScope; -import jdk.internal.jvmci.options.OptionsParser; -import jdk.internal.jvmci.options.OptionsParser.OptionConsumer; -import jdk.internal.jvmci.runtime.JVMCI; +import jdk.vm.ci.compiler.Compiler; +import jdk.vm.ci.hotspot.HotSpotCompilationRequest; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.ConstantPool; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.options.OptionDescriptor; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.OptionValue.OverrideScope; +import jdk.vm.ci.options.OptionsParser; +import jdk.vm.ci.options.OptionsParser.OptionConsumer; +import jdk.vm.ci.runtime.JVMCI; import com.oracle.graal.bytecode.Bytecodes; import com.oracle.graal.compiler.CompilerThreadFactory;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorldOptions.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorldOptions.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; /** * Options related to {@link CompileTheWorld}.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/DebugValuesPrinter.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/DebugValuesPrinter.java Thu Oct 08 17:41:33 2015 -0700 @@ -33,7 +33,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.debug.TTY; import com.oracle.graal.debug.internal.DebugValue;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/DefaultHotSpotGraalCompilerFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/DefaultHotSpotGraalCompilerFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.IdentityHashMap; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.compiler.CompilerFactory; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.compiler.CompilerFactory; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.graal.compiler.phases.BasicCompilerConfiguration; import com.oracle.graal.phases.tiers.CompilerConfiguration;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/EconomyHotSpotGraalCompilerFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/EconomyHotSpotGraalCompilerFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot; -import jdk.internal.jvmci.compiler.CompilerFactory; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.compiler.CompilerFactory; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.graal.compiler.phases.EconomyCompilerConfiguration; import com.oracle.graal.phases.tiers.CompilerConfiguration;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackend.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackend.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,17 +29,17 @@ import java.util.Map; import java.util.Set; -import jdk.internal.jvmci.code.DebugInfo; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterSaveLayout; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.code.DebugInfo; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterSaveLayout; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackendFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackendFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; import com.oracle.graal.phases.tiers.CompilerConfiguration;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotCounterOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotCounterOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,18 +24,18 @@ import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; import java.util.Arrays; import java.util.HashMap; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.Assembler; import com.oracle.graal.asm.NumUtil;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugInfoBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugInfoBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,13 +22,13 @@ */ package com.oracle.graal.hotspot; -import static jdk.internal.jvmci.code.BytecodeFrame.isPlaceholderBci; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.code.StackLockValue; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.VirtualObject; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaValue; +import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.code.StackLockValue; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.VirtualObject; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaValue; import com.oracle.graal.compiler.gen.DebugInfoBuilder; import com.oracle.graal.nodes.FrameState;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkage.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkage.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot; -import jdk.internal.jvmci.meta.InvokeTarget; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.InvokeTarget; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; import com.oracle.graal.compiler.target.Backend;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkageImpl.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotForeignCallLinkageImpl.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,24 +23,24 @@ package com.oracle.graal.hotspot; import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_REGISTERS; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime; import java.util.Set; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CallingConvention.Type; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.hotspot.HotSpotForeignCallTarget; -import jdk.internal.jvmci.hotspot.HotSpotProxified; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CallingConvention.Type; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.HotSpotForeignCallTarget; +import jdk.vm.ci.hotspot.HotSpotProxified; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.compiler.target.Backend;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompiler.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompiler.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,20 +24,20 @@ import static com.oracle.graal.compiler.common.GraalOptions.OptAssumptions; import static com.oracle.graal.graphbuilderconf.IntrinsicContext.CompilationContext.ROOT_COMPILATION; -import static jdk.internal.jvmci.code.CallingConvention.Type.JavaCallee; -import static jdk.internal.jvmci.code.CodeUtil.getCallingConvention; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CallingConvention.Type; -import jdk.internal.jvmci.code.CompilationRequest; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.compiler.Compiler; -import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; -import jdk.internal.jvmci.hotspot.HotSpotCompilationRequest; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ProfilingInfo; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.SpeculationLog; +import static jdk.vm.ci.code.CallingConvention.Type.JavaCallee; +import static jdk.vm.ci.code.CodeUtil.getCallingConvention; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CallingConvention.Type; +import jdk.vm.ci.code.CompilationRequest; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.compiler.Compiler; +import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; +import jdk.vm.ci.hotspot.HotSpotCompilationRequest; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ProfilingInfo; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.SpeculationLog; import com.oracle.graal.compiler.GraalCompiler; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompilerFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompilerFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,17 +22,17 @@ */ package com.oracle.graal.hotspot; -import static jdk.internal.jvmci.inittimer.InitTimer.timer; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.compiler.Compiler; -import jdk.internal.jvmci.compiler.CompilerFactory; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; -import jdk.internal.jvmci.inittimer.InitTimer; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.runtime.JVMCIRuntime; -import jdk.internal.jvmci.service.Services; +import static jdk.vm.ci.inittimer.InitTimer.timer; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.compiler.Compiler; +import jdk.vm.ci.compiler.CompilerFactory; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; +import jdk.vm.ci.inittimer.InitTimer; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.runtime.JVMCIRuntime; +import jdk.vm.ci.service.Services; import com.oracle.graal.phases.tiers.CompilerConfiguration; @@ -82,7 +82,7 @@ @Override public String[] getTrivialPrefixes() { if (Options.CompileGraalWithC1Only.getValue()) { - return new String[]{"jdk/internal/jvmci", "com/oracle/graal"}; + return new String[]{"jdk/vm/ci", "com/oracle/graal"}; } return null; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,23 +28,23 @@ import static com.oracle.graal.debug.GraalDebugConfig.Options.MethodFilter; import static com.oracle.graal.debug.GraalDebugConfig.Options.Verify; import static com.oracle.graal.debug.GraalDebugConfig.areScopedMetricsOrTimersEnabled; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayIndexScale; -import static jdk.internal.jvmci.inittimer.InitTimer.timer; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayIndexScale; +import static jdk.vm.ci.inittimer.InitTimer.timer; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.code.stack.StackIntrospection; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; -import jdk.internal.jvmci.hotspot.HotSpotProxified; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.inittimer.InitTimer; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.runtime.JVMCIBackend; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.code.stack.StackIntrospection; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; +import jdk.vm.ci.hotspot.HotSpotProxified; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.inittimer.InitTimer; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.runtime.JVMCIBackend; import com.oracle.graal.api.collections.CollectionsProvider; import com.oracle.graal.api.replacements.SnippetReflectionProvider;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntimeAccess.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntimeAccess.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.graal.api.runtime.GraalRuntime; import com.oracle.graal.api.runtime.GraalRuntimeAccess;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntimeProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntimeProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.api.runtime.GraalRuntime; import com.oracle.graal.hotspot.meta.HotSpotProviders;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalVMEventListener.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalVMEventListener.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,11 +24,11 @@ import java.util.ArrayList; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; -import jdk.internal.jvmci.hotspot.HotSpotVMEventListener; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; +import jdk.vm.ci.hotspot.HotSpotVMEventListener; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotHostBackend.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotHostBackend.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,12 +24,12 @@ import static com.oracle.graal.compiler.common.GraalOptions.BootstrapReplacements; import static com.oracle.graal.compiler.common.GraalOptions.Intrinsify; -import static jdk.internal.jvmci.inittimer.InitTimer.timer; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.inittimer.InitTimer; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.service.Services; +import static jdk.vm.ci.inittimer.InitTimer.timer; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.inittimer.InitTimer; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.service.Services; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotInstructionProfiling.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotInstructionProfiling.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,10 +24,10 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.Assembler; import com.oracle.graal.asm.Assembler.InstructionCounter;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotLIRGenerator.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotLIRGenerator.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.hotspot; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.Value; import com.oracle.graal.hotspot.meta.HotSpotProviders; import com.oracle.graal.hotspot.nodes.DeoptimizationFetchUnrollInfoCallNode;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotLockStack.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotLockStack.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,8 +26,8 @@ import java.util.Arrays; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.meta.LIRKind; import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotReferenceMapBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotReferenceMapBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,20 +23,20 @@ package com.oracle.graal.hotspot; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.asStackSlot; +import static jdk.vm.ci.code.ValueUtil.isRegister; import java.util.ArrayList; -import jdk.internal.jvmci.code.Location; -import jdk.internal.jvmci.code.ReferenceMap; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotReferenceMap; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Location; +import jdk.vm.ci.code.ReferenceMap; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotReferenceMap; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.LIRFrameState; import com.oracle.graal.lir.Variable;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotReplacementsImpl.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotReplacementsImpl.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,9 +25,9 @@ import java.lang.reflect.Executable; import java.lang.reflect.Method; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.hotspot.word.HotSpotOperation;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotTTYStreamProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotTTYStreamProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.io.PrintStream; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.graal.debug.TTYStreamProvider;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/PrintStreamOption.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/PrintStreamOption.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,9 +29,9 @@ import java.io.PrintStream; import java.lang.management.ManagementFactory; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.options.OptionValue; /** * An option that encapsulates and configures a print stream.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/BenchmarkCounters.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/BenchmarkCounters.java Thu Oct 08 17:41:33 2015 -0700 @@ -35,13 +35,13 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.inittimer.SuppressFBWarnings; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.inittimer.SuppressFBWarnings; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.debug.TTY; import com.oracle.graal.hotspot.replacements.NewObjectSnippets;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -33,26 +33,26 @@ import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.KLASS_LAYOUT_HELPER_LOCATION; import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.OBJ_ARRAY_KLASS_ELEMENT_KLASS_LOCATION; import static com.oracle.graal.hotspot.replacements.NewObjectSnippets.INIT_LOCATION; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; -import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; -import static jdk.internal.jvmci.meta.LocationIdentity.any; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; +import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; +import static jdk.vm.ci.meta.LocationIdentity.any; import java.lang.ref.Reference; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaField; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaField; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotDisassemblerProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotDisassemblerProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.hotspot.meta; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.graal.code.DisassemblerProvider;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotForeignCallsProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotForeignCallsProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.meta; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,17 +24,17 @@ import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.PRESERVES_REGISTERS; import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.Transition.NOT_LEAF; -import static jdk.internal.jvmci.code.CallingConvention.Type.JavaCall; -import static jdk.internal.jvmci.code.CallingConvention.Type.JavaCallee; +import static jdk.vm.ci.code.CallingConvention.Type.JavaCall; +import static jdk.vm.ci.code.CallingConvention.Type.JavaCallee; import java.util.HashMap; import java.util.Map; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.hotspot.HotSpotForeignCallLinkage;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraalConstantReflectionProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraalConstantReflectionProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,17 +29,17 @@ import java.util.ArrayList; import java.util.List; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotConstantReflectionProvider; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaField; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaField; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.runtime.JVMCI; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaField; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaField; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.runtime.JVMCI; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.replacements.ReplacementsImpl;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java Thu Oct 08 17:41:33 2015 -0700 @@ -34,13 +34,13 @@ import java.lang.invoke.VolatileCallSite; import java.util.zip.CRC32; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.options.StableOptionValue; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.options.StableOptionValue; import sun.reflect.Reflection; import com.oracle.graal.api.replacements.SnippetReflectionProvider;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -79,19 +79,19 @@ import static com.oracle.graal.replacements.Log.LOG_OBJECT; import static com.oracle.graal.replacements.Log.LOG_PRIMITIVE; import static com.oracle.graal.replacements.Log.LOG_PRINTF; -import static jdk.internal.jvmci.code.CallingConvention.Type.NativeCall; +import static jdk.vm.ci.code.CallingConvention.Type.NativeCall; import java.util.EnumMap; import java.util.HashMap; import java.util.Map; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotInvocationPlugins.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotInvocationPlugins.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.meta; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.GraalOptions; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.meta; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.hotspot.HotSpotVMConfig; import com.oracle.graal.nodes.spi.LoweringProvider;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotNodePlugin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotNodePlugin.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,12 +24,12 @@ import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; import static com.oracle.graal.hotspot.meta.HotSpotGraalConstantReflectionProvider.FieldReadEnabledInImmutableCode; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaTypeProfile; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaTypeProfile; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotProviders.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotProviders.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.meta; -import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRegisters.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRegisters.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.meta; -import jdk.internal.jvmci.code.Register; +import jdk.vm.ci.code.Register; public class HotSpotRegisters implements HotSpotRegistersProvider {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRegistersProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRegistersProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.meta; -import jdk.internal.jvmci.code.Register; +import jdk.vm.ci.code.Register; /** * Special registers reserved by HotSpot for frequently used values.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,14 +22,14 @@ */ package com.oracle.graal.hotspot.meta; -import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; -import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; +import jdk.vm.ci.hotspot.HotSpotObjectConstant; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.hotspot.HotSpotGraalRuntimeProvider;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; import static com.oracle.graal.compiler.common.GraalOptions.VerifyPhases; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.options.DerivedOptionValue; -import jdk.internal.jvmci.options.DerivedOptionValue.OptionSupplier; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.options.DerivedOptionValue; +import jdk.vm.ci.options.DerivedOptionValue.OptionSupplier; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.DebugInfoMode;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotWordOperationPlugin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotWordOperationPlugin.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,12 +25,12 @@ import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; import static com.oracle.graal.nodes.ConstantNode.forBoolean; -import static jdk.internal.jvmci.meta.LocationIdentity.any; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import static jdk.vm.ci.meta.LocationIdentity.any; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/AllocaNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/AllocaNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.BitSet; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/BeginLockScopeNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/BeginLockScopeNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CStringNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CStringNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassCastNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassCastNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.spi.Canonicalizable;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CompressionNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CompressionNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,14 +22,14 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotCompressedNullConstant; -import jdk.internal.jvmci.hotspot.HotSpotConstant; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotCompressedNullConstant; +import jdk.vm.ci.hotspot.HotSpotConstant; +import jdk.vm.ci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.AbstractObjectStamp; import com.oracle.graal.compiler.common.type.ObjectStamp;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ComputeObjectAddressNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ComputeObjectAddressNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentLockNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentLockNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizationFetchUnrollInfoCallNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizationFetchUnrollInfoCallNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,9 +23,9 @@ package com.oracle.graal.hotspot.nodes; import static com.oracle.graal.hotspot.HotSpotBackend.FETCH_UNROLL_INFO; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizeCallerNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizeCallerNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DimensionsNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DimensionsNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,8 +26,8 @@ import java.util.BitSet; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DirectCompareAndSwapNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DirectCompareAndSwapNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.hotspot.HotSpotNodeLIRBuilder;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EndLockScopeNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EndLockScopeNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EnterUnpackFramesStackFrameNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EnterUnpackFramesStackFrameNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/GetObjectAddressNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/GetObjectAddressNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.List; -import jdk.internal.jvmci.code.CallingConvention.Type; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.CallingConvention.Type; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.List; -import jdk.internal.jvmci.code.CallingConvention.Type; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.CallingConvention.Type; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveDeoptimizedStackFrameNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LeaveDeoptimizedStackFrameNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LoadIndexedPointerNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/LoadIndexedPointerNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorCounterNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorCounterNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.BitSet; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PushInterpreterFrameNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PushInterpreterFrameNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SaveAllRegistersNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SaveAllRegistersNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot.nodes; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubForeignCallNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubForeignCallNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.Arrays; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.compiler.common.spi.ForeignCallLinkage;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/UncommonTrapCallNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/UncommonTrapCallNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,9 +23,9 @@ package com.oracle.graal.hotspot.nodes; import static com.oracle.graal.hotspot.HotSpotBackend.UNCOMMON_TRAP; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VMErrorNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VMErrorNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,10 +24,10 @@ import static com.oracle.graal.hotspot.HotSpotBackend.VM_ERROR; import static com.oracle.graal.hotspot.nodes.CStringNode.emitCString; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.MetaUtil; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.MetaUtil; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/HotSpotLIRKindTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/HotSpotLIRKindTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.nodes.type; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.meta.LIRKind; import com.oracle.graal.compiler.common.spi.LIRKindTool;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/KlassPointerStamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/KlassPointerStamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,15 +24,15 @@ import java.util.Objects; -import jdk.internal.jvmci.hotspot.HotSpotCompressedNullConstant; -import jdk.internal.jvmci.hotspot.HotSpotMemoryAccessProvider; -import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MemoryAccessProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.hotspot.HotSpotCompressedNullConstant; +import jdk.vm.ci.hotspot.HotSpotMemoryAccessProvider; +import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; +import jdk.vm.ci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MemoryAccessProvider; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.spi.LIRKindTool; import com.oracle.graal.compiler.common.type.AbstractPointerStamp;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/MetaspacePointerStamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/MetaspacePointerStamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.nodes.type; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.spi.LIRKindTool; import com.oracle.graal.compiler.common.type.AbstractPointerStamp;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/MethodPointerStamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/MethodPointerStamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.hotspot.nodes.type; -import jdk.internal.jvmci.hotspot.HotSpotMemoryAccessProvider; -import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.MemoryAccessProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.hotspot.HotSpotMemoryAccessProvider; +import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.MemoryAccessProvider; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.type.AbstractPointerStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/NarrowOopStamp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/type/NarrowOopStamp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,14 +22,14 @@ */ package com.oracle.graal.hotspot.nodes.type; -import jdk.internal.jvmci.hotspot.HotSpotCompressedNullConstant; -import jdk.internal.jvmci.hotspot.HotSpotMemoryAccessProvider; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MemoryAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.hotspot.HotSpotCompressedNullConstant; +import jdk.vm.ci.hotspot.HotSpotMemoryAccessProvider; +import jdk.vm.ci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MemoryAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.spi.LIRKindTool; import com.oracle.graal.compiler.common.type.AbstractObjectStamp;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/AheadOfTimeVerificationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/AheadOfTimeVerificationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,8 +23,8 @@ package com.oracle.graal.hotspot.phases; import static com.oracle.graal.nodes.ConstantNode.getConstantNodes; -import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.hotspot.HotSpotObjectConstant; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.nodes.ConstantNode; import com.oracle.graal.nodes.StructuredGraph;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/LoadJavaMirrorWithKlassPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/LoadJavaMirrorWithKlassPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,16 +25,16 @@ import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.CLASS_MIRROR_LOCATION; import static com.oracle.graal.nodes.ConstantNode.getConstantNodes; import static com.oracle.graal.nodes.NamedLocationIdentity.FINAL_LOCATION; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaField; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.hotspot.HotSpotResolvedPrimitiveType; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotObjectConstant; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaField; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.hotspot.HotSpotResolvedPrimitiveType; +import jdk.vm.ci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.AbstractObjectStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/OnStackReplacementPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/OnStackReplacementPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,9 +23,9 @@ package com.oracle.graal.hotspot.phases; import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.compiler.Compiler; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.compiler.Compiler; import com.oracle.graal.debug.Debug; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierAdditionPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierAdditionPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot.phases; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotVMConfig; import com.oracle.graal.graph.Node; import com.oracle.graal.hotspot.nodes.G1ArrayRangePostWriteBarrier;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierVerificationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierVerificationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,8 +25,8 @@ import java.util.Iterator; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotVMConfig; import com.oracle.graal.graph.Node; import com.oracle.graal.graph.NodeFlood;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,15 +26,15 @@ import static com.oracle.graal.hotspot.HotSpotBackend.ENCRYPT_BLOCK; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.VERY_SLOW_PATH_PROBABILITY; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; import java.lang.reflect.Field; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import sun.misc.Launcher; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AssertionSnippets.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AssertionSnippets.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import static com.oracle.graal.hotspot.nodes.CStringNode.cstring; import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.graph.Node.ConstantNodeParameter;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CRC32Substitutions.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CRC32Substitutions.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,7 +27,7 @@ import java.util.zip.CRC32; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CallSiteTargetNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CallSiteTargetNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.hotspot.HotSpotObjectConstant; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Node; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CardTableAddressNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CardTableAddressNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CardTableShiftNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CardTableShiftNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CheckCastDynamicSnippets.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CheckCastDynamicSnippets.java Thu Oct 08 17:41:33 2015 -0700 @@ -31,9 +31,9 @@ import static com.oracle.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; -import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; -import static jdk.internal.jvmci.meta.DeoptimizationReason.ClassCastException; -import jdk.internal.jvmci.code.TargetDescription; +import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.vm.ci.meta.DeoptimizationReason.ClassCastException; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CipherBlockChainingSubstitutions.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CipherBlockChainingSubstitutions.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,10 +25,10 @@ import static com.oracle.graal.hotspot.HotSpotBackend.DECRYPT; import static com.oracle.graal.hotspot.HotSpotBackend.ENCRYPT; import static com.oracle.graal.hotspot.replacements.UnsafeAccess.UNSAFE; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import sun.misc.Launcher; import com.oracle.graal.api.replacements.Fold;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ClassGetHubNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ClassGetHubNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,14 +22,14 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.hotspot.HotSpotResolvedPrimitiveType; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.hotspot.HotSpotResolvedPrimitiveType; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,21 +27,21 @@ import static com.oracle.graal.hotspot.replacements.UnsafeAccess.UNSAFE; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayIndexScale; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayIndexScale; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.compiler.common.GraalOptions;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotSubstitutions.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotSubstitutions.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,9 +27,9 @@ import com.oracle.graal.nodes.spi.Replacements; import com.oracle.graal.nodes.spi.ReplacementsProvider; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.service.ServiceProvider; import sun.reflect.ConstantPool; import sun.reflect.Reflection;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HubGetClassNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HubGetClassNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,13 +22,13 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.hotspot.HotSpotResolvedPrimitiveType; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.hotspot.HotSpotResolvedPrimitiveType; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/IdentityHashCodeNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/IdentityHashCodeNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,11 +23,11 @@ package com.oracle.graal.hotspot.replacements; import static com.oracle.graal.compiler.common.GraalOptions.ImmutableCode; -import jdk.internal.jvmci.hotspot.HotSpotObjectConstant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.hotspot.HotSpotObjectConstant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.nodeinfo.NodeInfo;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/InstanceOfSnippets.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/InstanceOfSnippets.java Thu Oct 08 17:41:33 2015 -0700 @@ -41,16 +41,16 @@ import static com.oracle.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; -import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; -import static jdk.internal.jvmci.meta.DeoptimizationReason.OptimizedTypeCheckViolated; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.TriState; +import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.vm.ci.meta.DeoptimizationReason.OptimizedTypeCheckViolated; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.hotspot.meta.HotSpotProviders;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/InstanceOfSnippetsOptions.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/InstanceOfSnippetsOptions.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; /** * Options related to {@link InstanceOfSnippets}.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/KlassLayoutHelperNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/KlassLayoutHelperNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/LoadExceptionObjectSnippets.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/LoadExceptionObjectSnippets.java Thu Oct 08 17:41:33 2015 -0700 @@ -31,9 +31,9 @@ import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionPc; import static com.oracle.graal.nodes.PiNode.piCast; import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.hotspot.meta.HotSpotProviders;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/MonitorSnippets.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/MonitorSnippets.java Thu Oct 08 17:41:33 2015 -0700 @@ -54,18 +54,18 @@ import java.util.List; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java Thu Oct 08 17:41:33 2015 -0700 @@ -63,19 +63,19 @@ import static com.oracle.graal.replacements.ReplacementsUtil.staticAssert; import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; import static com.oracle.graal.replacements.nodes.ExplodeLoopNode.explodeLoop; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; -import static jdk.internal.jvmci.hotspot.HotSpotMetaAccessProvider.computeArrayAllocationSize; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; +import static jdk.vm.ci.hotspot.HotSpotMetaAccessProvider.computeArrayAllocationSize; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippetsOptions.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippetsOptions.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; /** * Options related to {@link NewObjectSnippets}.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,11 +24,11 @@ import java.lang.reflect.Method; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneSnippets.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ObjectCloneSnippets.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,8 +25,8 @@ import java.lang.reflect.Method; import java.util.EnumMap; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.api.directives.GraalDirectives; import com.oracle.graal.hotspot.replacements.arraycopy.ArrayCopyCallNode;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ReflectionGetCallerClassNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ReflectionGetCallerClassNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.hotspot.replacements; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Node; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/RuntimeStringSnippets.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/RuntimeStringSnippets.java Thu Oct 08 17:41:33 2015 -0700 @@ -43,8 +43,8 @@ import com.oracle.graal.replacements.Snippets; import com.oracle.graal.word.Word; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; public class RuntimeStringSnippets implements Snippets {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ThreadSubstitutions.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ThreadSubstitutions.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,7 +27,7 @@ import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.osThreadInterruptedOffset; import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.osThreadOffset; import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.threadObjectOffset; -import static jdk.internal.jvmci.meta.LocationIdentity.any; +import static jdk.vm.ci.meta.LocationIdentity.any; import com.oracle.graal.api.replacements.ClassSubstitution; import com.oracle.graal.api.replacements.MethodSubstitution;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/TypeCheckSnippetUtils.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/TypeCheckSnippetUtils.java Thu Oct 08 17:41:33 2015 -0700 @@ -40,8 +40,8 @@ import java.util.Arrays; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.hotspot.nodes.type.KlassPointerStamp; import com.oracle.graal.hotspot.word.KlassPointer;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/UnsafeLoadSnippets.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/UnsafeLoadSnippets.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.referentOffset; import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.hotspot.meta.HotSpotProviders; import com.oracle.graal.nodes.extended.FixedValueAnchorNode;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/WriteBarrierSnippets.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/WriteBarrierSnippets.java Thu Oct 08 17:41:33 2015 -0700 @@ -46,12 +46,12 @@ import static com.oracle.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; -import static jdk.internal.jvmci.code.MemoryBarriers.STORE_LOAD; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig.CompressEncoding; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import static jdk.vm.ci.code.MemoryBarriers.STORE_LOAD; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.hotspot.HotSpotVMConfig.CompressEncoding; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.GraalOptions; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopyCallNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopyCallNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,14 +23,14 @@ //JaCoCo Exclude package com.oracle.graal.hotspot.replacements.arraycopy; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayIndexScale; -import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.PrimitiveConstant; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayIndexScale; +import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.PrimitiveConstant; import com.oracle.graal.api.runtime.Graal; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopyNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopyNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.replacements.arraycopy; -import static jdk.internal.jvmci.meta.LocationIdentity.any; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import static jdk.vm.ci.meta.LocationIdentity.any; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.nodeinfo.NodeInfo;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopySlowPathNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopySlowPathNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.replacements.arraycopy; -import static jdk.internal.jvmci.meta.LocationIdentity.any; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import static jdk.vm.ci.meta.LocationIdentity.any; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.nodeinfo.NodeInfo;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopySnippets.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopySnippets.java Thu Oct 08 17:41:33 2015 -0700 @@ -40,15 +40,15 @@ import java.util.EnumMap; import java.util.Map; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.api.directives.GraalDirectives; import com.oracle.graal.api.replacements.Fold;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopyUnrollNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopyUnrollNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.replacements.arraycopy; -import static jdk.internal.jvmci.meta.LocationIdentity.any; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import static jdk.vm.ci.meta.LocationIdentity.any; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,11 +23,11 @@ //JaCoCo Exclude package com.oracle.graal.hotspot.replacements.arraycopy; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayIndexScale; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayIndexScale; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/UnsafeArrayCopyNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/UnsafeArrayCopyNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.hotspot.replacements.arraycopy; -import static jdk.internal.jvmci.meta.LocationIdentity.any; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import static jdk.vm.ci.meta.LocationIdentity.any; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/UnsafeArrayCopySnippets.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/UnsafeArrayCopySnippets.java Thu Oct 08 17:41:33 2015 -0700 @@ -34,10 +34,10 @@ import static com.oracle.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayIndexScale; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayIndexScale; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.asm.NumUtil;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/DeoptimizationStub.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/DeoptimizationStub.java Thu Oct 08 17:41:33 2015 -0700 @@ -31,10 +31,10 @@ import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.wordSize; import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.writeRegisterAsWord; import static com.oracle.graal.hotspot.stubs.UncommonTrapStub.STACK_BANG_LOCATION; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotVMConfig; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.asm.NumUtil;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ExceptionHandlerStub.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ExceptionHandlerStub.java Thu Oct 08 17:41:33 2015 -0700 @@ -34,8 +34,8 @@ import static com.oracle.graal.hotspot.stubs.StubUtil.fatal; import static com.oracle.graal.hotspot.stubs.StubUtil.newDescriptor; import static com.oracle.graal.hotspot.stubs.StubUtil.printf; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.hotspot.HotSpotVMConfig; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,19 +24,19 @@ import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_REGISTERS; import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.PRESERVES_REGISTERS; -import static jdk.internal.jvmci.code.CallingConvention.Type.JavaCall; -import static jdk.internal.jvmci.code.CallingConvention.Type.JavaCallee; -import static jdk.internal.jvmci.code.CallingConvention.Type.NativeCall; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider; -import jdk.internal.jvmci.hotspot.HotSpotSignature; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaMethod; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Signature; +import static jdk.vm.ci.code.CallingConvention.Type.JavaCall; +import static jdk.vm.ci.code.CallingConvention.Type.JavaCallee; +import static jdk.vm.ci.code.CallingConvention.Type.NativeCall; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider; +import jdk.vm.ci.hotspot.HotSpotSignature; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaMethod; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Signature; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewArrayStub.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewArrayStub.java Thu Oct 08 17:41:33 2015 -0700 @@ -40,9 +40,9 @@ import static com.oracle.graal.hotspot.stubs.StubUtil.newDescriptor; import static com.oracle.graal.hotspot.stubs.StubUtil.printf; import static com.oracle.graal.hotspot.stubs.StubUtil.verifyObject; -import static jdk.internal.jvmci.hotspot.HotSpotMetaAccessProvider.computeArrayAllocationSize; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; +import static jdk.vm.ci.hotspot.HotSpotMetaAccessProvider.computeArrayAllocationSize; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewInstanceStub.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewInstanceStub.java Thu Oct 08 17:41:33 2015 -0700 @@ -66,9 +66,9 @@ import static com.oracle.graal.hotspot.stubs.StubUtil.verifyObject; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.hotspot.HotSpotResolvedObjectType; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/SnippetStub.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/SnippetStub.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,11 +26,11 @@ import java.lang.reflect.Method; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Local; -import jdk.internal.jvmci.meta.LocalVariableTable; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Local; +import jdk.vm.ci.meta.LocalVariableTable; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/Stub.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/Stub.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,18 +30,18 @@ import java.util.ListIterator; import java.util.Set; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.CompilationResult.Call; -import jdk.internal.jvmci.code.CompilationResult.ConstantReference; -import jdk.internal.jvmci.code.CompilationResult.DataPatch; -import jdk.internal.jvmci.code.CompilationResult.Infopoint; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.hotspot.HotSpotMetaspaceConstant; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult.Call; +import jdk.vm.ci.code.CompilationResult.ConstantReference; +import jdk.vm.ci.code.CompilationResult.DataPatch; +import jdk.vm.ci.code.CompilationResult.Infopoint; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.compiler.target.Backend; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/StubUtil.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/StubUtil.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,14 +29,14 @@ import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.loadHubIntrinsic; import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.verifyOops; import static com.oracle.graal.word.Word.unsigned; -import static jdk.internal.jvmci.meta.DeoptimizationReason.RuntimeConstraint; +import static jdk.vm.ci.meta.DeoptimizationReason.RuntimeConstraint; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Arrays; import java.util.List; -import jdk.internal.jvmci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationAction; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/UncommonTrapStub.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/UncommonTrapStub.java Thu Oct 08 17:41:33 2015 -0700 @@ -31,10 +31,10 @@ import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.wordSize; import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.writePendingDeoptimization; import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.writeRegisterAsWord; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.asm.NumUtil;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/UnwindExceptionToCallerStub.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/UnwindExceptionToCallerStub.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,7 +30,7 @@ import static com.oracle.graal.hotspot.stubs.StubUtil.decipher; import static com.oracle.graal.hotspot.stubs.StubUtil.newDescriptor; import static com.oracle.graal.hotspot.stubs.StubUtil.printf; -import jdk.internal.jvmci.code.Register; +import jdk.vm.ci.code.Register; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/HotSpotWordTypes.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/HotSpotWordTypes.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.hotspot.word; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.hotspot.nodes.type.KlassPointerStamp;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/KlassPointer.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/KlassPointer.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,7 +26,7 @@ import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.READ_KLASS_POINTER; import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.TO_KLASS_POINTER; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.word.Pointer; import com.oracle.graal.word.Word.Opcode;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/MetaspacePointer.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/MetaspacePointer.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.FROM_POINTER; import static com.oracle.graal.hotspot.word.HotSpotOperation.HotspotOpcode.IS_NULL; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.nodes.memory.HeapAccess.BarrierType; import com.oracle.graal.word.Pointer;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/PointerCastNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/word/PointerCastNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.word; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java Thu Oct 08 17:41:33 2015 -0700 @@ -87,10 +87,10 @@ import java.util.List; import java.util.TreeSet; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.meta.ExceptionHandler; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.meta.ExceptionHandler; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.bytecode.BytecodeLookupSwitch; import com.oracle.graal.bytecode.BytecodeStream;
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeDisassembler.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeDisassembler.java Thu Oct 08 17:41:33 2015 -0700 @@ -75,12 +75,12 @@ import static com.oracle.graal.bytecode.Bytecodes.RET; import static com.oracle.graal.bytecode.Bytecodes.SIPUSH; import static com.oracle.graal.bytecode.Bytecodes.TABLESWITCH; -import jdk.internal.jvmci.meta.ConstantPool; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaField; -import jdk.internal.jvmci.meta.JavaMethod; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ConstantPool; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaField; +import jdk.vm.ci.meta.JavaMethod; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.bytecode.BytecodeLookupSwitch; import com.oracle.graal.bytecode.BytecodeStream;
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParser.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParser.java Thu Oct 08 17:41:33 2015 -0700 @@ -238,16 +238,16 @@ import static com.oracle.graal.java.BytecodeParserOptions.TraceParserPlugins; import static com.oracle.graal.nodes.type.StampTool.isPointerNonNull; import static java.lang.String.format; -import static jdk.internal.jvmci.common.JVMCIError.guarantee; -import static jdk.internal.jvmci.common.JVMCIError.shouldNotReachHere; -import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateRecompile; -import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; -import static jdk.internal.jvmci.meta.DeoptimizationReason.JavaSubroutineMismatch; -import static jdk.internal.jvmci.meta.DeoptimizationReason.NullCheckException; -import static jdk.internal.jvmci.meta.DeoptimizationReason.RuntimeConstraint; -import static jdk.internal.jvmci.meta.DeoptimizationReason.TransferToInterpreter; -import static jdk.internal.jvmci.meta.DeoptimizationReason.UnreachedCode; -import static jdk.internal.jvmci.meta.DeoptimizationReason.Unresolved; +import static jdk.vm.ci.common.JVMCIError.guarantee; +import static jdk.vm.ci.common.JVMCIError.shouldNotReachHere; +import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateRecompile; +import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.vm.ci.meta.DeoptimizationReason.JavaSubroutineMismatch; +import static jdk.vm.ci.meta.DeoptimizationReason.NullCheckException; +import static jdk.vm.ci.meta.DeoptimizationReason.RuntimeConstraint; +import static jdk.vm.ci.meta.DeoptimizationReason.TransferToInterpreter; +import static jdk.vm.ci.meta.DeoptimizationReason.UnreachedCode; +import static jdk.vm.ci.meta.DeoptimizationReason.Unresolved; import java.util.ArrayDeque; import java.util.ArrayList; @@ -261,33 +261,33 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.code.BytecodePosition; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.code.InfopointReason; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.compiler.Compiler; -import jdk.internal.jvmci.meta.ConstantPool; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaField; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaMethod; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.JavaTypeProfile; -import jdk.internal.jvmci.meta.LineNumberTable; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.MetaUtil; -import jdk.internal.jvmci.meta.ProfilingInfo; -import jdk.internal.jvmci.meta.RawConstant; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.code.BytecodePosition; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.code.InfopointReason; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.compiler.Compiler; +import jdk.vm.ci.meta.ConstantPool; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaField; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaMethod; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.JavaTypeProfile; +import jdk.vm.ci.meta.LineNumberTable; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.MetaUtil; +import jdk.vm.ci.meta.ProfilingInfo; +import jdk.vm.ci.meta.RawConstant; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.bytecode.BytecodeLookupSwitch; import com.oracle.graal.bytecode.BytecodeStream;
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParserOptions.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParserOptions.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.java; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.StableOptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.StableOptionValue; /** * Options related to {@link BytecodeParser}.
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/DefaultSuitesProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/DefaultSuitesProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.java; -import jdk.internal.jvmci.options.DerivedOptionValue; -import jdk.internal.jvmci.options.DerivedOptionValue.OptionSupplier; +import jdk.vm.ci.options.DerivedOptionValue; +import jdk.vm.ci.options.DerivedOptionValue.OptionSupplier; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration.Plugins;
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -35,21 +35,21 @@ import static com.oracle.graal.graph.iterators.NodePredicates.isNotA; import static com.oracle.graal.java.BytecodeParserOptions.HideSubstitutionStates; import static com.oracle.graal.nodes.FrameState.TWO_SLOT_MARKER; -import static jdk.internal.jvmci.common.JVMCIError.shouldNotReachHere; +import static jdk.vm.ci.common.JVMCIError.shouldNotReachHere; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.function.Function; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.code.BytecodePosition; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Signature; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.code.BytecodePosition; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Signature; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.java; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration; import com.oracle.graal.graphbuilderconf.IntrinsicContext;
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/JsrNotSupportedBailout.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/JsrNotSupportedBailout.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.java; -import jdk.internal.jvmci.code.BailoutException; +import jdk.vm.ci.code.BailoutException; public class JsrNotSupportedBailout extends BailoutException {
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/JTTTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/JTTTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,11 +27,11 @@ import java.util.Collections; import java.util.Set; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/backend/ConstantPhiTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/backend/ConstantPhiTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,8 +27,8 @@ import java.lang.reflect.Method; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.OptionValue.OverrideScope; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.OptionValue.OverrideScope; import org.junit.Test;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/backend/LargeConstantSectionTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/backend/LargeConstantSectionTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -34,8 +34,8 @@ import static jdk.internal.org.objectweb.asm.Opcodes.LLOAD; import static jdk.internal.org.objectweb.asm.Opcodes.LRETURN; import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.OptionValue.OverrideScope; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.OptionValue.OverrideScope; import jdk.internal.org.objectweb.asm.ClassWriter; import jdk.internal.org.objectweb.asm.Label; import jdk.internal.org.objectweb.asm.MethodVisitor;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_instanceof01.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_instanceof01.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.jtt.bytecode; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.OptionValue.OverrideScope; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.OptionValue.OverrideScope; import org.junit.Test;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field01.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field01.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,7 +23,7 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field03.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_field03.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,7 +23,7 @@ // Checkstyle: stop package com.oracle.graal.jtt.hotpath; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/Unsafe_compareAndSwap.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/jdk/Unsafe_compareAndSwap.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.jtt.jdk; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/LambdaEagerTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/LambdaEagerTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,11 +25,11 @@ import java.util.EnumSet; import java.util.function.IntBinaryOperator; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.OptionValue.OverrideScope; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.OptionValue.OverrideScope; import org.junit.Test;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopNewInstance.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/loop/LoopNewInstance.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.jtt.loop; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConditionalElimination01.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConditionalElimination01.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.jtt.optimize; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConditionalElimination02.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConditionalElimination02.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.EnumSet; -import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.DeoptimizationReason; import org.junit.Test;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64AddressValue.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64AddressValue.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,15 +23,15 @@ package com.oracle.graal.lir.amd64; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.isLegal; +import static jdk.vm.ci.code.ValueUtil.isLegal; import java.util.EnumSet; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64Address.Scale;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Arithmetic.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Arithmetic.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.lir.amd64; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; import com.oracle.graal.asm.Label; import com.oracle.graal.asm.amd64.AMD64Address;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import com.oracle.graal.lir.gen.ArithmeticLIRGeneratorTool; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; /** * This interface can be used to generate AMD64 LIR for arithmetic operations.
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ArrayEqualsOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ArrayEqualsOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,19 +24,19 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.asRegister; import java.lang.reflect.Array; import java.lang.reflect.Field; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.amd64.AMD64.CPUFeature; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.amd64.AMD64.CPUFeature; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import sun.misc.Unsafe; import com.oracle.graal.asm.Label;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Binary.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Binary.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,15 +26,15 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.differentRegisters; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.sameRegister; -import jdk.internal.jvmci.code.CompilationResult.DataSectionReference; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.differentRegisters; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.sameRegister; +import jdk.vm.ci.code.CompilationResult.DataSectionReference; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.NumUtil; import com.oracle.graal.asm.amd64.AMD64Address;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64BinaryConsumer.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64BinaryConsumer.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,13 +25,13 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import jdk.internal.jvmci.code.CompilationResult.DataSectionReference; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; +import jdk.vm.ci.code.CompilationResult.DataSectionReference; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.NumUtil; import com.oracle.graal.asm.amd64.AMD64Address;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64BreakpointOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64BreakpointOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ByteSwapOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ByteSwapOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64CCall.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64CCall.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,9 +25,9 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Call.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Call.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,18 +25,18 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.InvokeTarget; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.InvokeTarget; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64Assembler.ConditionFlag; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ClearRegisterOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ClearRegisterOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import static com.oracle.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.meta.AllocatableValue; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64RMOp; import com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ControlFlow.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ControlFlow.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,17 +27,17 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.code.CompilationResult.JumpTable; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.CompilationResult.JumpTable; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.Label; import com.oracle.graal.asm.NumUtil;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMap.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMap.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.lir.amd64; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.meta.LIRKind; +import static jdk.vm.ci.code.ValueUtil.asStackSlot; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.meta.LIRKind; import com.oracle.graal.asm.NumUtil; import com.oracle.graal.lir.framemap.FrameMap;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMapBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMapBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir.amd64; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.StackSlot; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.StackSlot; import com.oracle.graal.lir.framemap.FrameMap; import com.oracle.graal.lir.framemap.FrameMapBuilderImpl;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64MathIntrinsicOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64MathIntrinsicOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.lir.amd64; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java Thu Oct 08 17:41:33 2015 -0700 @@ -31,19 +31,19 @@ import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; import static java.lang.Double.doubleToRawLongBits; import static java.lang.Float.floatToRawIntBits; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.amd64.AMD64Kind; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.amd64.AMD64Kind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.NumUtil; import com.oracle.graal.asm.amd64.AMD64Address;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64MulDivOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64MulDivOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,14 +29,14 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64RestoreRegistersOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64RestoreRegistersOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,16 +23,16 @@ package com.oracle.graal.lir.amd64; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.asStackSlot; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; import java.util.Arrays; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.ValueUtil; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.ValueUtil; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64SaveRegistersOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64SaveRegistersOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,18 +23,18 @@ package com.oracle.graal.lir.amd64; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.asStackSlot; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; import java.util.Arrays; import java.util.Set; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterSaveLayout; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.ValueUtil; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterSaveLayout; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.ValueUtil; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ShiftOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ShiftOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,9 +25,9 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.meta.AllocatableValue; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp; import com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64SignExtendOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64SignExtendOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,10 +25,10 @@ import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.DWORD; import static com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize.QWORD; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; import com.oracle.graal.asm.amd64.AMD64Assembler.OperandSize; import com.oracle.graal.asm.amd64.AMD64MacroAssembler;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Unary.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Unary.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,11 +26,11 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.amd64.AMD64Address; import com.oracle.graal.asm.amd64.AMD64Assembler.AMD64MOp;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ZapRegistersOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ZapRegistersOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,12 +26,12 @@ import java.util.Set; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterSaveLayout; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterSaveLayout; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; import com.oracle.graal.asm.amd64.AMD64MacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/phases/StackMoveOptimizationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/phases/StackMoveOptimizationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,14 +28,14 @@ import java.util.Collections; import java.util.List; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.options.NestedBooleanOptionValue; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.options.NestedBooleanOptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/ConstantStackCastTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/ConstantStackCastTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,13 +24,13 @@ import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; import org.junit.Before; import org.junit.Test;
--- a/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/LIRTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/LIRTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,9 +30,9 @@ import java.lang.reflect.Modifier; import java.util.stream.Stream; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Value; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/LIRTestSpecification.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/LIRTestSpecification.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.HashMap; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.gen.LIRGeneratorTool;
--- a/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/LIRTestTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/LIRTestTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.jtt; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import org.junit.Test;
--- a/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/StackMoveTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.jtt/src/com/oracle/graal/lir/jtt/StackMoveTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.lir.jtt; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; import org.junit.Before; import org.junit.Test;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCAddressValue.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCAddressValue.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir.sparc; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.sparc.SPARCAddress; import com.oracle.graal.lir.CompositeValue;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCArithmetic.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCArithmetic.java Thu Oct 08 17:41:33 2015 -0700 @@ -38,19 +38,19 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.HINT; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import static jdk.internal.jvmci.sparc.SPARCKind.DOUBLE; -import static jdk.internal.jvmci.sparc.SPARCKind.DWORD; -import static jdk.internal.jvmci.sparc.SPARCKind.SINGLE; -import static jdk.internal.jvmci.sparc.SPARCKind.WORD; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.sparc.SPARC; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.sparc.SPARC.g0; +import static jdk.vm.ci.sparc.SPARCKind.DOUBLE; +import static jdk.vm.ci.sparc.SPARCKind.DWORD; +import static jdk.vm.ci.sparc.SPARCKind.SINGLE; +import static jdk.vm.ci.sparc.SPARCKind.WORD; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.sparc.SPARC; import com.oracle.graal.asm.Label; import com.oracle.graal.asm.sparc.SPARCAssembler;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCArrayEqualsOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCArrayEqualsOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -32,18 +32,18 @@ import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.Less; import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.NotEqual; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import static jdk.internal.jvmci.sparc.SPARCKind.WORD; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.sparc.SPARC.g0; +import static jdk.vm.ci.sparc.SPARCKind.WORD; import java.lang.reflect.Array; import java.lang.reflect.Field; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.sparc.SPARCKind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.sparc.SPARCKind; import sun.misc.Unsafe; import com.oracle.graal.asm.Label;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCBitManipulationOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCBitManipulationOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,17 +23,17 @@ package com.oracle.graal.lir.sparc; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import static jdk.internal.jvmci.sparc.SPARCKind.DWORD; -import static jdk.internal.jvmci.sparc.SPARCKind.WORD; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.sparc.SPARC.g0; +import static jdk.vm.ci.sparc.SPARCKind.DWORD; +import static jdk.vm.ci.sparc.SPARCKind.WORD; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCBreakpointOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCBreakpointOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.sparc.SPARCMacroAssembler; import com.oracle.graal.lir.LIRInstructionClass;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCByteSwapOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCByteSwapOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,16 +26,16 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.UNINITIALIZED; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.sparc.SPARCKind.DWORD; -import static jdk.internal.jvmci.sparc.SPARCKind.WORD; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.sparc.SPARCKind; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.sparc.SPARCKind.DWORD; +import static jdk.vm.ci.sparc.SPARCKind.WORD; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.sparc.SPARCKind; import com.oracle.graal.asm.sparc.SPARCAddress; import com.oracle.graal.asm.sparc.SPARCAssembler.Asi;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCCall.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCCall.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,14 +25,14 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.sparc.SPARC.o7; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.InvokeTarget; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.sparc.SPARC.o7; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.InvokeTarget; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.sparc.SPARCAddress; import com.oracle.graal.asm.sparc.SPARCMacroAssembler;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCControlFlow.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCControlFlow.java Thu Oct 08 17:41:33 2015 -0700 @@ -64,11 +64,11 @@ import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; import static com.oracle.graal.lir.sparc.SPARCMove.const2reg; import static com.oracle.graal.lir.sparc.SPARCOP3Op.emitOp3; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.sparc.SPARC.CPU; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import static jdk.internal.jvmci.sparc.SPARCKind.DWORD; -import static jdk.internal.jvmci.sparc.SPARCKind.WORD; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.sparc.SPARC.CPU; +import static jdk.vm.ci.sparc.SPARC.g0; +import static jdk.vm.ci.sparc.SPARCKind.DWORD; +import static jdk.vm.ci.sparc.SPARCKind.WORD; import java.util.ArrayList; import java.util.EnumSet; @@ -76,16 +76,16 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.sparc.SPARC; -import jdk.internal.jvmci.sparc.SPARC.CPUFeature; -import jdk.internal.jvmci.sparc.SPARCKind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.sparc.SPARC; +import jdk.vm.ci.sparc.SPARC.CPUFeature; +import jdk.vm.ci.sparc.SPARCKind; import com.oracle.graal.asm.Assembler; import com.oracle.graal.asm.Assembler.LabelHint;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFloatCompareOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFloatCompareOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,8 +23,8 @@ package com.oracle.graal.lir.sparc; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.sparc.SPARCAssembler; import com.oracle.graal.asm.sparc.SPARCAssembler.CC;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMap.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMap.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.lir.sparc; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.sparc.SPARC; -import jdk.internal.jvmci.sparc.SPARCKind; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.sparc.SPARC; +import jdk.vm.ci.sparc.SPARCKind; import com.oracle.graal.asm.NumUtil; import com.oracle.graal.lir.framemap.FrameMap;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMapBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMapBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir.sparc; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.StackSlot; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.StackSlot; import com.oracle.graal.lir.framemap.FrameMap; import com.oracle.graal.lir.framemap.FrameMapBuilderImpl;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCImmediateAddressValue.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCImmediateAddressValue.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,14 +23,14 @@ package com.oracle.graal.lir.sparc; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isLegal; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isLegal; import java.util.EnumSet; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.sparc.SPARCAddress; import com.oracle.graal.asm.sparc.SPARCAssembler;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCIndexedAddressValue.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCIndexedAddressValue.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,14 +23,14 @@ package com.oracle.graal.lir.sparc; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isLegal; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isLegal; import java.util.EnumSet; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.sparc.SPARCAddress; import com.oracle.graal.lir.CompositeValue;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCLIRInstruction.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCLIRInstruction.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.sparc; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaConstant; import com.oracle.graal.asm.NumUtil; import com.oracle.graal.asm.sparc.SPARCMacroAssembler;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCLoadConstantTableBaseOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCLoadConstantTableBaseOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,9 +23,9 @@ package com.oracle.graal.lir.sparc; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.AllocatableValue; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.asm.sparc.SPARCAssembler; import com.oracle.graal.asm.sparc.SPARCMacroAssembler;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java Thu Oct 08 17:41:33 2015 -0700 @@ -32,32 +32,32 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.UNINITIALIZED; import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.internal.jvmci.code.MemoryBarriers.STORE_LOAD; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import static jdk.internal.jvmci.sparc.SPARCKind.DOUBLE; -import static jdk.internal.jvmci.sparc.SPARCKind.DWORD; -import static jdk.internal.jvmci.sparc.SPARCKind.SINGLE; -import static jdk.internal.jvmci.sparc.SPARCKind.WORD; +import static jdk.vm.ci.code.MemoryBarriers.STORE_LOAD; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.asStackSlot; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.sparc.SPARC.g0; +import static jdk.vm.ci.sparc.SPARCKind.DOUBLE; +import static jdk.vm.ci.sparc.SPARCKind.DWORD; +import static jdk.vm.ci.sparc.SPARCKind.SINGLE; +import static jdk.vm.ci.sparc.SPARCKind.WORD; import java.util.Set; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.sparc.SPARC; -import jdk.internal.jvmci.sparc.SPARC.CPUFeature; -import jdk.internal.jvmci.sparc.SPARCKind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.sparc.SPARC; +import jdk.vm.ci.sparc.SPARC.CPUFeature; +import jdk.vm.ci.sparc.SPARCKind; import com.oracle.graal.asm.sparc.SPARCAddress; import com.oracle.graal.asm.sparc.SPARCAssembler;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCOP3Op.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCOP3Op.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,13 +27,13 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.common.JVMCIError.shouldNotReachHere; -import static jdk.internal.jvmci.sparc.SPARC.g0; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.common.JVMCIError.shouldNotReachHere; +import static jdk.vm.ci.sparc.SPARC.g0; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.sparc.SPARCAssembler; import com.oracle.graal.asm.sparc.SPARCAssembler.Op3s;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCOPFOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCOPFOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,11 +23,11 @@ package com.oracle.graal.lir.sparc; import static com.oracle.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.sparc.SPARC; -import jdk.internal.jvmci.sparc.SPARCKind; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.sparc.SPARC; +import jdk.vm.ci.sparc.SPARCKind; import com.oracle.graal.asm.sparc.SPARCAssembler; import com.oracle.graal.asm.sparc.SPARCAssembler.Opfs;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCSaveRegistersOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCSaveRegistersOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,19 +24,19 @@ import static com.oracle.graal.lir.LIRInstruction.OperandFlag.STACK; import static com.oracle.graal.lir.sparc.SPARCDelayedControlTransfer.DUMMY; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.asStackSlot; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; import java.util.Arrays; import java.util.Set; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterSaveLayout; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.ValueUtil; -import jdk.internal.jvmci.sparc.SPARC; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterSaveLayout; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.ValueUtil; +import jdk.vm.ci.sparc.SPARC; import com.oracle.graal.asm.sparc.SPARCAddress; import com.oracle.graal.asm.sparc.SPARCMacroAssembler;
--- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest1.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest1.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,8 +29,8 @@ import java.util.EnumSet; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import org.junit.Test;
--- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/GenericValueMapTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/GenericValueMapTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,11 +24,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.Register.RegisterCategory; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.Register.RegisterCategory; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; import org.junit.Test;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValue.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValue.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,8 +28,8 @@ import java.lang.annotation.Target; import java.util.EnumSet; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.DebugMetric;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValueClass.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValueClass.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,7 +26,7 @@ import java.util.Arrays; import java.util.EnumSet; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.FieldIntrospection; import com.oracle.graal.compiler.common.Fields;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ConstantValue.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ConstantValue.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.lir; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; /** * Represents an inlined {@link Constant} value.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ControlFlowOptimizer.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ControlFlowOptimizer.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,7 +28,7 @@ import java.util.Iterator; import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/EdgeMoveOptimizer.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/EdgeMoveOptimizer.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.lir.StandardOp.LoadConstantOp;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FullInfopointOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FullInfopointOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir; -import jdk.internal.jvmci.code.InfopointReason; +import jdk.vm.ci.code.InfopointReason; import com.oracle.graal.lir.asm.CompilationResultBuilder;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionValueConsumer.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionValueConsumer.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.EnumSet; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionValueProcedure.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionValueProcedure.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.EnumSet; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,22 +22,22 @@ */ package com.oracle.graal.lir; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlotValue; -import static jdk.internal.jvmci.code.ValueUtil.isConstantJavaValue; -import static jdk.internal.jvmci.code.ValueUtil.isIllegalJavaValue; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualObject; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.asStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isConstantJavaValue; +import static jdk.vm.ci.code.ValueUtil.isIllegalJavaValue; +import static jdk.vm.ci.code.ValueUtil.isVirtualObject; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.Arrays; import java.util.EnumSet; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.code.DebugInfo; -import jdk.internal.jvmci.code.StackLockValue; -import jdk.internal.jvmci.code.VirtualObject; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaValue; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.code.DebugInfo; +import jdk.vm.ci.code.StackLockValue; +import jdk.vm.ci.code.VirtualObject; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaValue; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java Thu Oct 08 17:41:33 2015 -0700 @@ -40,10 +40,10 @@ import java.util.EnumMap; import java.util.EnumSet; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.Value; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.DebugMetric;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstructionClass.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstructionClass.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,9 +26,9 @@ import java.util.Arrays; import java.util.EnumSet; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.Fields; import com.oracle.graal.compiler.common.FieldsScanner;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java Thu Oct 08 17:41:33 2015 -0700 @@ -36,9 +36,9 @@ import java.util.Map; import java.util.Map.Entry; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.FieldIntrospection; import com.oracle.graal.compiler.common.Fields;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRValueUtil.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRValueUtil.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.Value; public final class LIRValueUtil {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRVerifier.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRVerifier.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,18 +25,18 @@ import static com.oracle.graal.lir.LIRValueUtil.asVariable; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; import java.util.Arrays; import java.util.BitSet; import java.util.EnumSet; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.debug.TTY;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/NullCheckOptimizer.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/NullCheckOptimizer.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.lir.StandardOp.ImplicitNullCheck;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/RedundantMoveElimination.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/RedundantMoveElimination.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; import java.util.Arrays; import java.util.Collections; @@ -31,11 +31,11 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/SimpleInfopointOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/SimpleInfopointOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir; -import jdk.internal.jvmci.code.BytecodePosition; -import jdk.internal.jvmci.code.DebugInfo; -import jdk.internal.jvmci.code.InfopointReason; +import jdk.vm.ci.code.BytecodePosition; +import jdk.vm.ci.code.DebugInfo; +import jdk.vm.ci.code.InfopointReason; import com.oracle.graal.lir.asm.CompilationResultBuilder;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StandardOp.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StandardOp.java Thu Oct 08 17:41:33 2015 -0700 @@ -32,14 +32,14 @@ import java.util.List; import java.util.Set; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterSaveLayout; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterSaveLayout; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.Label; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/SwitchStrategy.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/SwitchStrategy.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,8 +25,8 @@ import java.util.Arrays; import java.util.Comparator; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; import com.oracle.graal.asm.Assembler; import com.oracle.graal.asm.Label;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueConsumer.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueConsumer.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.EnumSet; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueProcedure.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueProcedure.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.EnumSet; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/Variable.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/Variable.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.lir; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; /** * Represents a value that is yet to be bound to a machine location (such as a {@link RegisterValue}
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/Interval.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/Interval.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,26 +24,26 @@ import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.util.IntList; import com.oracle.graal.compiler.common.util.Util;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScan.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScan.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,32 +25,32 @@ import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; import static com.oracle.graal.lir.LIRValueUtil.isVariable; import static com.oracle.graal.lir.phases.LIRPhase.Options.LIROptimization; -import static jdk.internal.jvmci.code.CodeUtil.isEven; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; -import static jdk.internal.jvmci.code.ValueUtil.isLegal; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.CodeUtil.isEven; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isLegal; +import static jdk.vm.ci.code.ValueUtil.isRegister; import java.util.Arrays; import java.util.BitSet; import java.util.EnumSet; import java.util.List; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterAttributes; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.options.NestedBooleanOptionValue; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterAttributes; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.options.NestedBooleanOptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,17 +25,17 @@ import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.Collections; import java.util.EnumSet; import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,13 +24,13 @@ import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanIntervalDumper.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanIntervalDumper.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.alloc.lsra.Interval.UsePosList; import com.oracle.graal.lir.debug.IntervalDumper;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,10 +26,10 @@ import static com.oracle.graal.lir.LIRValueUtil.asVariable; import static com.oracle.graal.lir.LIRValueUtil.isVariable; import static com.oracle.graal.lir.debug.LIRGenerationDebugContext.getSourceForOperandFromDebugContext; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.asStackSlot; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; import java.util.ArrayDeque; import java.util.BitSet; @@ -38,15 +38,15 @@ import java.util.HashSet; import java.util.List; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.BackendOptions; import com.oracle.graal.compiler.common.alloc.ComputeBlockOrder;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,13 +24,13 @@ import static com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph.commonDominator; import static com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph.dominates; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; import java.util.Iterator; import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,8 +26,8 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,7 +27,7 @@ import java.util.BitSet; import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanWalker.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanWalker.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,18 +23,18 @@ package com.oracle.graal.lir.alloc.lsra; import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import static jdk.internal.jvmci.code.CodeUtil.isOdd; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.CodeUtil.isOdd; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig.AllocatableRegisters; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/MoveResolver.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/MoveResolver.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,21 +22,21 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isRegister; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Indent;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,14 +22,14 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/OutOfRegistersException.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/OutOfRegistersException.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.alloc.lsra; -import jdk.internal.jvmci.code.BailoutException; +import jdk.vm.ci.code.BailoutException; public class OutOfRegistersException extends BailoutException {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/RegisterVerifier.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/RegisterVerifier.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,16 +22,16 @@ */ package com.oracle.graal.lir.alloc.lsra; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.compiler.common.util.ArrayMap;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinarScanResolveDataFlowPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinarScanResolveDataFlowPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,12 +24,12 @@ import static com.oracle.graal.lir.LIRValueUtil.asConstant; import static com.oracle.graal.lir.LIRValueUtil.isConstantValue; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; import java.util.List; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScan.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScan.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import static com.oracle.graal.compiler.common.BackendOptions.LinearScanVariant; import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; import com.oracle.graal.compiler.common.BackendOptions.LSRAVariant; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.EnumSet; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Value; import com.oracle.graal.debug.Debug; import com.oracle.graal.lir.LIRInstruction;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,21 +22,21 @@ */ package com.oracle.graal.lir.alloc.lsra.ssa; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlotValue; -import static jdk.internal.jvmci.code.ValueUtil.asVirtualStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.asStackSlot; +import static jdk.vm.ci.code.ValueUtil.asStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.asVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.Arrays; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.alloc.lsra.Interval;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssi/SSILinearScan.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssi/SSILinearScan.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssi/SSILinearScanLifetimeAnalysisPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssi/SSILinearScanLifetimeAnalysisPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,9 +26,9 @@ import java.util.EnumSet; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssi/SSILinearScanResolveDataFlowPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssi/SSILinearScanResolveDataFlowPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,13 +25,13 @@ import static com.oracle.graal.lir.LIRValueUtil.asConstant; import static com.oracle.graal.lir.LIRValueUtil.isConstantValue; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.HashMap; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/FixedInterval.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/FixedInterval.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.lir.alloc.trace; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.LIRInstruction;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/IntervalHint.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/IntervalHint.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.alloc.trace; -import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.vm.ci.meta.AllocatableValue; /** * An interval that is a hint for an {@code TraceInterval interval}.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/RegisterVerifier.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/RegisterVerifier.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,16 +22,16 @@ */ package com.oracle.graal.lir.alloc.trace; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.compiler.common.util.ArrayMap;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/ShadowedRegisterValue.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/ShadowedRegisterValue.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,8 +27,8 @@ import java.util.EnumSet; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlotValue; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlotValue; import com.oracle.graal.lir.CompositeValue; import com.oracle.graal.lir.InstructionValueConsumer;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceAllocationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceAllocationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceGlobalMoveResolutionPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceGlobalMoveResolutionPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,14 +24,14 @@ import static com.oracle.graal.lir.alloc.trace.TraceUtil.asShadowedRegisterValue; import static com.oracle.graal.lir.alloc.trace.TraceUtil.isShadowedRegisterValue; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isIllegal; import java.util.List; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.alloc.TraceBuilder.TraceBuilderResult;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceGlobalMoveResolver.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceGlobalMoveResolver.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,30 +24,30 @@ import static com.oracle.graal.lir.alloc.trace.TraceUtil.asShadowedRegisterValue; import static com.oracle.graal.lir.alloc.trace.TraceUtil.isShadowedRegisterValue; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlotValue; -import static jdk.internal.jvmci.code.ValueUtil.asVirtualStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.asStackSlot; +import static jdk.vm.ci.code.ValueUtil.asStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.asVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Indent;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceInterval.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceInterval.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,26 +24,26 @@ import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.util.Util; import com.oracle.graal.debug.TTY;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceIntervalDumper.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceIntervalDumper.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir.alloc.trace; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.debug.IntervalDumper;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceIntervalWalker.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceIntervalWalker.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.alloc.trace; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Indent;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScan.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScan.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,29 +24,29 @@ import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import static jdk.internal.jvmci.code.CodeUtil.isEven; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.asRegisterValue; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; -import static jdk.internal.jvmci.code.ValueUtil.isLegal; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.CodeUtil.isEven; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.asRegisterValue; +import static jdk.vm.ci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isLegal; +import static jdk.vm.ci.code.ValueUtil.isRegister; import java.util.Arrays; import java.util.BitSet; import java.util.EnumSet; import java.util.List; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterAttributes; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterAttributes; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.alloc.TraceBuilder.TraceBuilderResult;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanAllocationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanAllocationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.alloc.TraceBuilder.TraceBuilderResult;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanAssignLocationsPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanAssignLocationsPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,20 +26,20 @@ import static com.oracle.graal.lir.LIRValueUtil.isConstantValue; import static com.oracle.graal.lir.LIRValueUtil.isVariable; import static com.oracle.graal.lir.alloc.trace.TraceRegisterAllocationPhase.Options.TraceRAshareSpillInformation; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.Collections; import java.util.EnumSet; import java.util.List; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.alloc.TraceBuilder.TraceBuilderResult;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanEliminateSpillMovePhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanEliminateSpillMovePhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,13 +23,13 @@ package com.oracle.graal.lir.alloc.trace; import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.AllocatableValue; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.AllocatableValue; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.alloc.TraceBuilder.TraceBuilderResult;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanLifetimeAnalysisPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanLifetimeAnalysisPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,25 +27,25 @@ import static com.oracle.graal.lir.alloc.trace.TraceLinearScan.isVariableOrRegister; import static com.oracle.graal.lir.alloc.trace.TraceRegisterAllocationPhase.Options.TraceRAshareSpillInformation; import static com.oracle.graal.lir.alloc.trace.TraceRegisterAllocationPhase.Options.TraceRAuseInterTraceHints; -import static jdk.internal.jvmci.code.ValueUtil.asRegisterValue; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.asRegisterValue; +import static jdk.vm.ci.code.ValueUtil.asStackSlot; +import static jdk.vm.ci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; import java.util.BitSet; import java.util.EnumSet; import java.util.List; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterValue; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterValue; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.BackendOptions; import com.oracle.graal.compiler.common.alloc.ComputeBlockOrder;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanRegisterAllocationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanRegisterAllocationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.alloc.TraceBuilder.TraceBuilderResult;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanResolveDataFlowPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanResolveDataFlowPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,15 +25,15 @@ import static com.oracle.graal.compiler.common.GraalOptions.DetailedAsserts; import static com.oracle.graal.lir.LIRValueUtil.asConstant; import static com.oracle.graal.lir.LIRValueUtil.isConstantValue; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.List; import java.util.ListIterator; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.alloc.TraceBuilder.TraceBuilderResult;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanWalker.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanWalker.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,19 +23,19 @@ package com.oracle.graal.lir.alloc.trace; import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import static jdk.internal.jvmci.code.CodeUtil.isOdd; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.CodeUtil.isOdd; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig.AllocatableRegisters; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLocalMoveResolver.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLocalMoveResolver.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,30 +22,30 @@ */ package com.oracle.graal.lir.alloc.trace; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlotValue; -import static jdk.internal.jvmci.code.ValueUtil.asVirtualStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.asStackSlot; +import static jdk.vm.ci.code.ValueUtil.asStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.asVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Indent;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceRegisterAllocationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceRegisterAllocationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,14 +22,14 @@ */ package com.oracle.graal.lir.alloc.trace; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.alloc.TraceBuilder;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceTrivialAllocator.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceTrivialAllocator.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,8 +28,8 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.alloc.TraceBuilder.TraceBuilderResult;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceUtil.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceUtil.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.alloc.trace; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.alloc.TraceBuilder.TraceBuilderResult; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import static com.oracle.graal.lir.LIRValueUtil.asJavaConstant; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.asStackSlot; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; import java.util.ArrayList; import java.util.Arrays; @@ -33,26 +33,26 @@ import java.util.List; import java.util.function.Consumer; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.CompilationResult.ConstantReference; -import jdk.internal.jvmci.code.CompilationResult.DataSectionReference; -import jdk.internal.jvmci.code.DataSection.Data; -import jdk.internal.jvmci.code.DataSection.DataBuilder; -import jdk.internal.jvmci.code.DebugInfo; -import jdk.internal.jvmci.code.InfopointReason; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.InvokeTarget; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.VMConstant; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult.ConstantReference; +import jdk.vm.ci.code.CompilationResult.DataSectionReference; +import jdk.vm.ci.code.DataSection.Data; +import jdk.vm.ci.code.DataSection.DataBuilder; +import jdk.vm.ci.code.DebugInfo; +import jdk.vm.ci.code.InfopointReason; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.InvokeTarget; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.VMConstant; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.asm.AbstractAddress; import com.oracle.graal.asm.Assembler;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilderFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilderFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir.asm; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CompilationResult; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CompilationResult; import com.oracle.graal.asm.Assembler; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java Thu Oct 08 17:41:33 2015 -0700 @@ -33,13 +33,13 @@ import java.util.EnumSet; import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.options.NestedBooleanOptionValue; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.options.NestedBooleanOptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.compiler.common.cfg.BlockMap;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/DefUseTree.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/DefUseTree.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,8 +26,8 @@ import java.util.List; import java.util.function.Consumer; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.lir.LIRInstruction;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/UseEntry.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/UseEntry.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.constopt; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.lir.LIRInstruction;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/debug/LIRGenerationDebugContext.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/debug/LIRGenerationDebugContext.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.debug; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.debug.Debug; import com.oracle.graal.lir.LIR;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/LocationMarker.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/LocationMarker.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,15 +22,15 @@ */ package com.oracle.graal.lir.dfa; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isIllegal; import java.util.EnumSet; import java.util.List; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.compiler.common.cfg.BlockMap;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/LocationMarkerPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/LocationMarkerPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,17 +22,17 @@ */ package com.oracle.graal.lir.dfa; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; import java.util.List; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterAttributes; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterAttributes; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/MarkBasePointersPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/MarkBasePointersPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/RegStackValueSet.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/RegStackValueSet.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,17 +22,17 @@ */ package com.oracle.graal.lir.dfa; -import static jdk.internal.jvmci.code.ValueUtil.asRegister; -import static jdk.internal.jvmci.code.ValueUtil.asStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.asRegister; +import static jdk.vm.ci.code.ValueUtil.asStackSlot; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; import java.util.EnumSet; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMap.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMap.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,15 +26,15 @@ import java.util.BitSet; import java.util.List; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.asm.NumUtil;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,11 +25,11 @@ import java.util.BitSet; import java.util.List; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.meta.LIRKind; import com.oracle.graal.lir.gen.LIRGenerationResult; import com.oracle.graal.lir.stackslotalloc.StackSlotAllocator;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,21 +22,21 @@ */ package com.oracle.graal.lir.framemap; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.ArrayList; import java.util.BitSet; import java.util.EnumSet; import java.util.List; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.RegisterConfig; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.RegisterConfig; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.vm.ci.code.VirtualStackSlot; /** * A {@link FrameMapBuilder} that allows access to the underlying {@link FrameMap}.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/ReferenceMapBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/ReferenceMapBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir.framemap; -import jdk.internal.jvmci.code.ReferenceMap; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.ReferenceMap; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.LIRFrameState;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/SimpleVirtualStackSlot.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/SimpleVirtualStackSlot.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir.framemap; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.meta.LIRKind; /** * Represents a {@link VirtualStackSlot virtual stack slot} for a specific {@link LIRKind kind}.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/VirtualStackSlotRange.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/VirtualStackSlotRange.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.BitSet; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.meta.LIRKind; /** * Represents a {@link #getSlots() numbered} range of {@link VirtualStackSlot virtual stack slot} of
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/ArithmeticLIRGenerator.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/ArithmeticLIRGenerator.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.lir.gen; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.Variable;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/ArithmeticLIRGeneratorTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/ArithmeticLIRGeneratorTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir.gen; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.calc.FloatConvert; import com.oracle.graal.lir.LIRFrameState;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/BenchmarkCounterFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/BenchmarkCounterFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.gen; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.LIRInstruction;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/BlockValueMap.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/BlockValueMap.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.gen; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerator.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerator.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,30 +27,30 @@ import static com.oracle.graal.lir.LIRValueUtil.isConstantValue; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import static jdk.internal.jvmci.code.ValueUtil.asAllocatableValue; -import static jdk.internal.jvmci.code.ValueUtil.isAllocatableValue; -import static jdk.internal.jvmci.code.ValueUtil.isLegal; +import static jdk.vm.ci.code.ValueUtil.asAllocatableValue; +import static jdk.vm.ci.code.ValueUtil.isAllocatableValue; +import static jdk.vm.ci.code.ValueUtil.isLegal; import java.util.ArrayList; import java.util.List; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterAttributes; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterAttributes; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.asm.Label; import com.oracle.graal.compiler.common.calc.Condition;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGeneratorTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGeneratorTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,21 +22,21 @@ */ package com.oracle.graal.lir.gen; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterAttributes; -import jdk.internal.jvmci.code.StackSlotValue; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.PlatformKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterAttributes; +import jdk.vm.ci.code.StackSlotValue; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.PlatformKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/PhiResolver.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/PhiResolver.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,16 +23,16 @@ package com.oracle.graal.lir.gen; import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import static jdk.internal.jvmci.code.ValueUtil.isIllegal; -import static jdk.internal.jvmci.code.ValueUtil.isLegal; -import static jdk.internal.jvmci.meta.Value.ILLEGAL; +import static jdk.vm.ci.code.ValueUtil.isIllegal; +import static jdk.vm.ci.code.ValueUtil.isLegal; +import static jdk.vm.ci.meta.Value.ILLEGAL; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/SpillMoveFactoryBase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/SpillMoveFactoryBase.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,9 +27,9 @@ import java.util.EnumSet; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.LIRInstruction; import com.oracle.graal.lir.LIRInstruction.OperandFlag;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/AllocationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/AllocationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,10 +25,10 @@ import java.util.List; import java.util.regex.Pattern; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhaseSuite.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhaseSuite.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,7 +26,7 @@ import java.util.List; import java.util.ListIterator; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.lir.gen.LIRGenerationResult;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRSuites.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRSuites.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir.phases; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.VirtualStackSlot; import com.oracle.graal.lir.LIR; import com.oracle.graal.lir.Variable;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/PostAllocationOptimizationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/PostAllocationOptimizationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.lir.gen.BenchmarkCounterFactory;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/PostAllocationOptimizationStage.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/PostAllocationOptimizationStage.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,10 +23,10 @@ package com.oracle.graal.lir.phases; import static com.oracle.graal.lir.phases.LIRPhase.Options.LIROptimization; -import jdk.internal.jvmci.options.NestedBooleanOptionValue; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.options.NestedBooleanOptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.lir.ControlFlowOptimizer; import com.oracle.graal.lir.EdgeMoveOptimizer;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/PreAllocationOptimizationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/PreAllocationOptimizationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.lir.gen.LIRGenerationResult;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/profiling/MoveProfiling.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/profiling/MoveProfiling.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,19 +22,19 @@ */ package com.oracle.graal.lir.profiling; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlot; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlot; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.lir.ConstantValue;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssa/SSADestructionPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssa/SSADestructionPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssa/SSAUtil.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssa/SSAUtil.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.lir.LIR;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssa/SSAVerifier.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssa/SSAVerifier.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,14 +24,14 @@ package com.oracle.graal.lir.ssa; import static com.oracle.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; import java.util.BitSet; import java.util.EnumSet; import java.util.HashMap; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIBlockValueMapImpl.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIBlockValueMapImpl.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,14 +23,14 @@ package com.oracle.graal.lir.ssi; import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Deque; import java.util.List; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIConstructionPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIConstructionPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,7 +27,7 @@ import java.util.Deque; import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIUtil.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIUtil.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.lir.LIR;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIVerifier.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ssi/SSIVerifier.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,16 +23,16 @@ package com.oracle.graal.lir.ssi; import static com.oracle.graal.lir.LIRValueUtil.isConstantValue; -import static jdk.internal.jvmci.code.ValueUtil.isRegister; -import static jdk.internal.jvmci.code.ValueUtil.isStackSlotValue; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.isRegister; +import static jdk.vm.ci.code.ValueUtil.isStackSlotValue; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.EnumSet; import java.util.HashMap; import java.util.List; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/FixPointIntervalBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/FixPointIntervalBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir.stackslotalloc; -import static jdk.internal.jvmci.code.ValueUtil.asVirtualStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.asVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.ArrayDeque; import java.util.BitSet; @@ -33,8 +33,8 @@ import java.util.List; import java.util.Set; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.compiler.common.cfg.BlockMap;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/LSStackSlotAllocator.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/LSStackSlotAllocator.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,8 +23,8 @@ package com.oracle.graal.lir.stackslotalloc; import static com.oracle.graal.lir.phases.LIRPhase.Options.LIROptimization; -import static jdk.internal.jvmci.code.ValueUtil.asVirtualStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.asVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.ArrayDeque; import java.util.Arrays; @@ -36,14 +36,14 @@ import java.util.Set; import java.util.function.Consumer; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; -import jdk.internal.jvmci.options.NestedBooleanOptionValue; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; +import jdk.vm.ci.options.NestedBooleanOptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,15 +22,15 @@ */ package com.oracle.graal.lir.stackslotalloc; -import static jdk.internal.jvmci.code.ValueUtil.asVirtualStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.asVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; import java.util.List; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.alloc.RegisterAllocationConfig; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackInterval.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackInterval.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.lir.stackslotalloc; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.meta.LIRKind; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.meta.LIRKind; public final class StackInterval {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackIntervalDumper.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackIntervalDumper.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir.stackslotalloc; -import jdk.internal.jvmci.code.VirtualStackSlot; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.VirtualStackSlot; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.debug.IntervalDumper;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackSlotAllocator.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/StackSlotAllocator.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.lir.stackslotalloc; -import jdk.internal.jvmci.code.StackSlot; -import jdk.internal.jvmci.code.VirtualStackSlot; +import jdk.vm.ci.code.StackSlot; +import jdk.vm.ci.code.VirtualStackSlot; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.DebugMetric;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/GenericValueMap.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/GenericValueMap.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.Map; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.CollectionsFactory;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/IndexedValueMap.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/IndexedValueMap.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import java.util.EnumSet; import java.util.Objects; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.lir.InstructionValueConsumer; import com.oracle.graal.lir.InstructionValueProcedure;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/ValueMap.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/ValueMap.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.util; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; /** * A map interface to map {@link Value}s to other objects.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/ValueSet.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/ValueSet.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.lir.util; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; public abstract class ValueSet<S extends ValueSet<S>> {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/VariableVirtualStackValueMap.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/util/VariableVirtualStackValueMap.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,10 +24,10 @@ import static com.oracle.graal.lir.LIRValueUtil.asVariable; import static com.oracle.graal.lir.LIRValueUtil.isVariable; -import static jdk.internal.jvmci.code.ValueUtil.asVirtualStackSlot; -import static jdk.internal.jvmci.code.ValueUtil.isVirtualStackSlot; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Value; +import static jdk.vm.ci.code.ValueUtil.asVirtualStackSlot; +import static jdk.vm.ci.code.ValueUtil.isVirtualStackSlot; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Value; public class VariableVirtualStackValueMap<K extends Value, T> extends ValueMap<K, T> {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/BasicInductionVariable.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/BasicInductionVariable.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import static com.oracle.graal.loop.MathUtil.add; import static com.oracle.graal.loop.MathUtil.mul; import static com.oracle.graal.loop.MathUtil.sub; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/CountedLoopInfo.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/CountedLoopInfo.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,10 +25,10 @@ import static com.oracle.graal.loop.MathUtil.add; import static com.oracle.graal.loop.MathUtil.divBefore; import static com.oracle.graal.loop.MathUtil.sub; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedOffsetInductionVariable.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedOffsetInductionVariable.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import static com.oracle.graal.loop.MathUtil.add; import static com.oracle.graal.loop.MathUtil.sub; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.nodes.ValueNode;
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/InductionVariable.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/InductionVariable.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.loop; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.nodes.StructuredGraph;
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopEx.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopEx.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,7 +30,7 @@ import java.util.Map; import java.util.Queue; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.cfg.Loop;
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragment.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragment.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.Map; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.graph.Graph; import com.oracle.graal.graph.Graph.DuplicationReplacement;
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragmentInside.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragmentInside.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.graph.Graph.DuplicationReplacement;
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopPolicies.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopPolicies.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,9 +28,9 @@ import java.util.List; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.DebugMetric;
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopTransformations.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopTransformations.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,7 +27,7 @@ import java.util.ArrayList; import java.util.List; -import jdk.internal.jvmci.code.BailoutException; +import jdk.vm.ci.code.BailoutException; import com.oracle.graal.graph.Graph.Mark; import com.oracle.graal.graph.NodePosIterator;
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/GraalState.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/GraalState.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.microbenchmarks.graal.util; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.MetaAccessProvider; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State;
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/GraalUtil.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/GraalUtil.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,8 +25,8 @@ import java.lang.reflect.Method; import java.util.List; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Node; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration;
--- a/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/GraphState.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.microbenchmarks/src/com/oracle/graal/microbenchmarks/graal/util/GraphState.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import static com.oracle.graal.microbenchmarks.graal.util.GraalUtil.getGraph; import static com.oracle.graal.microbenchmarks.graal.util.GraalUtil.getMethodFromMethodSpec; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Scope;
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/AbstractObjectStampTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/AbstractObjectStampTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.test; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ResolvedJavaType; import org.junit.Assert;
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/IntegerStampTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/IntegerStampTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; import org.junit.Before; import org.junit.Test;
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/NegateNodeCanonicalizationTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/NegateNodeCanonicalizationTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,7 +23,7 @@ package com.oracle.graal.nodes.test; import static org.junit.Assert.assertEquals; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaConstant; import org.junit.Before; import org.junit.Test;
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampJoinTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampJoinTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.test; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampMeetTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampMeetTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.test; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaType; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.test; -import jdk.internal.jvmci.meta.TrustedInterface; +import jdk.vm.ci.meta.TrustedInterface; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractDeoptimizeNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractDeoptimizeNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.IterableNodeType;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractFixedGuardNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractFixedGuardNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BinaryOpLogicNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BinaryOpLogicNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.Graph;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.List; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,15 +24,15 @@ import java.util.Map; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.PrimitiveConstant; -import jdk.internal.jvmci.meta.VMConstant; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.PrimitiveConstant; +import jdk.vm.ci.meta.VMConstant; import com.oracle.graal.compiler.common.type.AbstractObjectStamp; import com.oracle.graal.compiler.common.type.AbstractPointerStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.Value; import com.oracle.graal.debug.Debug; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DirectCallTargetNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DirectCallTargetNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.List; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DynamicDeoptimizeNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DynamicDeoptimizeNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.graph.Node; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EncodedGraph.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EncodedGraph.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.Set; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EntryMarkerNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EntryMarkerNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.graph.IterableNodeType; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; import com.oracle.graal.graph.IterableNodeType; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,20 +22,20 @@ */ package com.oracle.graal.nodes; -import static jdk.internal.jvmci.code.BytecodeFrame.getPlaceholderBciName; -import static jdk.internal.jvmci.code.BytecodeFrame.isPlaceholderBci; +import static jdk.vm.ci.code.BytecodeFrame.getPlaceholderBciName; +import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.code.BytecodePosition; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaUtil; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.code.BytecodePosition; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaUtil; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.bytecode.Bytecodes; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FullInfopointNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FullInfopointNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.code.InfopointReason; +import jdk.vm.ci.code.InfopointReason; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.spi.Simplifiable;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphDecoder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphDecoder.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes; -import static jdk.internal.jvmci.common.JVMCIError.shouldNotReachHere; +import static jdk.vm.ci.common.JVMCIError.shouldNotReachHere; import java.util.ArrayDeque; import java.util.ArrayList; @@ -35,8 +35,8 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.Fields; import com.oracle.graal.compiler.common.util.TypeReader;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphEncoder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GraphEncoder.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Objects; -import jdk.internal.jvmci.code.Architecture; +import jdk.vm.ci.code.Architecture; import com.oracle.graal.compiler.common.Fields; import com.oracle.graal.compiler.common.util.FrequencyEncoder;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardedValueNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardedValueNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.IterableNodeType;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,16 +28,16 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaTypeProfile; -import jdk.internal.jvmci.meta.JavaTypeProfile.ProfiledType; -import jdk.internal.jvmci.meta.PrimitiveConstant; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaTypeProfile; +import jdk.vm.ci.meta.JavaTypeProfile.ProfiledType; +import jdk.vm.ci.meta.PrimitiveConstant; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.compiler.common.calc.Condition;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IndirectCallTargetNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IndirectCallTargetNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.List; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InfopointNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InfopointNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.code.InfopointReason; +import jdk.vm.ci.code.InfopointReason; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/Invoke.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/Invoke.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.Map; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.Map; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.graph.Node; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/KillingBeginNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/KillingBeginNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.nodeinfo.InputType;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoweredCallTargetNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoweredCallTargetNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.List; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/NamedLocationIdentity.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/NamedLocationIdentity.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,9 +25,9 @@ import java.util.EnumMap; import java.util.HashSet; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaKind.FormatWithToString; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind.FormatWithToString; +import jdk.vm.ci.meta.LocationIdentity; /** * A {@link LocationIdentity} with a name.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ParameterNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ParameterNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.IterableNodeType;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.Iterator; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ //JaCoCo Exclude -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ReturnNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ReturnNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.IterableNodeType;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SimpleInfopointNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SimpleInfopointNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.code.BytecodePosition; -import jdk.internal.jvmci.code.InfopointReason; +import jdk.vm.ci.code.BytecodePosition; +import jdk.vm.ci.code.InfopointReason; import com.oracle.graal.graph.IterableNodeType; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SimplifyingGraphDecoder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SimplifyingGraphDecoder.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.List; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.graph.Graph; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StartNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StartNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.nodeinfo.InputType;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,12 +30,12 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; -import jdk.internal.jvmci.compiler.Compiler; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.Assumptions.Assumption; -import jdk.internal.jvmci.meta.JavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.SpeculationLog; +import jdk.vm.ci.compiler.Compiler; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions.Assumption; +import jdk.vm.ci.meta.JavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.SpeculationLog; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.debug.JavaMethodContext;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/TypeCheckHints.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/TypeCheckHints.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,11 +24,11 @@ import java.util.Arrays; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.JavaTypeProfile; -import jdk.internal.jvmci.meta.JavaTypeProfile.ProfiledType; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.JavaTypeProfile; +import jdk.vm.ci.meta.JavaTypeProfile.ProfiledType; +import jdk.vm.ci.meta.ResolvedJavaType; /** * Utility for deriving hint types for a type check instruction (e.g. checkcast or instanceof) based
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnaryOpLogicNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnaryOpLogicNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNodeUtil.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNodeUtil.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Collection; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.graph.Node; import com.oracle.graal.nodeinfo.Verbosity; @@ -88,9 +88,8 @@ /** * Converts a given instruction to a value string. The representation of an node as a value is - * formed by concatenating the {@linkplain jdk.internal.jvmci.meta.JavaKind#getTypeChar - * character} denoting its {@linkplain ValueNode#getStackKind kind} and its id. For example, - * {@code "i13"}. + * formed by concatenating the {@linkplain jdk.vm.ci.meta.JavaKind#getTypeChar character} + * denoting its {@linkplain ValueNode#getStackKind kind} and its id. For example, {@code "i13"}. * * @param value the instruction to convert to a value string. If {@code value == null}, then "-" * is returned.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AddNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AddNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.PrimitiveConstant; import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BinaryArithmeticNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/BinaryArithmeticNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,8 +25,8 @@ import java.io.Serializable; import java.util.function.Function; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.type.AbstractObjectStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,7 +23,7 @@ package com.oracle.graal.nodes.calc; import static com.oracle.graal.nodes.calc.CompareNode.createCompareNode; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaConstant; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.type.IntegerStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.graph.NodeInterface;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/DivNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/DivNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.PrimitiveConstant; import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatConvertNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatConvertNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.EnumMap; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; import com.oracle.graal.compiler.common.calc.FloatConvert; import com.oracle.graal.compiler.common.type.ArithmeticOpTable;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatEqualsNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatEqualsNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.type.FloatStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatLessThanNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatLessThanNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.type.FloatStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerBelowNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerBelowNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.type.IntegerStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerConvertNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerConvertNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,8 +25,8 @@ import java.io.Serializable; import java.util.function.Function; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.IntegerConvertOp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerDivNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerDivNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.CodeUtil; +import jdk.vm.ci.code.CodeUtil; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.PrimitiveStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.PrimitiveConstant; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.PrimitiveConstant; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.type.AbstractPointerStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerLessThanNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerLessThanNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,13 +22,13 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.PrimitiveConstant; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.PrimitiveConstant; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.type.FloatStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerRemNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerRemNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.CodeUtil; +import jdk.vm.ci.code.CodeUtil; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IsNullNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IsNullNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.type.AbstractPointerStamp; import com.oracle.graal.compiler.common.type.ObjectStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.ShiftOp.Shl;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/MulNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/MulNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.PrimitiveConstant; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.PrimitiveConstant; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NormalizeCompareNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NormalizeCompareNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.type.FloatStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ObjectEqualsNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ObjectEqualsNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,13 +22,13 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.type.AbstractObjectStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.PrimitiveConstant; import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/PointerEqualsNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/PointerEqualsNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.type.AbstractPointerStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ReinterpretNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ReinterpretNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,9 +25,9 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.SerializableConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.SerializableConstant; import com.oracle.graal.compiler.common.type.ArithmeticStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.CodeUtil; +import jdk.vm.ci.code.CodeUtil; import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.ShiftOp.Shr;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ShiftNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ShiftNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,9 +25,9 @@ import java.io.Serializable; import java.util.function.Function; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.ShiftOp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SubNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SubNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.PrimitiveConstant; import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedDivNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedDivNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.CodeUtil; +import jdk.vm.ci.code.CodeUtil; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRemNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRemNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.CodeUtil; +import jdk.vm.ci.code.CodeUtil; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.ShiftOp.UShr;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/XorNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/XorNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.PrimitiveConstant; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.PrimitiveConstant; import com.oracle.graal.compiler.common.type.ArithmeticOpTable; import com.oracle.graal.compiler.common.type.ArithmeticOpTable.BinaryOp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ZeroExtendNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ZeroExtendNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.calc; -import jdk.internal.jvmci.code.CodeUtil; +import jdk.vm.ci.code.CodeUtil; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.type.ArithmeticOpTable;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/Block.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/Block.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.Iterator; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/ControlFlowGraph.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/ControlFlowGraph.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,7 +28,7 @@ import java.util.List; import java.util.ListIterator; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph; import com.oracle.graal.compiler.common.cfg.CFGVerifier;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/HIRLoop.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/HIRLoop.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.cfg; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.cfg.Loop; import com.oracle.graal.nodes.LoopBeginNode;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/LocationSet.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/LocationSet.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,7 +26,7 @@ import java.util.Arrays; import java.util.List; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; public class LocationSet { private LocationIdentity firstLocation;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/DynamicCounterNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/debug/DynamicCounterNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.debug; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.Collections; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BranchProbabilityNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BranchProbabilityNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BytecodeExceptionNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BytecodeExceptionNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,10 +24,10 @@ import java.util.List; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.compiler.common.spi.ForeignCallLinkage;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/GetClassNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/GetClassNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IntegerSwitchNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IntegerSwitchNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Arrays; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaConstant; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.PrimitiveStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaReadNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaReadNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaWriteNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/JavaWriteNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.nodeinfo.NodeInfo;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadMethodNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadMethodNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SwitchNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SwitchNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.Arrays; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; import com.oracle.graal.compiler.common.type.AbstractPointerStamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnboxNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnboxNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeAccessNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeAccessNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCopyNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCopyNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaField; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.extended; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaField; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaField; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessMonitorNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessMonitorNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.code.BailoutException; +import jdk.vm.ci.code.BailoutException; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AtomicReadAndAddNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AtomicReadAndAddNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.Value; import sun.misc.Unsafe; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AtomicReadAndWriteNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AtomicReadAndWriteNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import sun.misc.Unsafe; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastDynamicNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastDynamicNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.spi.Canonicalizable;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,16 +23,16 @@ package com.oracle.graal.nodes.java; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; -import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; -import static jdk.internal.jvmci.meta.DeoptimizationReason.ArrayStoreException; -import static jdk.internal.jvmci.meta.DeoptimizationReason.ClassCastException; -import static jdk.internal.jvmci.meta.DeoptimizationReason.UnreachedCode; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaTypeProfile; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.TriState; +import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.vm.ci.meta.DeoptimizationReason.ArrayStoreException; +import static jdk.vm.ci.meta.DeoptimizationReason.ClassCastException; +import static jdk.vm.ci.meta.DeoptimizationReason.UnreachedCode; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaTypeProfile; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ClassIsAssignableFromNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ClassIsAssignableFromNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.graph.Node; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewArrayNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewArrayNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,9 +23,9 @@ //JaCoCo Exclude package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewInstanceNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewInstanceNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.lang.reflect.Modifier; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfDynamicNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfDynamicNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.spi.Canonicalizable;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.JavaTypeProfile; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.JavaTypeProfile; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,14 +23,14 @@ package com.oracle.graal.nodes.java; import static com.oracle.graal.graph.iterators.NodePredicates.isNotA; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredAtomicReadAndWriteNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredAtomicReadAndWriteNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.Value; import sun.misc.Unsafe; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,16 +22,16 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.JavaTypeProfile; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.JavaTypeProfile; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorEnterNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorEnterNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.graph.IterableNodeType; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorExitNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorExitNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.graph.IterableNodeType; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.Collections; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,8 +25,8 @@ import java.lang.ref.Reference; import java.util.Collections; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewMultiArrayNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewMultiArrayNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RawMonitorEnterNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RawMonitorEnterNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.graph.IterableNodeType;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RegisterFinalizerNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RegisterFinalizerNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,8 +23,8 @@ package com.oracle.graal.nodes.java; import static com.oracle.graal.nodes.java.ForeignCallDescriptors.REGISTER_FINALIZER; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; import com.oracle.graal.compiler.common.spi.ForeignCallLinkage; import com.oracle.graal.compiler.common.type.ObjectStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreFieldNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreFieldNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaField; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeCheckNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeCheckNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.nodes.java; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,8 +25,8 @@ import java.util.ArrayList; import java.util.Arrays; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.AbstractPointerStamp; import com.oracle.graal.compiler.common.type.ObjectStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/AbstractWriteNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/AbstractWriteNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/Access.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/Access.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.nodes.extended.GuardedNode; import com.oracle.graal.nodes.memory.address.AddressNode;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FixedAccessNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FixedAccessNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FloatableAccessNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FloatableAccessNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FloatingAccessNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FloatingAccessNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FloatingReadNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/FloatingReadNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryAccess.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryAccess.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; /** * This interface marks nodes that access some memory location, and that have an edge to the last
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryCheckpoint.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryCheckpoint.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.graph.Node; import com.oracle.graal.nodes.FixedNode;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryMap.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryMap.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.Collection; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; /** * Maps a {@linkplain LocationIdentity location} to the last node that (potentially) wrote to the
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryMapNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryMapNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.memory; -import static jdk.internal.jvmci.meta.LocationIdentity.any; +import static jdk.vm.ci.meta.LocationIdentity.any; import java.util.ArrayList; import java.util.Collection; @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryPhiNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/MemoryPhiNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/ReadNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/ReadNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,11 +23,11 @@ package com.oracle.graal.nodes.memory; import static com.oracle.graal.nodes.NamedLocationIdentity.ARRAY_LENGTH_LOCATION; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/WriteNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/WriteNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.memory; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.spi.Simplifiable;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/address/OffsetAddressNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/memory/address/OffsetAddressNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.memory.address; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LoweringProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LoweringProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.spi; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.graph.Node; import com.oracle.graal.nodes.ValueNode;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LoweringTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LoweringTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.nodes.spi; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.nodes.FixedNode; import com.oracle.graal.nodes.FixedWithNextNode;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/MemoryProxy.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/MemoryProxy.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.nodes.spi; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.nodes.memory.MemoryNode;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeLIRBuilderTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeLIRBuilderTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,8 +25,8 @@ import java.util.Collection; import java.util.List; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.BlockMap; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeValueMap.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeValueMap.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,7 +23,7 @@ package com.oracle.graal.nodes.spi; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.graph.Node; import com.oracle.graal.nodes.ValueNode;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Replacements.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/Replacements.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import java.lang.reflect.Type; import java.util.Collection; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.api.replacements.ClassSubstitution; import com.oracle.graal.api.replacements.MethodSubstitution;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/ReplacementsProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/ReplacementsProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.spi; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.api.replacements.SnippetReflectionProvider;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/UncheckedInterfaceProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/UncheckedInterfaceProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.spi; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/VirtualizerTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/VirtualizerTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,10 +24,10 @@ import java.util.List; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.graph.Node; import com.oracle.graal.nodes.ValueNode;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampTool.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampTool.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.Iterator; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.AbstractObjectStamp; import com.oracle.graal.compiler.common.type.AbstractPointerStamp;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,12 +27,12 @@ import java.util.Collection; import java.util.Iterator; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.BytecodePosition; -import jdk.internal.jvmci.code.SourceStackTrace; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.BytecodePosition; +import jdk.vm.ci.code.SourceStackTrace; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Node; import com.oracle.graal.graph.NodeWorkList;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualArrayNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualArrayNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.nio.ByteOrder; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaType; import sun.misc.Unsafe; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualBoxingNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualBoxingNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.virtual; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.nodeinfo.NodeInfo;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualInstanceNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualInstanceNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.nodes.virtual; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.nodeinfo.NodeInfo;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.nodes.virtual; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.IterableNodeType;
--- a/graal/com.oracle.graal.phases.common.test/src/com/oracle/graal/phases/common/test/StampFactoryTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common.test/src/com/oracle/graal/phases/common/test/StampFactoryTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.lang.reflect.Method; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.phases.common; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.DebugMetric;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,9 +27,9 @@ import java.util.Objects; import java.util.Set; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,10 +26,10 @@ import java.util.List; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; import com.oracle.graal.debug.Debug; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DeadCodeEliminationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DeadCodeEliminationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.function.BiConsumer; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.DebugMetric;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/DominatorConditionalEliminationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.phases.common; -import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; -import static jdk.internal.jvmci.meta.DeoptimizationReason.UnreachedCode; +import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.vm.ci.meta.DeoptimizationReason.UnreachedCode; import java.util.ArrayDeque; import java.util.ArrayList; @@ -33,8 +33,8 @@ import java.util.List; import java.util.function.Function; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph; import com.oracle.graal.compiler.common.cfg.BlockMap;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ExpandLogicPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ExpandLogicPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.phases.common; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.graph.Graph; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/FloatingReadPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/FloatingReadPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import static com.oracle.graal.graph.Graph.NodeEvent.NODE_ADDED; import static com.oracle.graal.graph.Graph.NodeEvent.ZERO_USAGES; -import static jdk.internal.jvmci.meta.LocationIdentity.any; +import static jdk.vm.ci.meta.LocationIdentity.any; import java.util.Collection; import java.util.EnumSet; @@ -34,7 +34,7 @@ import java.util.Map; import java.util.Set; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.compiler.common.cfg.Loop;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/FrameStateAssignmentPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/FrameStateAssignmentPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.graph.Node; import com.oracle.graal.graph.iterators.NodePredicate;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/GuardLoweringPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/GuardLoweringPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Map.Entry; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaConstant; import com.oracle.graal.compiler.common.cfg.Loop; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IterativeConditionalEliminationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IterativeConditionalEliminationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import static com.oracle.graal.graph.Graph.NodeEvent.NODE_ADDED; import static com.oracle.graal.graph.Graph.NodeEvent.ZERO_USAGES; -import jdk.internal.jvmci.code.BailoutException; +import jdk.vm.ci.code.BailoutException; import com.oracle.graal.graph.Graph.NodeEventScope; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -34,12 +34,12 @@ import java.util.Iterator; import java.util.List; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.Graph.Mark;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.List; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.DebugMetric;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.Map; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.nodes.Invoke; import com.oracle.graal.nodes.StructuredGraph;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,23 +24,23 @@ import static com.oracle.graal.compiler.common.GraalOptions.HotSpotPrintInlining; import static com.oracle.graal.compiler.common.GraalOptions.UseGraalInstrumentation; -import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; -import static jdk.internal.jvmci.meta.DeoptimizationReason.NullCheckException; +import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.vm.ci.meta.DeoptimizationReason.NullCheckException; import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.List; import java.util.Map; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.code.BytecodePosition; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.code.BytecodePosition; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.api.replacements.MethodSubstitution; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/AbstractInlineInfo.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/AbstractInlineInfo.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Node; import com.oracle.graal.nodes.Invoke;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/AssumptionInlineInfo.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/AssumptionInlineInfo.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.Collection; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Node; import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/ExactInlineInfo.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/ExactInlineInfo.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.Collection; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Node; import com.oracle.graal.nodes.Invoke;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/InlineInfo.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/InlineInfo.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.Collection; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Node; import com.oracle.graal.nodes.Invoke;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,12 +30,12 @@ import java.util.List; import java.util.Set; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaTypeProfile.ProfiledType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaTypeProfile.ProfiledType; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/TypeGuardInlineInfo.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/TypeGuardInlineInfo.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,10 +24,10 @@ import java.util.Collection; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/Inlineable.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/Inlineable.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.phases.common.inlining.info.elem; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.nodes.Invoke; import com.oracle.graal.phases.common.CanonicalizerPhase;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/InlineableGraph.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/InlineableGraph.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,8 +29,8 @@ import java.util.ArrayList; import java.util.List; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/AbstractInliningPolicy.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/AbstractInliningPolicy.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,8 +26,8 @@ import java.util.Map; -import jdk.internal.jvmci.meta.ProfilingInfo; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ProfilingInfo; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.nodes.Invoke; import com.oracle.graal.nodes.StructuredGraph;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/InlineEverythingPolicy.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/InlineEverythingPolicy.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,7 +23,7 @@ package com.oracle.graal.phases.common.inlining.policy; import static com.oracle.graal.compiler.common.GraalOptions.MaximumDesiredSize; -import jdk.internal.jvmci.code.BailoutException; +import jdk.vm.ci.code.BailoutException; import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.nodes.spi.Replacements;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.phases.common.inlining.policy; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.nodes.CallTargetNode; import com.oracle.graal.nodes.java.MethodCallTargetNode;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.phases.common.inlining.walker; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.nodes.StructuredGraph;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,7 +28,7 @@ import java.util.Set; import java.util.function.ToDoubleFunction; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Node; import com.oracle.graal.nodes.FixedNode;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java Thu Oct 08 17:41:33 2015 -0700 @@ -34,12 +34,12 @@ import java.util.Iterator; import java.util.Set; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.JavaTypeProfile; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.JavaTypeProfile; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/MethodInvocation.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/MethodInvocation.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.BitSet; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.nodes.CallTargetNode; import com.oracle.graal.nodes.java.MethodCallTargetNode;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/instrumentation/ExtractInstrumentationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/instrumentation/ExtractInstrumentationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -55,7 +55,7 @@ import com.oracle.graal.phases.common.instrumentation.nodes.MonitorProxyNode; import com.oracle.graal.phases.tiers.HighTierContext; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; public class ExtractInstrumentationPhase extends BasePhase<HighTierContext> {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/instrumentation/nodes/InstrumentationBeginNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/instrumentation/nodes/InstrumentationBeginNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,8 +29,8 @@ import com.oracle.graal.nodes.FixedWithNextNode; import com.oracle.graal.nodes.ValueNode; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaConstant; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaConstant; @NodeInfo public final class InstrumentationBeginNode extends FixedWithNextNode {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/instrumentation/nodes/InstrumentationNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/instrumentation/nodes/InstrumentationNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -55,8 +55,8 @@ import com.oracle.graal.nodes.virtual.EscapeObjectState; import com.oracle.graal.nodes.virtual.VirtualObjectNode; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; @NodeInfo public class InstrumentationNode extends DeoptimizingFixedWithNextNode implements Virtualizable {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/instrumentation/nodes/IsMethodInlinedNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/instrumentation/nodes/IsMethodInlinedNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,7 +28,7 @@ import com.oracle.graal.nodes.ConstantNode; import com.oracle.graal.nodes.FixedNode; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; @NodeInfo public final class IsMethodInlinedNode extends InstrumentationContentNode {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/instrumentation/nodes/RootNameNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/instrumentation/nodes/RootNameNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,8 +30,8 @@ import com.oracle.graal.nodes.spi.Lowerable; import com.oracle.graal.nodes.spi.LoweringTool; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.ResolvedJavaMethod; @NodeInfo public final class RootNameNode extends InstrumentationContentNode implements Lowerable {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/instrumentation/nodes/RuntimePathNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/instrumentation/nodes/RuntimePathNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -34,7 +34,7 @@ import com.oracle.graal.nodes.LoopEndNode; import com.oracle.graal.nodes.ValuePhiNode; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; @NodeInfo public final class RuntimePathNode extends InstrumentationContentNode {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/OptimisticOptimizations.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/OptimisticOptimizations.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,8 +25,8 @@ import java.util.EnumSet; import java.util.Set; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.ProfilingInfo; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.ProfilingInfo; import com.oracle.graal.compiler.common.GraalOptions; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/MemoryScheduleVerification.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/MemoryScheduleVerification.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import java.util.List; import java.util.Set; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.compiler.common.cfg.BlockMap;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -31,7 +31,7 @@ import java.util.Formatter; import java.util.List; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.SuppressFBWarnings; import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/LowTierContext.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/LowTierContext.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.phases.tiers; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.phases.util.Providers;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/MidTierContext.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/MidTierContext.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.phases.tiers; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.ProfilingInfo; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.ProfilingInfo; import com.oracle.graal.phases.OptimisticOptimizations; import com.oracle.graal.phases.util.Providers;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/PhaseContext.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/PhaseContext.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.phases.tiers; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.nodes.spi.LoweringProvider; import com.oracle.graal.nodes.spi.Replacements;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/TargetProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/TargetProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.phases.tiers; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; public interface TargetProvider {
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/GraphOrder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/GraphOrder.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.cfg.Loop; import com.oracle.graal.graph.GraalGraphJVMCIError;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/MethodDebugValueName.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/MethodDebugValueName.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.phases.util; -import jdk.internal.jvmci.meta.JavaMethod; +import jdk.vm.ci.meta.JavaMethod; import com.oracle.graal.phases.LazyName;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/Providers.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/Providers.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.phases.util; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.spi.CodeGenProviders; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyCallerSensitiveMethods.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyCallerSensitiveMethods.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.phases.verify; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import sun.reflect.CallerSensitive; import sun.reflect.Reflection;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyDebugUsage.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyDebugUsage.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.phases.verify; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.debug.Debug; import com.oracle.graal.nodes.CallTargetNode;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyUsageWithEquals.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyUsageWithEquals.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.phases.verify; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Signature; -import jdk.internal.jvmci.meta.TrustedInterface; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Signature; +import jdk.vm.ci.meta.TrustedInterface; import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.nodes.ParameterNode;
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/BinaryGraphPrinter.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/BinaryGraphPrinter.java Thu Oct 08 17:41:33 2015 -0700 @@ -37,10 +37,10 @@ import java.util.Map; import java.util.Map.Entry; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.Signature; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Signature; import com.oracle.graal.compiler.common.cfg.BlockMap; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,12 +27,12 @@ import java.util.Map; import java.util.TreeMap; -import jdk.internal.jvmci.code.DebugInfo; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaUtil; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.DebugInfo; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaUtil; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.cfg.AbstractBlockBase; import com.oracle.graal.compiler.common.cfg.AbstractControlFlowGraph;
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinterObserver.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinterObserver.java Thu Oct 08 17:41:33 2015 -0700 @@ -34,13 +34,13 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.service.Services; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.service.Services; import com.oracle.graal.code.DisassemblerProvider; import com.oracle.graal.compiler.common.GraalOptions;
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CompilationPrinter.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CompilationPrinter.java Thu Oct 08 17:41:33 2015 -0700 @@ -31,15 +31,15 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.code.BytecodePosition; -import jdk.internal.jvmci.code.ReferenceMap; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.code.RegisterSaveLayout; -import jdk.internal.jvmci.code.VirtualObject; -import jdk.internal.jvmci.meta.JavaMethod; -import jdk.internal.jvmci.meta.JavaValue; -import jdk.internal.jvmci.meta.MetaUtil; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.code.BytecodePosition; +import jdk.vm.ci.code.ReferenceMap; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.code.RegisterSaveLayout; +import jdk.vm.ci.code.VirtualObject; +import jdk.vm.ci.meta.JavaMethod; +import jdk.vm.ci.meta.JavaValue; +import jdk.vm.ci.meta.MetaUtil; import com.oracle.graal.debug.LogStream; import com.oracle.graal.debug.TTY;
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/GraalDebugConfigCustomizer.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/GraalDebugConfigCustomizer.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import static com.oracle.graal.compiler.common.GraalOptions.PrintBackendCFG; import static com.oracle.graal.compiler.common.GraalOptions.PrintBinaryGraphs; import static com.oracle.graal.compiler.common.GraalOptions.PrintCFG; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.DebugConfig;
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/GraphPrinter.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/GraphPrinter.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import java.io.Closeable; import java.io.IOException; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Graph; import com.oracle.graal.phases.schedule.SchedulePhase;
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/GraphPrinterDumpHandler.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/GraphPrinterDumpHandler.java Thu Oct 08 17:41:33 2015 -0700 @@ -48,8 +48,8 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import jdk.internal.jvmci.meta.JavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.JavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope;
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinter.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinter.java Thu Oct 08 17:41:33 2015 -0700 @@ -32,7 +32,7 @@ import java.util.Map.Entry; import java.util.Set; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Graph; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/NoDeadCodeVerifyHandler.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/NoDeadCodeVerifyHandler.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,10 +26,10 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.debug.DebugVerifyHandler; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64ConvertSnippets.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64ConvertSnippets.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import static com.oracle.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; import static com.oracle.graal.nodes.extended.BranchProbabilityNode.probability; import static com.oracle.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64CountLeadingZerosNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64CountLeadingZerosNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.replacements.amd64; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.PrimitiveStamp;
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64CountTrailingZerosNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64CountTrailingZerosNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.replacements.amd64; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.PrimitiveStamp;
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64GraphBuilderPlugins.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64GraphBuilderPlugins.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,10 +25,10 @@ import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_EXP; import static com.oracle.graal.replacements.amd64.AMD64MathIntrinsicNode.Operation.LOG; import static com.oracle.graal.replacements.amd64.AMD64MathIntrinsicNode.Operation.LOG10; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaMethod; import sun.misc.Unsafe; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider;
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64MathIntrinsicNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64MathIntrinsicNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.replacements.amd64; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.FloatStamp; import com.oracle.graal.compiler.common.type.PrimitiveStamp;
--- a/graal/com.oracle.graal.replacements.sparc/src/com/oracle/graal/replacements/sparc/SPARCGraphBuilderPlugins.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.sparc/src/com/oracle/graal/replacements/sparc/SPARCGraphBuilderPlugins.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,8 +29,8 @@ import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_POW; import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_SIN; import static com.oracle.graal.compiler.target.Backend.ARITHMETIC_TAN; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider; import com.oracle.graal.graphbuilderconf.ForeignCallPlugin;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/BitOpNodesTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/BitOpNodesTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/CheckCastTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/CheckCastTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.vm.ci.meta.JavaTypeProfile; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/CompiledExceptionHandlerTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/CompiledExceptionHandlerTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DeoptimizeOnExceptionTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DeoptimizeOnExceptionTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.Random; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DerivedOopTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DerivedOopTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.Objects; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DynamicNewArrayTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DynamicNewArrayTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.lang.reflect.Array; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/EdgesTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/EdgesTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.lang.reflect.Method; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,10 +28,10 @@ import java.util.Map; import java.util.TreeMap; -import jdk.internal.jvmci.code.CompilationResult.Call; -import jdk.internal.jvmci.code.CompilationResult.Mark; -import jdk.internal.jvmci.code.CompilationResult.Site; -import jdk.internal.jvmci.meta.JavaTypeProfile; +import jdk.vm.ci.code.CompilationResult.Call; +import jdk.vm.ci.code.CompilationResult.Mark; +import jdk.vm.ci.code.CompilationResult.Site; +import jdk.vm.ci.meta.JavaTypeProfile; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/MethodSubstitutionTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/MethodSubstitutionTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.lang.reflect.InvocationTargetException; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.InvalidInstalledCodeException; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.InvalidInstalledCodeException; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.api.replacements.MethodSubstitution; import com.oracle.graal.compiler.test.GraalCompilerTest;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewMultiArrayTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/NewMultiArrayTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,9 +26,9 @@ import java.lang.reflect.InvocationTargetException; import java.util.List; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/ObjectAccessTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/ObjectAccessTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PEGraphDecoderTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PEGraphDecoderTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PointerTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PointerTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PointerTrackingTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/PointerTrackingTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/ReplacementsParseTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/ReplacementsParseTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.function.Function; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StandardMethodSubstitutionsTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StandardMethodSubstitutionsTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.HashMap; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StringSubstitutionsTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/StringSubstitutionsTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/SubstitutionsTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/SubstitutionsTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import static com.oracle.graal.nodeinfo.InputType.Guard; import static com.oracle.graal.nodeinfo.InputType.Memory; import static org.hamcrest.CoreMatchers.instanceOf; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/TypeCheckTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/TypeCheckTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.JavaTypeProfile; -import jdk.internal.jvmci.meta.JavaTypeProfile.ProfiledType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.JavaTypeProfile; +import jdk.vm.ci.meta.JavaTypeProfile.ProfiledType; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.TriState; import com.oracle.graal.compiler.test.GraalCompilerTest; import com.oracle.graal.nodes.StructuredGraph;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnsafeSubstitutionsTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnsafeSubstitutionsTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/WordTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/WordTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.replacements.test; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/NodeIntrinsicVerifier.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/NodeIntrinsicVerifier.java Thu Oct 08 17:41:33 2015 -0700 @@ -66,7 +66,7 @@ } private TypeMirror resolvedJavaTypeType() { - return env.getElementUtils().getTypeElement("jdk.internal.jvmci.meta.ResolvedJavaType").asType(); + return env.getElementUtils().getTypeElement("jdk.vm.ci.meta.ResolvedJavaType").asType(); } private TypeMirror structuralInputType() {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ArraySubstitutions.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ArraySubstitutions.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.replacements; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; import com.oracle.graal.nodes.DeoptimizeNode; import com.oracle.graal.nodes.java.ArrayLengthNode;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/BoxingSnippets.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/BoxingSnippets.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,11 +28,11 @@ import java.util.EnumMap; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/CachingPEGraphDecoder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/CachingPEGraphDecoder.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,8 +27,8 @@ import java.util.HashMap; import java.util.Map; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.debug.Debug; import com.oracle.graal.graphbuilderconf.GraphBuilderConfiguration;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ConstantBindingParameterPlugin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ConstantBindingParameterPlugin.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.replacements; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/DefaultJavaLoweringProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/DefaultJavaLoweringProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,28 +24,28 @@ import static com.oracle.graal.nodes.NamedLocationIdentity.ARRAY_LENGTH_LOCATION; import static com.oracle.graal.nodes.java.ArrayLengthNode.readArrayLength; -import static jdk.internal.jvmci.code.MemoryBarriers.JMM_POST_VOLATILE_READ; -import static jdk.internal.jvmci.code.MemoryBarriers.JMM_POST_VOLATILE_WRITE; -import static jdk.internal.jvmci.code.MemoryBarriers.JMM_PRE_VOLATILE_READ; -import static jdk.internal.jvmci.code.MemoryBarriers.JMM_PRE_VOLATILE_WRITE; -import static jdk.internal.jvmci.meta.DeoptimizationAction.InvalidateReprofile; -import static jdk.internal.jvmci.meta.DeoptimizationReason.BoundsCheckException; +import static jdk.vm.ci.code.MemoryBarriers.JMM_POST_VOLATILE_READ; +import static jdk.vm.ci.code.MemoryBarriers.JMM_POST_VOLATILE_WRITE; +import static jdk.vm.ci.code.MemoryBarriers.JMM_PRE_VOLATILE_READ; +import static jdk.vm.ci.code.MemoryBarriers.JMM_PRE_VOLATILE_WRITE; +import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile; +import static jdk.vm.ci.meta.DeoptimizationReason.BoundsCheckException; import java.util.ArrayList; import java.util.BitSet; import java.util.List; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.compiler.common.type.IntegerStamp;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraphKit.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraphKit.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,13 +29,13 @@ import java.util.ArrayList; import java.util.List; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Signature; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Signature; import com.oracle.graal.graph.Graph; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/InlineDuringParsingPlugin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/InlineDuringParsingPlugin.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import static com.oracle.graal.compiler.common.GraalOptions.TrivialInliningSize; import static com.oracle.graal.java.BytecodeParserOptions.InlineDuringParsingMaxDepth; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graphbuilderconf.GraphBuilderContext; import com.oracle.graal.graphbuilderconf.InlineInvokePlugin;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/InstanceOfSnippetsTemplates.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/InstanceOfSnippetsTemplates.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,7 +26,7 @@ import java.util.List; -import jdk.internal.jvmci.code.TargetDescription; +import jdk.vm.ci.code.TargetDescription; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.compiler.common.calc.Condition;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/IntrinsicGraphBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/IntrinsicGraphBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,16 +22,16 @@ */ package com.oracle.graal.replacements; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Signature; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Signature; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/Log.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/Log.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.io.PrintStream; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.spi.ForeignCallDescriptor; import com.oracle.graal.graph.Node.ConstantNodeParameter;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/MethodHandlePlugin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/MethodHandlePlugin.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.replacements; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MethodHandleAccessProvider; -import jdk.internal.jvmci.meta.MethodHandleAccessProvider.IntrinsicMethod; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MethodHandleAccessProvider; +import jdk.vm.ci.meta.MethodHandleAccessProvider.IntrinsicMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.NodeInputList; import com.oracle.graal.graphbuilderconf.GraphBuilderContext;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,23 +22,23 @@ */ package com.oracle.graal.replacements; -import static jdk.internal.jvmci.meta.MetaUtil.resolveJavaTypes; +import static jdk.vm.ci.meta.MetaUtil.resolveJavaTypes; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaMethod; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.PrimitiveConstant; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaMethod; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.PrimitiveConstant; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.api.replacements.SnippetReflectionProvider;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPlugin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPlugin.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,19 +23,19 @@ package com.oracle.graal.replacements; import static com.oracle.graal.replacements.NodeIntrinsificationPhase.COULD_NOT_FOLD; -import static jdk.internal.jvmci.meta.MetaUtil.resolveJavaTypes; +import static jdk.vm.ci.meta.MetaUtil.resolveJavaTypes; import java.util.Arrays; import java.util.List; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Signature; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Signature; import com.oracle.graal.api.replacements.Fold; import com.oracle.graal.compiler.common.type.ObjectStamp;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/PEGraphDecoder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/PEGraphDecoder.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,25 +25,25 @@ import static com.oracle.graal.java.BytecodeParserOptions.DumpDuringGraphBuilding; import static com.oracle.graal.java.BytecodeParserOptions.FailedLoopExplosionIsFatal; import static com.oracle.graal.java.BytecodeParserOptions.MaximumLoopExplosionCount; -import static jdk.internal.jvmci.common.JVMCIError.unimplemented; +import static jdk.vm.ci.common.JVMCIError.unimplemented; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.BytecodePosition; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.BytecodePosition; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,7 +29,7 @@ import static com.oracle.graal.java.BytecodeParserOptions.InlineIntrinsicsDuringParsing; import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required; import static java.lang.String.format; -import static jdk.internal.jvmci.meta.MetaUtil.toInternalName; +import static jdk.vm.ci.meta.MetaUtil.toInternalName; import java.lang.reflect.Array; import java.lang.reflect.Constructor; @@ -46,17 +46,17 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReference; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Signature; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.OptionValue.OverrideScope; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Signature; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.OptionValue.OverrideScope; import sun.misc.Launcher; import com.oracle.graal.api.replacements.ClassSubstitution;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetCounterNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetCounterNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,9 +28,9 @@ import java.lang.reflect.Field; import java.util.Arrays; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.LocationIdentity; import sun.misc.Unsafe; import com.oracle.graal.api.replacements.Fold;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,7 +27,7 @@ import static com.oracle.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required; import static com.oracle.graal.replacements.SnippetTemplate.AbstractTemplates.UseSnippetTemplateCache; import static java.util.FormattableFlags.ALTERNATE; -import static jdk.internal.jvmci.meta.LocationIdentity.any; +import static jdk.vm.ci.meta.LocationIdentity.any; import java.lang.reflect.Array; import java.lang.reflect.Method; @@ -46,17 +46,17 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import jdk.internal.jvmci.code.TargetDescription; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.Local; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Signature; +import jdk.vm.ci.code.TargetDescription; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.Local; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Signature; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,10 +23,10 @@ package com.oracle.graal.replacements; import static com.oracle.graal.compiler.common.GraalOptions.UseGraalInstrumentation; -import static jdk.internal.jvmci.code.MemoryBarriers.JMM_POST_VOLATILE_READ; -import static jdk.internal.jvmci.code.MemoryBarriers.JMM_POST_VOLATILE_WRITE; -import static jdk.internal.jvmci.code.MemoryBarriers.JMM_PRE_VOLATILE_READ; -import static jdk.internal.jvmci.code.MemoryBarriers.JMM_PRE_VOLATILE_WRITE; +import static jdk.vm.ci.code.MemoryBarriers.JMM_POST_VOLATILE_READ; +import static jdk.vm.ci.code.MemoryBarriers.JMM_POST_VOLATILE_WRITE; +import static jdk.vm.ci.code.MemoryBarriers.JMM_PRE_VOLATILE_READ; +import static jdk.vm.ci.code.MemoryBarriers.JMM_PRE_VOLATILE_WRITE; import java.lang.reflect.Array; import java.lang.reflect.Field; @@ -99,17 +99,17 @@ import com.oracle.graal.replacements.nodes.arithmetic.IntegerMulExactNode; import com.oracle.graal.replacements.nodes.arithmetic.IntegerSubExactNode; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionValue; import sun.misc.Unsafe; /**
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/WordOperationPlugin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/WordOperationPlugin.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,17 +24,17 @@ import static com.oracle.graal.nodes.ConstantNode.forInt; import static com.oracle.graal.nodes.ConstantNode.forIntegerKind; -import static jdk.internal.jvmci.meta.LocationIdentity.any; +import static jdk.vm.ci.meta.LocationIdentity.any; import java.lang.reflect.Constructor; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaTypeProfile; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaTypeProfile; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.compiler.common.calc.Condition;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ArrayEqualsNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ArrayEqualsNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/AssertionNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/AssertionNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BasicArrayCopyNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BasicArrayCopyNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.replacements.nodes; -import static jdk.internal.jvmci.meta.LocationIdentity.any; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import static jdk.vm.ci.meta.LocationIdentity.any; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BasicObjectCloneNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BasicObjectCloneNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,13 +24,13 @@ import java.util.Collections; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitCountNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitCountNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.PrimitiveStamp;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanForwardNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanForwardNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.PrimitiveStamp;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanReverseNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/BitScanReverseNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.PrimitiveStamp;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DeferredPiNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DeferredPiNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ //JaCoCo Exclude -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.ObjectStamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectObjectStoreNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectObjectStoreNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectReadNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectReadNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectStoreNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectStoreNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.replacements.nodes; -import static jdk.internal.jvmci.code.BytecodeFrame.isPlaceholderBci; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.api.replacements.MethodSubstitution; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroStateSplitNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroStateSplitNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.code.BytecodeFrame; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.code.BytecodeFrame; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.nodeinfo.InputType;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MethodHandleNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MethodHandleNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,16 +25,16 @@ import java.lang.invoke.MethodHandle; import java.util.Arrays; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.Assumptions; -import jdk.internal.jvmci.meta.Assumptions.AssumptionResult; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MethodHandleAccessProvider; -import jdk.internal.jvmci.meta.MethodHandleAccessProvider.IntrinsicMethod; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Signature; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions.AssumptionResult; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MethodHandleAccessProvider; +import jdk.vm.ci.meta.MethodHandleAccessProvider.IntrinsicMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Signature; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/PureFunctionMacroNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/PureFunctionMacroNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Node; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReadRegisterNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReadRegisterNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,9 +29,9 @@ import java.lang.invoke.MethodHandle; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.graph.NodeInputList;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReverseBytesNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReverseBytesNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/VirtualizableInvokeMacroNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/VirtualizableInvokeMacroNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.NodeClass; import com.oracle.graal.nodeinfo.NodeInfo;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/WriteRegisterNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/WriteRegisterNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.replacements.nodes; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,9 +25,9 @@ import static com.oracle.graal.compiler.common.type.IntegerStamp.addOverflowsNegatively; import static com.oracle.graal.compiler.common.type.IntegerStamp.addOverflowsPositively; import static com.oracle.graal.compiler.common.type.IntegerStamp.carryBits; -import jdk.internal.jvmci.code.CodeUtil; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.code.CodeUtil; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerMulHighNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerMulHighNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.function.BiFunction; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.replacements.nodes.arithmetic; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.graph.NodeClass;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.util.function.BiFunction; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.IntegerStamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.runtime/src/com/oracle/graal/runtime/RuntimeProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.runtime/src/com/oracle/graal/runtime/RuntimeProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.runtime; -import jdk.internal.jvmci.code.Architecture; +import jdk.vm.ci.code.Architecture; import com.oracle.graal.compiler.target.Backend;
--- a/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64OptimizedCallTargetInstrumentationFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64OptimizedCallTargetInstrumentationFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,14 +22,14 @@ */ package com.oracle.graal.truffle.hotspot.amd64; -import jdk.internal.jvmci.amd64.AMD64; -import jdk.internal.jvmci.code.CallingConvention.Type; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.amd64.AMD64; +import jdk.vm.ci.code.CallingConvention.Type; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.graal.asm.Assembler; import com.oracle.graal.asm.Label;
--- a/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64RawNativeCallNodeFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64RawNativeCallNodeFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,9 +22,9 @@ */ package com.oracle.graal.truffle.hotspot.amd64; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.graal.hotspot.amd64.AMD64RawNativeCallNode; import com.oracle.graal.nodes.FixedWithNextNode;
--- a/graal/com.oracle.graal.truffle.hotspot.sparc/src/com/oracle/graal/truffle/hotspot/sparc/SPARCOptimizedCallTargetInstumentationFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.hotspot.sparc/src/com/oracle/graal/truffle/hotspot/sparc/SPARCOptimizedCallTargetInstumentationFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,13 +25,13 @@ import static com.oracle.graal.asm.sparc.SPARCAssembler.BranchPredict.PREDICT_NOT_TAKEN; import static com.oracle.graal.asm.sparc.SPARCAssembler.CC.Xcc; import static com.oracle.graal.asm.sparc.SPARCAssembler.ConditionFlag.Equal; -import static jdk.internal.jvmci.code.CallingConvention.Type.JavaCall; -import static jdk.internal.jvmci.meta.JavaKind.Object; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.Register; -import jdk.internal.jvmci.service.ServiceProvider; +import static jdk.vm.ci.code.CallingConvention.Type.JavaCall; +import static jdk.vm.ci.meta.JavaKind.Object; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.Register; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.graal.asm.Assembler; import com.oracle.graal.asm.Label;
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,8 +29,8 @@ import static com.oracle.graal.truffle.TruffleCompilerOptions.TraceTruffleTransferToInterpreter; import static com.oracle.graal.truffle.TruffleCompilerOptions.TruffleCompilationExceptionsAreThrown; import static com.oracle.graal.truffle.hotspot.UnsafeAccess.UNSAFE; -import static jdk.internal.jvmci.code.CodeUtil.getCallingConvention; -import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; +import static jdk.vm.ci.code.CodeUtil.getCallingConvention; +import static jdk.vm.ci.hotspot.HotSpotVMConfig.config; import java.util.Arrays; import java.util.Collection; @@ -48,23 +48,23 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CallingConvention.Type; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.stack.StackIntrospection; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; -import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime; -import jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethod; -import jdk.internal.jvmci.hotspot.HotSpotSpeculationLog; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.runtime.JVMCI; -import jdk.internal.jvmci.service.Services; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CallingConvention.Type; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.stack.StackIntrospection; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; +import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; +import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; +import jdk.vm.ci.hotspot.HotSpotSpeculationLog; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.runtime.JVMCI; +import jdk.vm.ci.service.Services; import com.oracle.graal.api.runtime.Graal; import com.oracle.graal.compiler.CompilerThreadFactory;
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntimeAccess.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntimeAccess.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.hotspot; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.truffle.api.TruffleRuntime; import com.oracle.truffle.api.TruffleRuntimeAccess;
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/OptimizedCallTargetInstrumentation.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/OptimizedCallTargetInstrumentation.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,12 +26,12 @@ import java.lang.reflect.Field; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.CompilationResult.Mark; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.hotspot.HotSpotCodeCacheProvider; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult.Mark; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; +import jdk.vm.ci.hotspot.HotSpotVMConfig; import com.oracle.graal.asm.Assembler; import com.oracle.graal.compiler.common.spi.ForeignCallsProvider;
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/OptimizedCallTargetInstrumentationFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/OptimizedCallTargetInstrumentationFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.hotspot; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.hotspot.HotSpotVMConfig; import com.oracle.graal.hotspot.meta.HotSpotRegistersProvider; import com.oracle.graal.lir.asm.CompilationResultBuilder;
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionHandle.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionHandle.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,10 +24,10 @@ import java.util.Arrays; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.code.InvalidInstalledCodeException; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.code.InvalidInstalledCodeException; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope;
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionInterface.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionInterface.java Thu Oct 08 17:41:33 2015 -0700 @@ -23,19 +23,19 @@ package com.oracle.graal.truffle.hotspot.nfi; import static com.oracle.graal.truffle.hotspot.nfi.NativeCallStubGraphBuilder.getGraph; -import static jdk.internal.jvmci.code.CodeUtil.getCallingConvention; -import static jdk.internal.jvmci.common.UnsafeUtil.createCString; -import static jdk.internal.jvmci.common.UnsafeUtil.writeCString; +import static jdk.vm.ci.code.CodeUtil.getCallingConvention; +import static jdk.vm.ci.common.UnsafeUtil.createCString; +import static jdk.vm.ci.common.UnsafeUtil.writeCString; import java.lang.reflect.Field; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CallingConvention.Type; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.hotspot.HotSpotVMConfig; -import jdk.internal.jvmci.meta.DefaultProfilingInfo; -import jdk.internal.jvmci.meta.TriState; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CallingConvention.Type; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.hotspot.HotSpotVMConfig; +import jdk.vm.ci.meta.DefaultProfilingInfo; +import jdk.vm.ci.meta.TriState; import sun.misc.Unsafe; import com.oracle.graal.compiler.GraalCompiler;
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionInterfaceAccess.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/HotSpotNativeFunctionInterfaceAccess.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.hotspot.nfi; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.graal.truffle.hotspot.HotSpotTruffleRuntime; import com.oracle.nfi.api.NativeFunctionInterface;
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/NativeCallStubGraphBuilder.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/NativeCallStubGraphBuilder.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,18 +22,18 @@ */ package com.oracle.graal.truffle.hotspot.nfi; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; +import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.hotspot.meta.HotSpotProviders;
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/RawNativeCallNodeFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/nfi/RawNativeCallNodeFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.truffle.hotspot.nfi; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.nodes.FixedWithNextNode; import com.oracle.graal.nodes.ValueNode;
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/CompilerAssertsTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/CompilerAssertsTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.test; -import jdk.internal.jvmci.code.BailoutException; +import jdk.vm.ci.code.BailoutException; import org.junit.After; import org.junit.Assert;
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/ConditionAnchoringTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/ConditionAnchoringTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,9 +26,9 @@ import static com.oracle.graal.graph.test.matchers.NodeIterableIsEmpty.isEmpty; import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.junit.Assert.assertThat; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test;
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/LazyInitializationTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/LazyInitializationTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,10 +30,10 @@ import java.util.HashSet; import java.util.List; -import jdk.internal.jvmci.compiler.CompilerFactory; -import jdk.internal.jvmci.options.OptionDescriptor; -import jdk.internal.jvmci.options.OptionDescriptors; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.compiler.CompilerFactory; +import jdk.vm.ci.options.OptionDescriptor; +import jdk.vm.ci.options.OptionDescriptors; +import jdk.vm.ci.options.OptionValue; import org.junit.Assert; import org.junit.Test; @@ -51,7 +51,7 @@ private final Class<?> hotSpotGraalCompilerFactoryOptions; public LazyInitializationTest() { - hotSpotVMEventListener = forNameOrNull("jdk.internal.jvmci.hotspot.HotSpotVMEventListener"); + hotSpotVMEventListener = forNameOrNull("jdk.vm.ci.hotspot.HotSpotVMEventListener"); hotSpotGraalCompilerFactoryOptions = forNameOrNull("com.oracle.graal.hotspot.HotSpotGraalCompilerFactory$Options"); }
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/SimplePartialEvaluationTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/SimplePartialEvaluationTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,8 +22,8 @@ */ package com.oracle.graal.truffle.test; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.SourceStackTrace; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.SourceStackTrace; import org.junit.After; import org.junit.Assert;
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/TruffleEnsureVirtualizedTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/TruffleEnsureVirtualizedTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.test; -import jdk.internal.jvmci.code.BailoutException; +import jdk.vm.ci.code.BailoutException; import org.junit.After; import org.junit.Assert;
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLGetOptionBuiltin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLGetOptionBuiltin.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.test.builtins; -import jdk.internal.jvmci.options.OptionDescriptor; +import jdk.vm.ci.options.OptionDescriptor; import com.oracle.graal.truffle.TruffleCompilerOptions; import com.oracle.graal.truffle.TruffleCompilerOptions_OptionDescriptors;
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLSetOptionBuiltin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/builtins/SLSetOptionBuiltin.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.test.builtins; -import jdk.internal.jvmci.options.OptionDescriptor; +import jdk.vm.ci.options.OptionDescriptor; import com.oracle.graal.truffle.TruffleCompilerOptions; import com.oracle.graal.truffle.TruffleCompilerOptions_OptionDescriptors;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultLoopNodeFactory.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultLoopNodeFactory.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle; -import jdk.internal.jvmci.service.ServiceProvider; +import jdk.vm.ci.service.ServiceProvider; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.RepeatingNode;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalFrameInstance.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalFrameInstance.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,8 +24,8 @@ import java.lang.reflect.Method; -import jdk.internal.jvmci.code.stack.InspectedFrame; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.code.stack.InspectedFrame; +import jdk.vm.ci.common.JVMCIError; import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleCompilationListener.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleCompilationListener.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle; -import jdk.internal.jvmci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult; import com.oracle.graal.nodes.StructuredGraph; import com.oracle.truffle.api.nodes.Node;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java Thu Oct 08 17:41:33 2015 -0700 @@ -31,13 +31,13 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.stack.InspectedFrame; -import jdk.internal.jvmci.code.stack.InspectedFrameVisitor; -import jdk.internal.jvmci.code.stack.StackIntrospection; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.service.Services; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.stack.InspectedFrame; +import jdk.vm.ci.code.stack.InspectedFrameVisitor; +import jdk.vm.ci.code.stack.StackIntrospection; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.service.Services; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.Debug.Scope;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedAssumption.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedAssumption.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,7 +29,7 @@ import java.util.Arrays; import java.util.stream.Collectors; -import jdk.internal.jvmci.code.InstalledCode; +import jdk.vm.ci.code.InstalledCode; import com.oracle.graal.debug.TTY; import com.oracle.truffle.api.CompilerDirectives;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java Thu Oct 08 17:41:33 2015 -0700 @@ -44,10 +44,10 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import jdk.internal.jvmci.code.BailoutException; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.SpeculationLog; +import jdk.vm.ci.code.BailoutException; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.SpeculationLog; import com.oracle.graal.truffle.debug.AbstractDebugCompilationListener; import com.oracle.truffle.api.Assumption;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Thu Oct 08 17:41:33 2015 -0700 @@ -33,17 +33,17 @@ import java.util.LinkedHashMap; import java.util.Map; -import jdk.internal.jvmci.code.Architecture; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.StableOptionValue; -import jdk.internal.jvmci.service.Services; +import jdk.vm.ci.code.Architecture; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.StableOptionValue; +import jdk.vm.ci.service.Services; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/ReadOnlyFrame.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/ReadOnlyFrame.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.Frame;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompiler.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompiler.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,23 +24,23 @@ import static com.oracle.graal.compiler.GraalCompiler.compileGraph; import static com.oracle.graal.compiler.GraalCompiler.getProfilingInfo; -import static jdk.internal.jvmci.code.CodeUtil.getCallingConvention; +import static jdk.vm.ci.code.CodeUtil.getCallingConvention; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import jdk.internal.jvmci.code.CallingConvention; -import jdk.internal.jvmci.code.CallingConvention.Type; -import jdk.internal.jvmci.code.CodeCacheProvider; -import jdk.internal.jvmci.code.CompilationResult; -import jdk.internal.jvmci.code.InstalledCode; -import jdk.internal.jvmci.meta.Assumptions.Assumption; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.SpeculationLog; +import jdk.vm.ci.code.CallingConvention; +import jdk.vm.ci.code.CallingConvention.Type; +import jdk.vm.ci.code.CodeCacheProvider; +import jdk.vm.ci.code.CompilationResult; +import jdk.vm.ci.code.InstalledCode; +import jdk.vm.ci.meta.Assumptions.Assumption; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.SpeculationLog; import com.oracle.graal.compiler.target.Backend; import com.oracle.graal.debug.Debug;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,10 +22,10 @@ */ package com.oracle.graal.truffle; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; -import jdk.internal.jvmci.options.StableOptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; +import jdk.vm.ci.options.StableOptionValue; /** * Options for the Truffle compiler.
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleConstantReflectionProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleConstantReflectionProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,17 +22,17 @@ */ package com.oracle.graal.truffle; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaField; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MemoryAccessProvider; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.MethodHandleAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaField; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MemoryAccessProvider; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.MethodHandleAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.nodes.Node.Child;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleDebugJavaMethod.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleDebugJavaMethod.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.truffle; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaMethod; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.ResolvedJavaType; -import jdk.internal.jvmci.meta.Signature; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaMethod; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Signature; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.JavaMethodContext;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleExpansionLogger.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleExpansionLogger.java Thu Oct 08 17:41:33 2015 -0700 @@ -30,8 +30,8 @@ import java.util.Map; import java.util.Map.Entry; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.graph.Node; import com.oracle.graal.graph.NodeMap;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/AbstractDebugCompilationListener.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/AbstractDebugCompilationListener.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,7 +24,7 @@ import java.util.Map; -import jdk.internal.jvmci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult; import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.truffle.GraalTruffleCompilationListener;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/CompilationStatisticsListener.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/CompilationStatisticsListener.java Thu Oct 08 17:41:33 2015 -0700 @@ -36,7 +36,7 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import jdk.internal.jvmci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult; import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.truffle.GraalTruffleRuntime;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/HistogramInlineInvokePlugin.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/HistogramInlineInvokePlugin.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.graph.Node; import com.oracle.graal.graphbuilderconf.InlineInvokePlugin;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationASTListener.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationASTListener.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,7 +26,7 @@ import java.util.List; -import jdk.internal.jvmci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult; import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.truffle.GraalTruffleRuntime;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationCallTreeListener.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationCallTreeListener.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult; import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.truffle.GraalTruffleRuntime;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationFailureListener.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationFailureListener.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,12 +22,12 @@ */ package com.oracle.graal.truffle.debug; -import static jdk.internal.jvmci.compiler.Compiler.PrintBailout; +import static jdk.vm.ci.compiler.Compiler.PrintBailout; import java.util.LinkedHashMap; import java.util.Map; -import jdk.internal.jvmci.code.BailoutException; +import jdk.vm.ci.code.BailoutException; import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.truffle.GraalTruffleRuntime;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationListener.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationListener.java Thu Oct 08 17:41:33 2015 -0700 @@ -28,7 +28,7 @@ import java.util.LinkedHashMap; import java.util.Map; -import jdk.internal.jvmci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult; import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.truffle.GraalTruffleRuntime;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationPolymorphismListener.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/TraceCompilationPolymorphismListener.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,7 +27,7 @@ import java.util.LinkedHashMap; import java.util.Map; -import jdk.internal.jvmci.code.CompilationResult; +import jdk.vm.ci.code.CompilationResult; import com.oracle.graal.nodes.StructuredGraph; import com.oracle.graal.truffle.GraalTruffleRuntime;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/AssumptionValidAssumption.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/AssumptionValidAssumption.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.nodes; -import jdk.internal.jvmci.meta.Assumptions; +import jdk.vm.ci.meta.Assumptions; import com.oracle.graal.truffle.OptimizedAssumption;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/IsCompilationConstantNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/IsCompilationConstantNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.nodes; -import jdk.internal.jvmci.meta.JavaKind; +import jdk.vm.ci.meta.JavaKind; import com.oracle.graal.compiler.common.type.StampFactory; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/ObjectLocationIdentity.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/ObjectLocationIdentity.java Thu Oct 08 17:41:33 2015 -0700 @@ -24,9 +24,9 @@ import java.util.Objects; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; /** * A {@link LocationIdentity} wrapping an object.
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/NewFrameNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/NewFrameNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,10 +26,10 @@ import java.util.Collections; import java.util.List; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.ResolvedJavaField; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.ResolvedJavaField; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.api.runtime.Graal;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,16 +26,16 @@ import java.util.concurrent.Callable; -import jdk.internal.jvmci.meta.Constant; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.DeoptimizationAction; -import jdk.internal.jvmci.meta.DeoptimizationReason; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.Constant; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.DeoptimizationAction; +import jdk.vm.ci.meta.DeoptimizationReason; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.compiler.common.calc.Condition;
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleInvocationPluginProvider.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleInvocationPluginProvider.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.truffle.substitutions; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.api.replacements.SnippetReflectionProvider; import com.oracle.graal.graphbuilderconf.InvocationPlugins;
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectList.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectList.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,7 +27,7 @@ import java.util.Arrays; import java.util.Iterator; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.debug.Debug; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsClosure.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsClosure.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.common.JVMCIError; +import jdk.vm.ci.common.JVMCIError; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.compiler.common.cfg.BlockMap;
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PEReadEliminationBlockState.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PEReadEliminationBlockState.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.nodes.ValueNode;
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PEReadEliminationClosure.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PEReadEliminationClosure.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,12 +29,12 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.cfg.Loop; import com.oracle.graal.graph.Node;
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java Thu Oct 08 17:41:33 2015 -0700 @@ -34,10 +34,10 @@ import java.util.Set; import java.util.function.IntFunction; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.compiler.common.cfg.Loop;
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapePhase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapePhase.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,9 +27,9 @@ import java.util.Set; -import jdk.internal.jvmci.options.Option; -import jdk.internal.jvmci.options.OptionType; -import jdk.internal.jvmci.options.OptionValue; +import jdk.vm.ci.options.Option; +import jdk.vm.ci.options.OptionType; +import jdk.vm.ci.options.OptionValue; import com.oracle.graal.graph.Node; import com.oracle.graal.nodes.StructuredGraph;
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/ReadEliminationBlockState.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/ReadEliminationBlockState.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.nodes.ValueNode;
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/ReadEliminationClosure.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/ReadEliminationClosure.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,14 +22,14 @@ */ package com.oracle.graal.virtual.phases.ea; -import static jdk.internal.jvmci.meta.LocationIdentity.any; +import static jdk.vm.ci.meta.LocationIdentity.any; import java.util.HashMap; import java.util.List; import java.util.Map; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.CollectionsFactory; import com.oracle.graal.compiler.common.type.Stamp;
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualUtil.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualUtil.java Thu Oct 08 17:41:33 2015 -0700 @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.ResolvedJavaMethod; import com.oracle.graal.debug.Debug; import com.oracle.graal.debug.TTY;
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualizerToolImpl.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualizerToolImpl.java Thu Oct 08 17:41:33 2015 -0700 @@ -26,9 +26,9 @@ import java.util.List; -import jdk.internal.jvmci.meta.ConstantReflectionProvider; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ConstantReflectionProvider; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.MetaAccessProvider; import com.oracle.graal.graph.Node; import com.oracle.graal.graph.spi.CanonicalizerTool;
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/BarrieredAccess.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/BarrieredAccess.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.word; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.word.Word.Opcode; import com.oracle.graal.word.Word.Operation;
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/ObjectAccess.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/ObjectAccess.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.word; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.word.Word.Opcode; import com.oracle.graal.word.Word.Operation;
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/Pointer.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/Pointer.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.word; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.nodes.memory.HeapAccess.BarrierType;
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/Word.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/Word.java Thu Oct 08 17:41:33 2015 -0700 @@ -29,8 +29,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jdk.internal.jvmci.common.JVMCIError; -import jdk.internal.jvmci.meta.LocationIdentity; +import jdk.vm.ci.common.JVMCIError; +import jdk.vm.ci.meta.LocationIdentity; import com.oracle.graal.compiler.common.calc.Condition; import com.oracle.graal.compiler.common.calc.UnsignedMath;
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/WordBase.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/WordBase.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,7 +22,7 @@ */ package com.oracle.graal.word; -import jdk.internal.jvmci.meta.TrustedInterface; +import jdk.vm.ci.meta.TrustedInterface; public interface WordBase extends TrustedInterface {
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/WordTypes.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/WordTypes.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.word; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.JavaType; -import jdk.internal.jvmci.meta.MetaAccessProvider; -import jdk.internal.jvmci.meta.ResolvedJavaMethod; -import jdk.internal.jvmci.meta.ResolvedJavaType; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.JavaType; +import jdk.vm.ci.meta.MetaAccessProvider; +import jdk.vm.ci.meta.ResolvedJavaMethod; +import jdk.vm.ci.meta.ResolvedJavaType; import com.oracle.graal.compiler.common.type.Stamp; import com.oracle.graal.compiler.common.type.StampFactory;
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Thu Oct 08 17:41:33 2015 -0700 @@ -22,11 +22,11 @@ */ package com.oracle.graal.word.nodes; -import jdk.internal.jvmci.meta.AllocatableValue; -import jdk.internal.jvmci.meta.JavaConstant; -import jdk.internal.jvmci.meta.JavaKind; -import jdk.internal.jvmci.meta.LIRKind; -import jdk.internal.jvmci.meta.Value; +import jdk.vm.ci.meta.AllocatableValue; +import jdk.vm.ci.meta.JavaConstant; +import jdk.vm.ci.meta.JavaKind; +import jdk.vm.ci.meta.LIRKind; +import jdk.vm.ci.meta.Value; import com.oracle.graal.compiler.common.type.AbstractPointerStamp; import com.oracle.graal.compiler.common.type.ObjectStamp;
--- a/graal/com.oracle.nfi.test/test/com/oracle/nfi/test/NativeFunctionInterfaceTest.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.nfi.test/test/com/oracle/nfi/test/NativeFunctionInterfaceTest.java Thu Oct 08 17:41:33 2015 -0700 @@ -25,7 +25,7 @@ import static java.io.File.separatorChar; import static java.lang.System.getProperty; import static java.lang.System.mapLibraryName; -import static jdk.internal.jvmci.common.UnsafeUtil.writeCString; +import static jdk.vm.ci.common.UnsafeUtil.writeCString; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue;
--- a/graal/com.oracle.nfi/src/com/oracle/nfi/NativeFunctionInterfaceRuntime.java Thu Oct 08 18:20:57 2015 -0700 +++ b/graal/com.oracle.nfi/src/com/oracle/nfi/NativeFunctionInterfaceRuntime.java Thu Oct 08 17:41:33 2015 -0700 @@ -49,7 +49,7 @@ NativeFunctionInterfaceAccess access = null; Class<?> servicesClass = null; try { - servicesClass = Class.forName("jdk.internal.jvmci.service.Services"); + servicesClass = Class.forName("jdk.vm.ci.service.Services"); } catch (ClassNotFoundException e) { try { // Legacy support
--- a/mx.graal/suite.py Thu Oct 08 18:20:57 2015 -0700 +++ b/mx.graal/suite.py Thu Oct 08 17:41:33 2015 -0700 @@ -6,7 +6,7 @@ "suites": [ { "name" : "jvmci", - "version" : "7d4688ad5afdf6db8e9d250c05f9f0e1bf765361", + "version" : "1bbd4a7c274b3d1fcdfe0846d652dcca76a87f99", "urls" : [ {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"}, {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"}, @@ -14,7 +14,7 @@ }, { "name" : "truffle", - "version" : "7f32031a4812c53b3b0d5dd10d3810feecaee29a", + "version" : "9c108011f794735ab27772ae3e718d17ef51bf0f", "urls" : [ {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/truffle", "kind" : "hg"}, {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},