Mercurial > hg > graal-jvmci-8
changeset 22582:232c53e17ea0
added CompilerToVM.compilerToVM() for static access to the CompilerToVM instance
line wrap: on
line diff
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/CompilerToVM.java Fri Sep 18 15:05:04 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/CompilerToVM.java Fri Sep 18 15:16:15 2015 +0200 @@ -23,6 +23,7 @@ package jdk.internal.jvmci.hotspot; +import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; import static jdk.internal.jvmci.inittimer.InitTimer.timer; import java.lang.reflect.Constructor; @@ -62,6 +63,14 @@ } /** + * Gets the {@link CompilerToVM} instance associated with the singleton + * {@link HotSpotJVMCIRuntime} instance. + */ + public static CompilerToVM compilerToVM() { + return runtime().getCompilerToVM(); + } + + /** * Copies the original bytecode of {@code method} into a new byte array and returns it. * * @return a new byte array containing the original bytecode of {@code method}
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotConstantPool.java Fri Sep 18 15:05:04 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotConstantPool.java Fri Sep 18 15:16:15 2015 +0200 @@ -22,6 +22,7 @@ */ package jdk.internal.jvmci.hotspot; +import static jdk.internal.jvmci.hotspot.CompilerToVM.compilerToVM; import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; import static jdk.internal.jvmci.hotspot.UnsafeAccess.UNSAFE; @@ -208,7 +209,7 @@ * @return holder for this constant pool */ private HotSpotResolvedObjectType getHolder() { - return runtime().getCompilerToVM().getResolvedJavaType(this, config().constantPoolHolderOffset, false); + return compilerToVM().getResolvedJavaType(this, config().constantPoolHolderOffset, false); } /** @@ -363,7 +364,7 @@ * @return {@code JVM_CONSTANT_NameAndType} reference constant pool entry */ private int getNameAndTypeRefIndexAt(int index) { - return runtime().getCompilerToVM().lookupNameAndTypeRefIndexInPool(this, index); + return compilerToVM().lookupNameAndTypeRefIndexInPool(this, index); } /** @@ -374,7 +375,7 @@ * @return name as {@link String} */ private String getNameRefAt(int index) { - return runtime().getCompilerToVM().lookupNameRefInPool(this, index); + return compilerToVM().lookupNameRefInPool(this, index); } /** @@ -398,7 +399,7 @@ * @return signature as {@link String} */ private String getSignatureRefAt(int index) { - return runtime().getCompilerToVM().lookupSignatureRefInPool(this, index); + return compilerToVM().lookupSignatureRefInPool(this, index); } /** @@ -421,7 +422,7 @@ * @return klass reference index */ private int getKlassRefIndexAt(int index) { - return runtime().getCompilerToVM().lookupKlassRefIndexInPool(this, index); + return compilerToVM().lookupKlassRefIndexInPool(this, index); } /** @@ -498,13 +499,13 @@ * "pseudo strings" (arbitrary live objects) patched into a String entry. Such * entries do not have a symbol in the constant pool slot. */ - Object string = runtime().getCompilerToVM().resolvePossiblyCachedConstantInPool(this, cpi); + Object string = compilerToVM().resolvePossiblyCachedConstantInPool(this, cpi); return HotSpotObjectConstantImpl.forObject(string); case MethodHandle: case MethodHandleInError: case MethodType: case MethodTypeInError: - Object obj = runtime().getCompilerToVM().resolveConstantInPool(this, cpi); + Object obj = compilerToVM().resolveConstantInPool(this, cpi); return HotSpotObjectConstantImpl.forObject(obj); default: throw new JVMCIError("Unknown constant pool tag %s", tag); @@ -514,7 +515,7 @@ @Override public String lookupUtf8(int cpi) { assertTag(cpi, JVM_CONSTANT.Utf8); - return runtime().getCompilerToVM().getSymbol(getEntryAt(cpi)); + return compilerToVM().getSymbol(getEntryAt(cpi)); } @Override @@ -526,7 +527,7 @@ public JavaConstant lookupAppendix(int cpi, int opcode) { assert Bytecodes.isInvoke(opcode); final int index = rawIndexToConstantPoolIndex(cpi, opcode); - Object appendix = runtime().getCompilerToVM().lookupAppendixInPool(this, index); + Object appendix = compilerToVM().lookupAppendixInPool(this, index); if (appendix == null) { return null; } else { @@ -551,7 +552,7 @@ @Override public JavaMethod lookupMethod(int cpi, int opcode) { final int index = rawIndexToConstantPoolIndex(cpi, opcode); - final HotSpotResolvedJavaMethod method = runtime().getCompilerToVM().lookupMethodInPool(this, index, (byte) opcode); + final HotSpotResolvedJavaMethod method = compilerToVM().lookupMethodInPool(this, index, (byte) opcode); if (method != null) { return method; } else { @@ -563,7 +564,7 @@ return new HotSpotMethodUnresolved(name, signature, holder); } else { final int klassIndex = getKlassRefIndexAt(index); - final Object type = runtime().getCompilerToVM().lookupKlassInPool(this, klassIndex); + final Object type = compilerToVM().lookupKlassInPool(this, klassIndex); JavaType holder = getJavaType(type); return new HotSpotMethodUnresolved(name, signature, holder); } @@ -576,7 +577,7 @@ if (elem != null && elem.lastCpi == cpi) { return elem.javaType; } else { - final Object type = runtime().getCompilerToVM().lookupKlassInPool(this, cpi); + final Object type = compilerToVM().lookupKlassInPool(this, cpi); JavaType result = getJavaType(type); if (result instanceof ResolvedJavaType) { this.lastLookupType = new LookupTypeCacheElement(cpi, result); @@ -602,7 +603,7 @@ long[] info = new long[2]; HotSpotResolvedObjectTypeImpl resolvedHolder; try { - resolvedHolder = runtime().getCompilerToVM().resolveFieldInPool(this, index, (byte) opcode, info); + resolvedHolder = compilerToVM().resolveFieldInPool(this, index, (byte) opcode, info); } catch (Throwable t) { /* * If there was an exception resolving the field we give up and return an unresolved @@ -637,7 +638,7 @@ case Bytecodes.INVOKEDYNAMIC: { // invokedynamic instructions point to a constant pool cache entry. index = decodeConstantPoolCacheIndex(cpi) + config().constantPoolCpCacheIndexTag; - index = runtime().getCompilerToVM().constantPoolRemapInstructionOperandFromCache(this, index); + index = compilerToVM().constantPoolRemapInstructionOperandFromCache(this, index); break; } case Bytecodes.GETSTATIC: @@ -650,7 +651,7 @@ case Bytecodes.INVOKEINTERFACE: { // invoke and field instructions point to a constant pool cache entry. index = rawIndexToConstantPoolIndex(cpi, opcode); - index = runtime().getCompilerToVM().constantPoolRemapInstructionOperandFromCache(this, index); + index = compilerToVM().constantPoolRemapInstructionOperandFromCache(this, index); break; } default: @@ -674,7 +675,7 @@ case Class: case UnresolvedClass: case UnresolvedClassInError: - final HotSpotResolvedObjectTypeImpl type = runtime().getCompilerToVM().resolveTypeInPool(this, index); + final HotSpotResolvedObjectTypeImpl type = compilerToVM().resolveTypeInPool(this, index); Class<?> klass = type.mirror(); if (!klass.isPrimitive() && !klass.isArray()) { UNSAFE.ensureClassInitialized(klass); @@ -684,14 +685,14 @@ if (Bytecodes.isInvokeHandleAlias(opcode)) { final int methodRefCacheIndex = rawIndexToConstantPoolIndex(cpi, opcode); if (isInvokeHandle(methodRefCacheIndex, type)) { - runtime().getCompilerToVM().resolveInvokeHandleInPool(this, methodRefCacheIndex); + compilerToVM().resolveInvokeHandleInPool(this, methodRefCacheIndex); } } } break; case InvokeDynamic: if (isInvokedynamicIndex(cpi)) { - runtime().getCompilerToVM().resolveInvokeDynamicInPool(this, cpi); + compilerToVM().resolveInvokeDynamicInPool(this, cpi); } break; default: @@ -701,7 +702,7 @@ } private boolean isInvokeHandle(int methodRefCacheIndex, HotSpotResolvedObjectTypeImpl klass) { - assertTag(runtime().getCompilerToVM().constantPoolRemapInstructionOperandFromCache(this, methodRefCacheIndex), JVM_CONSTANT.MethodRef); + assertTag(compilerToVM().constantPoolRemapInstructionOperandFromCache(this, methodRefCacheIndex), JVM_CONSTANT.MethodRef); return ResolvedJavaMethod.isSignaturePolymorphic(klass, getNameRefAt(methodRefCacheIndex), runtime().getHostJVMCIBackend().getMetaAccess()); }
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMethodData.java Fri Sep 18 15:05:04 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMethodData.java Fri Sep 18 15:16:15 2015 +0200 @@ -23,6 +23,7 @@ package jdk.internal.jvmci.hotspot; import static java.lang.String.format; +import static jdk.internal.jvmci.hotspot.CompilerToVM.compilerToVM; import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; import static jdk.internal.jvmci.hotspot.UnsafeAccess.UNSAFE; @@ -200,12 +201,12 @@ private HotSpotResolvedJavaMethod readMethod(int position, int offsetInBytes) { long fullOffsetInBytes = computeFullOffset(position, offsetInBytes); - return runtime().getCompilerToVM().getResolvedJavaMethod(null, metaspaceMethodData + fullOffsetInBytes); + return compilerToVM().getResolvedJavaMethod(null, metaspaceMethodData + fullOffsetInBytes); } private HotSpotResolvedObjectTypeImpl readKlass(int position, int offsetInBytes) { long fullOffsetInBytes = computeFullOffset(position, offsetInBytes); - return runtime().getCompilerToVM().getResolvedJavaType(null, metaspaceMethodData + fullOffsetInBytes, false); + return compilerToVM().getResolvedJavaType(null, metaspaceMethodData + fullOffsetInBytes, false); } private static int truncateLongToInt(long value) {
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMethodHandleAccessProvider.java Fri Sep 18 15:05:04 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotMethodHandleAccessProvider.java Fri Sep 18 15:16:15 2015 +0200 @@ -22,6 +22,7 @@ */ package jdk.internal.jvmci.hotspot; +import static jdk.internal.jvmci.hotspot.CompilerToVM.compilerToVM; import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; import static jdk.internal.jvmci.hotspot.HotSpotResolvedObjectTypeImpl.fromObjectClass; import jdk.internal.jvmci.common.JVMCIError; @@ -159,6 +160,6 @@ Object object = ((HotSpotObjectConstantImpl) memberName).object(); /* Read the ResolvedJavaMethod from the injected field MemberName.vmtarget */ - return runtime().getCompilerToVM().getResolvedJavaMethod(object, LazyInitialization.memberNameVmtargetField.offset()); + return compilerToVM().getResolvedJavaMethod(object, LazyInitialization.memberNameVmtargetField.offset()); } }
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotNmethod.java Fri Sep 18 15:05:04 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotNmethod.java Fri Sep 18 15:16:15 2015 +0200 @@ -22,7 +22,7 @@ */ package jdk.internal.jvmci.hotspot; -import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; +import static jdk.internal.jvmci.hotspot.CompilerToVM.compilerToVM; import jdk.internal.jvmci.code.InstalledCode; import jdk.internal.jvmci.code.InvalidInstalledCodeException; import jdk.internal.jvmci.meta.JavaKind; @@ -74,7 +74,7 @@ @Override public void invalidate() { - runtime().getCompilerToVM().invalidateInstalledCode(this); + compilerToVM().invalidateInstalledCode(this); } @Override @@ -108,7 +108,7 @@ public Object executeVarargs(Object... args) throws InvalidInstalledCodeException { assert checkArgs(args); assert !isExternal(); - return runtime().getCompilerToVM().executeInstalledCode(args, this); + return compilerToVM().executeInstalledCode(args, this); } @Override
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedJavaMethodImpl.java Fri Sep 18 15:05:04 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedJavaMethodImpl.java Fri Sep 18 15:16:15 2015 +0200 @@ -22,6 +22,7 @@ */ package jdk.internal.jvmci.hotspot; +import static jdk.internal.jvmci.hotspot.CompilerToVM.compilerToVM; import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; import static jdk.internal.jvmci.hotspot.HotSpotResolvedJavaMethodImpl.Options.UseProfilingInformation; import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; @@ -97,7 +98,7 @@ HotSpotVMConfig config = config(); final long metaspaceConstMethod = UNSAFE.getAddress(metaspaceMethod + config.methodConstMethodOffset); final long metaspaceConstantPool = UNSAFE.getAddress(metaspaceConstMethod + config.constMethodConstantsOffset); - return runtime().getCompilerToVM().getResolvedJavaType(null, metaspaceConstantPool + config.constantPoolHolderOffset, false); + return compilerToVM().getResolvedJavaType(null, metaspaceConstantPool + config.constantPoolHolderOffset, false); } /** @@ -134,7 +135,7 @@ if (metaspaceConstantPool == holder.getConstantPool().getMetaspaceConstantPool()) { this.constantPool = holder.getConstantPool(); } else { - this.constantPool = runtime().getCompilerToVM().getConstantPool(null, constMethod + config.constMethodConstantsOffset); + this.constantPool = compilerToVM().getConstantPool(null, constMethod + config.constMethodConstantsOffset); } final int nameIndex = UNSAFE.getChar(constMethod + config.constMethodNameIndexOffset); @@ -241,7 +242,7 @@ return null; } if (code == null && holder.isLinked()) { - code = runtime().getCompilerToVM().getBytecode(this); + code = compilerToVM().getBytecode(this); assert code.length == getCodeSize() : "expected: " + getCodeSize() + ", actual: " + code.length; } return code; @@ -260,9 +261,9 @@ } HotSpotVMConfig config = config(); - final int exceptionTableLength = runtime().getCompilerToVM().getExceptionTableLength(this); + final int exceptionTableLength = compilerToVM().getExceptionTableLength(this); ExceptionHandler[] handlers = new ExceptionHandler[exceptionTableLength]; - long exceptionTableElement = runtime().getCompilerToVM().getExceptionTableStart(this); + long exceptionTableElement = compilerToVM().getExceptionTableStart(this); for (int i = 0; i < exceptionTableLength; i++) { final int startPc = UNSAFE.getChar(exceptionTableElement + config.exceptionTableElementStartPcOffset); @@ -326,7 +327,7 @@ * Manually adds a DontInline annotation to this method. */ public void setNotInlineable() { - runtime().getCompilerToVM().doNotInlineOrCompile(this); + compilerToVM().doNotInlineOrCompile(this); } /** @@ -336,7 +337,7 @@ * @return true if special method ignored by security stack walks, false otherwise */ public boolean ignoredBySecurityStackWalk() { - return runtime().getCompilerToVM().methodIsIgnoredBySecurityStackWalk(this); + return compilerToVM().methodIsIgnoredBySecurityStackWalk(this); } public boolean hasBalancedMonitors() { @@ -354,7 +355,7 @@ } // This either happens only once if monitors are balanced or very rarely multiple-times. - return runtime().getCompilerToVM().hasBalancedMonitors(this); + return compilerToVM().hasBalancedMonitors(this); } @Override @@ -389,10 +390,10 @@ public StackTraceElement asStackTraceElement(int bci) { if (bci < 0 || bci >= getCodeSize()) { // HotSpot code can only construct stack trace elements for valid bcis - StackTraceElement ste = runtime().getCompilerToVM().getStackTraceElement(this, 0); + StackTraceElement ste = compilerToVM().getStackTraceElement(this, 0); return new StackTraceElement(ste.getClassName(), ste.getMethodName(), ste.getFileName(), -1); } - return runtime().getCompilerToVM().getStackTraceElement(this, bci); + return compilerToVM().getStackTraceElement(this, bci); } public ResolvedJavaMethod uniqueConcreteMethod(HotSpotResolvedObjectType receiver) { @@ -411,7 +412,7 @@ // CHA for default methods doesn't work and may crash the VM return null; } - return runtime().getCompilerToVM().findUniqueConcreteMethod(((HotSpotResolvedObjectTypeImpl) receiver), this); + return compilerToVM().findUniqueConcreteMethod(((HotSpotResolvedObjectTypeImpl) receiver), this); } @Override @@ -479,7 +480,7 @@ @Override public void reprofile() { - runtime().getCompilerToVM().reprofile(this); + compilerToVM().reprofile(this); } @Override @@ -579,7 +580,7 @@ if (isDontInline()) { return false; } - return runtime().getCompilerToVM().canInlineMethod(this); + return compilerToVM().canInlineMethod(this); } @Override @@ -587,7 +588,7 @@ if (isForceInline()) { return true; } - return runtime().getCompilerToVM().shouldInlineMethod(this); + return compilerToVM().shouldInlineMethod(this); } @Override @@ -597,7 +598,7 @@ return null; } - long[] values = runtime().getCompilerToVM().getLineNumberTable(this); + long[] values = compilerToVM().getLineNumberTable(this); if (values == null || values.length == 0) { // Empty table so treat is as non-existent return null; @@ -622,8 +623,8 @@ } HotSpotVMConfig config = config(); - long localVariableTableElement = runtime().getCompilerToVM().getLocalVariableTableStart(this); - final int localVariableTableLength = runtime().getCompilerToVM().getLocalVariableTableLength(this); + long localVariableTableElement = compilerToVM().getLocalVariableTableStart(this); + final int localVariableTableLength = compilerToVM().getLocalVariableTableLength(this); Local[] locals = new Local[localVariableTableLength]; for (int i = 0; i < localVariableTableLength; i++) { @@ -699,7 +700,7 @@ private int getVtableIndexForInterface(ResolvedJavaType resolved) { HotSpotResolvedObjectTypeImpl hotspotType = (HotSpotResolvedObjectTypeImpl) resolved; - return runtime().getCompilerToVM().getVtableIndexForInterface(hotspotType, this); + return compilerToVM().getVtableIndexForInterface(hotspotType, this); } /** @@ -764,13 +765,13 @@ * @return compile id */ public int allocateCompileId(int entryBCI) { - return runtime().getCompilerToVM().allocateCompileId(this, entryBCI); + return compilerToVM().allocateCompileId(this, entryBCI); } public boolean hasCodeAtLevel(int entryBCI, int level) { if (entryBCI == config().invocationEntryBci) { return hasCompiledCodeAtLevel(level); } - return runtime().getCompilerToVM().hasCompiledCodeForOSR(this, entryBCI, level); + return compilerToVM().hasCompiledCodeForOSR(this, entryBCI, level); } }
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedObjectTypeImpl.java Fri Sep 18 15:05:04 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotResolvedObjectTypeImpl.java Fri Sep 18 15:16:15 2015 +0200 @@ -23,6 +23,7 @@ package jdk.internal.jvmci.hotspot; import static java.util.Objects.requireNonNull; +import static jdk.internal.jvmci.hotspot.CompilerToVM.compilerToVM; import static jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime.runtime; import static jdk.internal.jvmci.hotspot.HotSpotVMConfig.config; import static jdk.internal.jvmci.hotspot.UnsafeAccess.UNSAFE; @@ -233,7 +234,7 @@ * @return value of the subklass field as metaspace klass pointer */ private HotSpotResolvedObjectTypeImpl getSubklass() { - return runtime().getCompilerToVM().getResolvedJavaType(this, config().subklassOffset, false); + return compilerToVM().getResolvedJavaType(this, config().subklassOffset, false); } @Override @@ -260,7 +261,7 @@ if (!isInterface()) { throw new JVMCIError("Cannot call getSingleImplementor() on a non-interface type: %s", this); } - return runtime().getCompilerToVM().getImplementor(this); + return compilerToVM().getImplementor(this); } public HotSpotResolvedObjectTypeImpl getSupertype() { @@ -315,7 +316,7 @@ @Override public AssumptionResult<Boolean> hasFinalizableSubclass() { assert !isArray(); - if (!runtime().getCompilerToVM().hasFinalizableSubclass(this)) { + if (!compilerToVM().hasFinalizableSubclass(this)) { return new AssumptionResult<>(false, new NoFinalizableSubclass(this)); } return new AssumptionResult<>(true); @@ -424,12 +425,12 @@ } HotSpotResolvedJavaMethodImpl hotSpotMethod = (HotSpotResolvedJavaMethodImpl) method; HotSpotResolvedObjectTypeImpl hotSpotCallerType = (HotSpotResolvedObjectTypeImpl) callerType; - return runtime().getCompilerToVM().resolveMethod(this, hotSpotMethod, hotSpotCallerType); + return compilerToVM().resolveMethod(this, hotSpotMethod, hotSpotCallerType); } public HotSpotConstantPool getConstantPool() { if (constantPool == null) { - constantPool = runtime().getCompilerToVM().getConstantPool(this, config().instanceKlassConstantsOffset); + constantPool = compilerToVM().getConstantPool(this, config().instanceKlassConstantsOffset); } return constantPool; } @@ -893,7 +894,7 @@ } public ResolvedJavaMethod getClassInitializer() { - return runtime().getCompilerToVM().getClassInitializer(this); + return compilerToVM().getClassInitializer(this); } @Override
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVMConfig.java Fri Sep 18 15:05:04 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVMConfig.java Fri Sep 18 15:16:15 2015 +0200 @@ -67,7 +67,7 @@ } /** - * Gets the configuration associated with the current {@link HotSpotJVMCIRuntime}. + * Gets the configuration associated with the singleton {@link HotSpotJVMCIRuntime}. */ public static HotSpotVMConfig config() { return runtime().getConfig();