Mercurial > hg > truffle
changeset 21542:543957c1c6a6
removed more dependencies from JVMCI classes to non-JVMCI classes (JBS:GRAAL-53)
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java Mon May 25 22:17:10 2015 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/GraalOptions.java Mon May 25 22:30:44 2015 +0200 @@ -212,9 +212,6 @@ public static final OptionValue<Boolean> ConditionalElimination = new OptionValue<>(true); @Option(help = "", type = OptionType.Debug) - public static final OptionValue<Boolean> UseProfilingInformation = new OptionValue<>(true); - - @Option(help = "", type = OptionType.Debug) public static final OptionValue<Boolean> RemoveNeverExecutedCode = new OptionValue<>(true); @Option(help = "", type = OptionType.Debug)
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotMemoryAccessProviderImpl.java Mon May 25 22:17:10 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotMemoryAccessProviderImpl.java Mon May 25 22:30:44 2015 +0200 @@ -26,7 +26,6 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; -import com.oracle.graal.compiler.common.*; import com.oracle.graal.hotspot.jvmci.HotSpotVMConfig.CompressEncoding; /** @@ -60,7 +59,7 @@ return ((HotSpotResolvedObjectTypeImpl) metaspaceObject).mirror().isArray(); } } else { - throw GraalInternalError.shouldNotReachHere(); + throw new InternalError(String.valueOf(metaspaceObject)); } } return false; @@ -75,7 +74,7 @@ return prim.asLong(); } } - throw GraalInternalError.shouldNotReachHere(); + throw new InternalError(String.valueOf(base)); } private static long readRawValue(Constant baseConstant, long displacement, int bits) { @@ -91,7 +90,7 @@ case 64: return unsafe.getLong(base, displacement); default: - throw GraalInternalError.shouldNotReachHere(); + throw new InternalError(String.valueOf(bits)); } } else { long pointer = asRawPointer(baseConstant); @@ -105,7 +104,7 @@ case 64: return unsafe.getLong(pointer + displacement); default: - throw GraalInternalError.shouldNotReachHere(); + throw new InternalError(String.valueOf(bits)); } } } @@ -179,7 +178,7 @@ case Double: return JavaConstant.forDouble(Double.longBitsToDouble(rawValue)); default: - throw GraalInternalError.shouldNotReachHere("unsupported kind: " + kind); + throw new InternalError("Unsupported kind: " + kind); } } catch (NullPointerException e) { return null;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotMethodDataAccessor.java Mon May 25 22:17:10 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotMethodDataAccessor.java Mon May 25 22:30:44 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.jvmci; -import static com.oracle.graal.hotspot.HotSpotGraalRuntime.*; +import static com.oracle.graal.hotspot.jvmci.HotSpotJVMCIRuntime.*; import com.oracle.graal.api.meta.*;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotMethodHandleAccessProvider.java Mon May 25 22:17:10 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotMethodHandleAccessProvider.java Mon May 25 22:30:44 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.jvmci; -import static com.oracle.graal.hotspot.HotSpotGraalRuntime.*; +import static com.oracle.graal.hotspot.jvmci.HotSpotJVMCIRuntime.*; import static com.oracle.graal.hotspot.jvmci.HotSpotResolvedJavaType.*; import static com.oracle.graal.hotspot.jvmci.HotSpotResolvedObjectTypeImpl.*;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotNmethod.java Mon May 25 22:17:10 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotNmethod.java Mon May 25 22:30:44 2015 +0200 @@ -22,7 +22,7 @@ */ package com.oracle.graal.hotspot.jvmci; -import static com.oracle.graal.hotspot.HotSpotGraalRuntime.*; +import static com.oracle.graal.hotspot.jvmci.HotSpotJVMCIRuntime.*; import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotResolvedJavaFieldImpl.java Mon May 25 22:17:10 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotResolvedJavaFieldImpl.java Mon May 25 22:30:44 2015 +0200 @@ -22,7 +22,6 @@ */ package com.oracle.graal.hotspot.jvmci; -//import static com.oracle.graal.compiler.common.GraalOptions.*; import static com.oracle.graal.hotspot.jvmci.HotSpotJVMCIRuntime.*; import static com.oracle.graal.hotspot.jvmci.HotSpotResolvedJavaFieldImpl.Options.*; import static com.oracle.graal.hotspot.jvmci.HotSpotResolvedObjectTypeImpl.*;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotResolvedJavaMethodImpl.java Mon May 25 22:17:10 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotResolvedJavaMethodImpl.java Mon May 25 22:30:44 2015 +0200 @@ -22,9 +22,8 @@ */ package com.oracle.graal.hotspot.jvmci; -import static com.oracle.graal.compiler.common.GraalInternalError.*; -import static com.oracle.graal.compiler.common.GraalOptions.*; -import static com.oracle.graal.hotspot.HotSpotGraalRuntime.*; +import static com.oracle.graal.hotspot.jvmci.HotSpotJVMCIRuntime.*; +import static com.oracle.graal.hotspot.jvmci.HotSpotResolvedJavaMethodImpl.Options.*; import static com.oracle.jvmci.common.UnsafeAccess.*; import java.lang.annotation.*; @@ -36,12 +35,20 @@ import com.oracle.graal.debug.*; import com.oracle.graal.graphbuilderconf.*; import com.oracle.graal.nodes.*; +import com.oracle.graal.options.*; /** * Implementation of {@link JavaMethod} for resolved HotSpot methods. */ public final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSpotResolvedJavaMethod, HotSpotProxified, MethodIdHolder { + static class Options { + // @formatter:off + @Option(help = "", type = OptionType.Debug) + public static final OptionValue<Boolean> UseProfilingInformation = new OptionValue<>(true); + // @formatter:on + } + /** * Reference to metaspace Method object. */ @@ -619,7 +626,9 @@ * @return the offset of this method into the v-table */ public int vtableEntryOffset(ResolvedJavaType resolved) { - guarantee(isInVirtualMethodTable(resolved), "%s does not have a vtable entry", this); + if (!isInVirtualMethodTable(resolved)) { + throw new InternalError(this + " does not have a vtable entry"); + } HotSpotVMConfig config = runtime().getConfig(); final int vtableIndex = getVtableIndex((HotSpotResolvedObjectTypeImpl) resolved); return config.instanceKlassVtableStartOffset + vtableIndex * config.vtableEntrySize + config.vtableEntryMethodOffset;