Mercurial > hg > truffle
changeset 18487:0f4813e0b4a9
Use asConstant() instead of asJavaConstant() where possible.
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ConstantReflectionProvider.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ConstantReflectionProvider.java Mon Nov 24 12:13:31 2014 +0100 @@ -130,7 +130,7 @@ * as a class by the VM) encapsulated in the given constant. Returns {@code null} if the * constant does not encapsulate a class, or if the type is not available at this point. */ - ResolvedJavaType asJavaType(JavaConstant constant); + ResolvedJavaType asJavaType(Constant constant); /** * Gets access to the internals of {@link MethodHandle}.
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ConditionalEliminationTest.java Mon Nov 24 12:13:31 2014 +0100 @@ -97,7 +97,7 @@ new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context); canonicalizer.apply(graph, context); new FloatingReadPhase().apply(graph); - new ConditionalEliminationPhase(getMetaAccess()).apply(graph, context); + new ConditionalEliminationPhase().apply(graph, context); canonicalizer.apply(graph, context); assertDeepEquals(1, graph.getNodes().filter(GuardNode.class).count()); @@ -120,7 +120,7 @@ new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context); canonicalizer.apply(graph, context); - new ConditionalEliminationPhase(getMetaAccess()).apply(graph, context); + new ConditionalEliminationPhase().apply(graph, context); canonicalizer.apply(graph, context); assertDeepEquals(0, graph.getNodes().filter(GuardNode.class).count());
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FlowSenReduTest.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FlowSenReduTest.java Mon Nov 24 12:13:31 2014 +0100 @@ -222,7 +222,7 @@ ConstantNode c2 = (ConstantNode) iter.next().result(); assertDeepEquals(c1, c2); - Assert.assertTrue(c1.asJavaConstant().isNull()); + Assert.assertTrue(c1.isNullConstant()); } /*
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FlowSensitiveReductionTest.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/FlowSensitiveReductionTest.java Mon Nov 24 12:13:31 2014 +0100 @@ -148,7 +148,7 @@ new FlowSensitiveReductionPhase(getMetaAccess()).apply(graph, context); new CanonicalizerPhase(true).apply(graph, context); for (ConstantNode constant : getConstantNodes(graph)) { - assertTrue("unexpected constant: " + constant, constant.asJavaConstant().isNull() || constant.asJavaConstant().asInt() > 0); + assertTrue("unexpected constant: " + constant, constant.isNullConstant() || constant.asJavaConstant().asInt() > 0); } } @@ -184,7 +184,7 @@ new FlowSensitiveReductionPhase(getMetaAccess()).apply(graph, new PhaseContext(getProviders(), null)); new CanonicalizerPhase(true).apply(graph, new PhaseContext(getProviders(), null)); for (ConstantNode constant : getConstantNodes(graph)) { - assertTrue("unexpected constant: " + constant, constant.asJavaConstant().isNull() || constant.asJavaConstant().asInt() > 0); + assertTrue("unexpected constant: " + constant, constant.isNullConstant() || constant.asJavaConstant().asInt() > 0); } }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/TypeSystemTest.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/TypeSystemTest.java Mon Nov 24 12:13:31 2014 +0100 @@ -203,7 +203,7 @@ * tail-duplication gets activated thus resulting in a graph with more nodes than the * reference graph. */ - new ConditionalEliminationPhase(getMetaAccess()).apply(graph, new PhaseContext(getProviders(), assumptions)); + new ConditionalEliminationPhase().apply(graph, new PhaseContext(getProviders(), assumptions)); new CanonicalizerPhase(true).apply(graph, new PhaseContext(getProviders(), assumptions)); // a second canonicalizer is needed to process nested MaterializeNodes new CanonicalizerPhase(true).apply(graph, new PhaseContext(getProviders(), assumptions));
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EATestBase.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/EATestBase.java Mon Nov 24 12:13:31 2014 +0100 @@ -139,7 +139,7 @@ if (expectedConstantResult != null) { for (ReturnNode returnNode : returnNodes) { Assert.assertTrue(returnNode.result().toString(), returnNode.result().isConstant()); - Assert.assertEquals(expectedConstantResult, returnNode.result().asJavaConstant()); + Assert.assertEquals(expectedConstantResult, returnNode.result().asConstant()); } } int newInstanceCount = graph.getNodes().filter(NewInstanceNode.class).count() + graph.getNodes().filter(NewArrayNode.class).count() +
--- a/graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/DataPatchInConstantsTest.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot.amd64.test/src/com/oracle/graal/hotspot/amd64/test/DataPatchInConstantsTest.java Mon Nov 24 12:13:31 2014 +0100 @@ -172,7 +172,7 @@ LIRGeneratorTool gen = generator.getLIRGeneratorTool(); Variable ret = gen.newVariable(gen.getLIRKind(stamp())); - gen.append(new LoadThroughPatchOp(input.asJavaConstant(), stamp() instanceof NarrowOopStamp, ret)); + gen.append(new LoadThroughPatchOp(input.asConstant(), stamp() instanceof NarrowOopStamp, ret)); generator.setResult(this, ret); }
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Mon Nov 24 12:13:31 2014 +0100 @@ -95,7 +95,7 @@ NodeIterable<ConstantNode> filter = getConstantNodes(result); assertDeepEquals(1, filter.count()); HotSpotResolvedObjectType type = (HotSpotResolvedObjectType) getMetaAccess().lookupJavaType(AheadOfTimeCompilationTest.class); - assertDeepEquals(type.klass(), filter.first().asJavaConstant()); + assertDeepEquals(type.klass(), filter.first().asConstant()); assertDeepEquals(1, result.getNodes(FloatingReadNode.class).count()); assertDeepEquals(0, result.getNodes().filter(ReadNode.class).count()); @@ -107,7 +107,7 @@ NodeIterable<ConstantNode> filter = getConstantNodes(result); assertDeepEquals(1, filter.count()); - HotSpotObjectConstantImpl c = (HotSpotObjectConstantImpl) filter.first().asJavaConstant(); + HotSpotObjectConstantImpl c = (HotSpotObjectConstantImpl) filter.first().asConstant(); Assert.assertEquals(Class.class, c.getObjectClass()); Assert.assertTrue(c.isEqualTo(AheadOfTimeCompilationTest.class)); @@ -136,7 +136,7 @@ StructuredGraph result = compile("getPrimitiveClassObject", false); NodeIterable<ConstantNode> filter = getConstantNodes(result); assertDeepEquals(1, filter.count()); - HotSpotObjectConstantImpl c = (HotSpotObjectConstantImpl) filter.first().asJavaConstant(); + HotSpotObjectConstantImpl c = (HotSpotObjectConstantImpl) filter.first().asConstant(); Assert.assertEquals(Class.class, c.getObjectClass()); Assert.assertTrue(c.isEqualTo(Integer.TYPE)); @@ -164,7 +164,7 @@ NodeIterable<ConstantNode> filter = getConstantNodes(result); assertDeepEquals(1, filter.count()); - HotSpotObjectConstantImpl c = (HotSpotObjectConstantImpl) filter.first().asJavaConstant(); + HotSpotObjectConstantImpl c = (HotSpotObjectConstantImpl) filter.first().asConstant(); Assert.assertEquals(String.class, c.getObjectClass()); Assert.assertTrue(c.isEqualTo("test string")); @@ -186,7 +186,7 @@ assertDeepEquals(1, getConstantNodes(result).count()); ConstantNode constant = getConstantNodes(result).first(); assertDeepEquals(Kind.Long, constant.getKind()); - assertDeepEquals(((HotSpotResolvedObjectType) getMetaAccess().lookupJavaType(Boolean.class)).klass(), constant.asJavaConstant()); + assertDeepEquals(((HotSpotResolvedObjectType) getMetaAccess().lookupJavaType(Boolean.class)).klass(), constant.asConstant()); } @Test @@ -198,7 +198,7 @@ ConstantNode constant = getConstantNodes(result).first(); assertDeepEquals(Kind.Object, constant.getKind()); - HotSpotObjectConstantImpl c = (HotSpotObjectConstantImpl) constant.asJavaConstant(); + HotSpotObjectConstantImpl c = (HotSpotObjectConstantImpl) constant.asConstant(); Assert.assertTrue(c.isEqualTo(Boolean.TRUE)); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java Mon Nov 24 12:13:31 2014 +0100 @@ -406,7 +406,7 @@ Kind wordKind = target.wordKind; HotSpotVMConfig config = runtime.getConfig(); LocationNode location = ConstantLocationNode.create(HUB_LOCATION, wordKind, config.hubOffset, graph); - assert !object.isConstant() || object.asJavaConstant().isNull(); + assert !object.isConstant() || object.isNullConstant(); KlassPointerStamp hubStamp = KlassPointerStamp.klassNonNull(); if (config.useCompressedClassPointers) { @@ -424,7 +424,7 @@ private WriteNode createWriteHub(StructuredGraph graph, Kind wordKind, ValueNode object, ValueNode value) { HotSpotVMConfig config = runtime.getConfig(); LocationNode location = ConstantLocationNode.create(HUB_WRITE_LOCATION, wordKind, config.hubOffset, graph); - assert !object.isConstant() || object.asJavaConstant().isNull(); + assert !object.isConstant() || object.isNullConstant(); ValueNode writeValue = value; if (config.useCompressedClassPointers) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java Mon Nov 24 12:13:31 2014 +0100 @@ -144,7 +144,7 @@ } @Override - public ResolvedJavaType asJavaType(JavaConstant constant) { + public ResolvedJavaType asJavaType(Constant constant) { if (constant instanceof HotSpotObjectConstant) { Object obj = ((HotSpotObjectConstantImpl) constant).object(); if (obj instanceof Class) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectTypeImpl.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectTypeImpl.java Mon Nov 24 12:13:31 2014 +0100 @@ -69,9 +69,9 @@ * @param metaspaceKlass a metaspace Klass object boxed in a {@link JavaConstant} * @return the {@link HotSpotResolvedObjectTypeImpl} corresponding to {@code klassConstant} */ - public static HotSpotResolvedObjectTypeImpl fromMetaspaceKlass(JavaConstant metaspaceKlass) { - assert metaspaceKlass.getKind() == Kind.Long; - return fromMetaspaceKlass(metaspaceKlass.asLong()); + public static ResolvedJavaType fromMetaspaceKlass(Constant metaspaceKlass) { + HotSpotMetaspaceConstant klass = (HotSpotMetaspaceConstant) metaspaceKlass; + return klass.asResolvedJavaType(); } /** @@ -93,7 +93,7 @@ * <p> * <b>NOTE</b>: Creating an instance of this class does not install the mirror for the * {@link Class} type. Use {@link #fromObjectClass(Class)}, - * {@link #fromMetaspaceKlass(JavaConstant)} or {@link #fromMetaspaceKlass(long)} instead. + * {@link #fromMetaspaceKlass(Constant)} or {@link #fromMetaspaceKlass(long)} instead. * </p> * * @param javaClass the Class to create the mirror for
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassCastNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassCastNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -65,7 +65,7 @@ @Override public ValueNode canonical(CanonicalizerTool tool, ValueNode forJavaClass, ValueNode forObject) { if (forJavaClass.isConstant()) { - ResolvedJavaType type = tool.getConstantReflection().asJavaType(forJavaClass.asJavaConstant()); + ResolvedJavaType type = tool.getConstantReflection().asJavaType(forJavaClass.asConstant()); if (type != null && !type.isPrimitive()) { return CheckCastNode.create(type, forObject, null, false); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetClassLoader0Node.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetClassLoader0Node.java Mon Nov 24 12:13:31 2014 +0100 @@ -56,7 +56,7 @@ public Node canonical(CanonicalizerTool tool) { ValueNode javaClass = getJavaClass(); if (javaClass.isConstant()) { - HotSpotObjectConstant c = (HotSpotObjectConstant) javaClass.asJavaConstant(); + HotSpotObjectConstant c = (HotSpotObjectConstant) javaClass.asConstant(); JavaConstant classLoader = c.getClassLoader(); if (classLoader != null) { return ConstantNode.forConstant(classLoader, tool.getMetaAccess());
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetComponentTypeNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetComponentTypeNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -55,7 +55,7 @@ public Node canonical(CanonicalizerTool tool) { ValueNode javaClass = getJavaClass(); if (javaClass.isConstant()) { - HotSpotObjectConstant c = (HotSpotObjectConstant) javaClass.asJavaConstant(); + HotSpotObjectConstant c = (HotSpotObjectConstant) javaClass.asConstant(); JavaConstant componentType = c.getComponentType(); if (componentType != null) { return ConstantNode.forConstant(componentType, tool.getMetaAccess());
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetModifiersNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetModifiersNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -55,7 +55,7 @@ ValueNode javaClass = getJavaClass(); if (javaClass.isConstant()) { ConstantReflectionProvider constantReflection = tool.getConstantReflection(); - ResolvedJavaType type = constantReflection.asJavaType(javaClass.asJavaConstant()); + ResolvedJavaType type = constantReflection.asJavaType(javaClass.asConstant()); if (type != null) { return ConstantNode.forInt(type.getModifiers()); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetSuperclassNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetSuperclassNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -55,7 +55,7 @@ public Node canonical(CanonicalizerTool tool) { ValueNode javaClass = getJavaClass(); if (javaClass.isConstant()) { - HotSpotObjectConstant c = (HotSpotObjectConstant) javaClass.asJavaConstant(); + HotSpotObjectConstant c = (HotSpotObjectConstant) javaClass.asConstant(); JavaConstant superclass = c.getSuperclass(); if (superclass != null) { return ConstantNode.forConstant(superclass, tool.getMetaAccess());
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsArrayNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsArrayNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -55,7 +55,7 @@ ValueNode javaClass = getJavaClass(); if (javaClass.isConstant()) { ConstantReflectionProvider constantReflection = tool.getConstantReflection(); - ResolvedJavaType type = constantReflection.asJavaType(javaClass.asJavaConstant()); + ResolvedJavaType type = constantReflection.asJavaType(javaClass.asConstant()); if (type != null) { return ConstantNode.forBoolean(type.isArray()); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInstanceNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInstanceNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -62,7 +62,7 @@ if (javaClass.isConstant()) { ValueNode object = getObject(); ConstantReflectionProvider constantReflection = tool.getConstantReflection(); - ResolvedJavaType type = constantReflection.asJavaType(javaClass.asJavaConstant()); + ResolvedJavaType type = constantReflection.asJavaType(javaClass.asConstant()); if (type != null) { if (type.isPrimitive()) { return ConstantNode.forBoolean(false);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInterfaceNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsInterfaceNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -55,7 +55,7 @@ ValueNode javaClass = getJavaClass(); if (javaClass.isConstant()) { ConstantReflectionProvider constantReflection = tool.getConstantReflection(); - ResolvedJavaType type = constantReflection.asJavaType(javaClass.asJavaConstant()); + ResolvedJavaType type = constantReflection.asJavaType(javaClass.asConstant()); if (type != null) { return ConstantNode.forBoolean(type.isInterface()); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsPrimitiveNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassIsPrimitiveNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -55,7 +55,7 @@ ValueNode javaClass = getJavaClass(); if (javaClass.isConstant()) { ConstantReflectionProvider constantReflection = tool.getConstantReflection(); - ResolvedJavaType type = constantReflection.asJavaType(javaClass.asJavaConstant()); + ResolvedJavaType type = constantReflection.asJavaType(javaClass.asConstant()); if (type != null) { return ConstantNode.forBoolean(type.isPrimitive()); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CompressionNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CompressionNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -159,7 +159,7 @@ @Override public ValueNode canonical(CanonicalizerTool tool, ValueNode forValue) { if (forValue.isConstant()) { - return ConstantNode.forConstant(stamp(), convert(forValue.asJavaConstant()), tool.getMetaAccess()); + return ConstantNode.forConstant(stamp(), convert(forValue.asConstant()), tool.getMetaAccess()); } else if (forValue instanceof CompressionNode) { CompressionNode other = (CompressionNode) forValue; if (op != other.op && encoding.equals(other.encoding)) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewArrayStubCall.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewArrayStubCall.java Mon Nov 24 12:13:31 2014 +0100 @@ -58,7 +58,7 @@ @Override public boolean inferStamp() { if (stamp() == defaultStamp && hub.isConstant()) { - updateStamp(StampFactory.exactNonNull(HotSpotResolvedObjectTypeImpl.fromMetaspaceKlass(hub.asJavaConstant()))); + updateStamp(StampFactory.exactNonNull(HotSpotResolvedObjectTypeImpl.fromMetaspaceKlass(hub.asConstant()))); return true; } return false;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewInstanceStubCall.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewInstanceStubCall.java Mon Nov 24 12:13:31 2014 +0100 @@ -56,7 +56,7 @@ @Override public boolean inferStamp() { if (stamp() == defaultStamp && hub.isConstant()) { - updateStamp(StampFactory.exactNonNull(HotSpotResolvedObjectTypeImpl.fromMetaspaceKlass(hub.asJavaConstant()))); + updateStamp(StampFactory.exactNonNull(HotSpotResolvedObjectTypeImpl.fromMetaspaceKlass(hub.asConstant()))); return true; } return false;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java Mon Nov 24 12:13:31 2014 +0100 @@ -60,7 +60,7 @@ @Override public boolean inferStamp() { if (stamp() == defaultStamp && hub.isConstant()) { - updateStamp(StampFactory.exactNonNull(HotSpotResolvedObjectTypeImpl.fromMetaspaceKlass(hub.asJavaConstant()))); + updateStamp(StampFactory.exactNonNull(HotSpotResolvedObjectTypeImpl.fromMetaspaceKlass(hub.asConstant()))); return true; } return false;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/AheadOfTimeVerificationPhase.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/AheadOfTimeVerificationPhase.java Mon Nov 24 12:13:31 2014 +0100 @@ -55,7 +55,7 @@ } private static boolean isNullReference(ConstantNode node) { - return isObject(node) && node.asJavaConstant().isNull(); + return isObject(node) && node.isNullConstant(); } private static boolean isDirectMethodHandle(ConstantNode node) {
--- a/graal/com.oracle.graal.java.decompiler/src/com/oracle/graal/java/decompiler/lines/DecompilerSyntaxLine.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.java.decompiler/src/com/oracle/graal/java/decompiler/lines/DecompilerSyntaxLine.java Mon Nov 24 12:13:31 2014 +0100 @@ -48,7 +48,7 @@ protected static String getStringRepresentation(Node node) { if (node instanceof ConstantNode) { - return ((ConstantNode) node).asJavaConstant().toValueString(); + return ((ConstantNode) node).asConstant().toValueString(); } else if (node instanceof ParameterNode) { return "param_" + ((ParameterNode) node).index(); } else {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -483,7 +483,7 @@ private static boolean valuesDistinct(ConstantReflectionProvider constantReflection, ValueNode a, ValueNode b) { if (a.isConstant() && b.isConstant()) { - Boolean equal = constantReflection.constantEquals(a.asJavaConstant(), b.asJavaConstant()); + Boolean equal = constantReflection.constantEquals(a.asConstant(), b.asConstant()); if (equal != null) { return !equal.booleanValue(); } @@ -696,8 +696,8 @@ List<AbstractEndNode> mergePredecessors = merge.cfgPredecessors().snapshot(); assert phi.valueCount() == merge.forwardEndCount(); - JavaConstant[] xs = constantValues(compare.getX(), merge, false); - JavaConstant[] ys = constantValues(compare.getY(), merge, false); + Constant[] xs = constantValues(compare.getX(), merge, false); + Constant[] ys = constantValues(compare.getY(), merge, false); if (xs == null || ys == null) { return false; } @@ -889,23 +889,23 @@ * @return null if {@code node} is neither a {@link ConstantNode} nor a {@link PhiNode} whose * input values are all constants */ - public static JavaConstant[] constantValues(ValueNode node, MergeNode merge, boolean allowNull) { + public static Constant[] constantValues(ValueNode node, MergeNode merge, boolean allowNull) { if (node.isConstant()) { JavaConstant[] result = new JavaConstant[merge.forwardEndCount()]; - Arrays.fill(result, node.asJavaConstant()); + Arrays.fill(result, node.asConstant()); return result; } if (node instanceof PhiNode) { PhiNode phi = (PhiNode) node; if (phi.merge() == merge && phi instanceof ValuePhiNode && phi.valueCount() == merge.forwardEndCount()) { - JavaConstant[] result = new JavaConstant[merge.forwardEndCount()]; + Constant[] result = new Constant[merge.forwardEndCount()]; int i = 0; for (ValueNode n : phi.values()) { if (!allowNull && !n.isConstant()) { return null; } - result[i++] = n.asJavaConstant(); + result[i++] = n.asConstant(); } return result; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -64,8 +64,8 @@ public abstract boolean unorderedIsTrue(); private ValueNode optimizeConditional(Constant constant, ConditionalNode conditionalNode, ConstantReflectionProvider constantReflection, Condition cond) { - JavaConstant trueConstant = conditionalNode.trueValue().asJavaConstant(); - JavaConstant falseConstant = conditionalNode.falseValue().asJavaConstant(); + Constant trueConstant = conditionalNode.trueValue().asConstant(); + Constant falseConstant = conditionalNode.falseValue().asConstant(); if (falseConstant != null && trueConstant != null && constantReflection != null) { boolean trueResult = cond.foldCondition(trueConstant, constant, constantReflection, unorderedIsTrue());
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -91,10 +91,10 @@ // this optimizes the case where a value that can only be 0 or 1 is materialized to 0 or 1 if (trueValue().isConstant() && falseValue().isConstant() && condition instanceof IntegerEqualsNode) { IntegerEqualsNode equals = (IntegerEqualsNode) condition; - if (equals.getY().isConstant() && equals.getY().asJavaConstant().equals(JavaConstant.INT_0) && equals.getX().stamp() instanceof IntegerStamp) { + if (equals.getY().isConstant() && equals.getY().asConstant().equals(JavaConstant.INT_0) && equals.getX().stamp() instanceof IntegerStamp) { IntegerStamp equalsXStamp = (IntegerStamp) equals.getX().stamp(); if (equalsXStamp.upMask() == 1) { - if (trueValue().asJavaConstant().equals(JavaConstant.INT_0) && falseValue().asJavaConstant().equals(JavaConstant.INT_1)) { + if (trueValue().asConstant().equals(JavaConstant.INT_0) && falseValue().asConstant().equals(JavaConstant.INT_1)) { return IntegerConvertNode.convertUnsigned(equals.getX(), stamp()); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ObjectEqualsNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ObjectEqualsNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -100,7 +100,7 @@ /* * One of the two objects has identity, the other doesn't. In code, this looks like * "Integer.valueOf(a) == new Integer(b)", which is always false. - * + * * In other words: an object created via valueOf can never be equal to one created * by new in the same compilation unit. */
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadMethodNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadMethodNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -81,7 +81,7 @@ } } if (hub.isConstant()) { - return resolveExactMethod(tool, tool.getConstantReflection().asJavaType(hub.asJavaConstant())); + return resolveExactMethod(tool, tool.getConstantReflection().asJavaType(hub.asConstant())); } return this;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastDynamicNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastDynamicNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -99,7 +99,7 @@ return forObject; } if (forHub.isConstant()) { - ResolvedJavaType t = tool.getConstantReflection().asJavaType(forHub.asJavaConstant()); + ResolvedJavaType t = tool.getConstantReflection().asJavaType(forHub.asConstant()); if (t != null) { return CheckCastNode.create(t, forObject, null, forStoreCheck); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewArrayNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewArrayNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -66,7 +66,7 @@ @Override public void simplify(SimplifierTool tool) { if (isAlive() && elementType.isConstant()) { - ResolvedJavaType javaType = tool.getConstantReflection().asJavaType(elementType.asJavaConstant()); + ResolvedJavaType javaType = tool.getConstantReflection().asJavaType(elementType.asConstant()); if (javaType != null && !javaType.equals(tool.getMetaAccess().lookupJavaType(void.class))) { ValueNode len = length(); NewArrayNode newArray = graph().add(NewArrayNode.create(javaType, len.isAlive() ? len : graph().addOrUniqueWithInputs(len), fillContents()));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewInstanceNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/DynamicNewInstanceNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -46,7 +46,7 @@ @Override public Node canonical(CanonicalizerTool tool) { if (clazz.isConstant()) { - ResolvedJavaType type = tool.getConstantReflection().asJavaType(clazz.asJavaConstant()); + ResolvedJavaType type = tool.getConstantReflection().asJavaType(clazz.asConstant()); if (type != null && type.isInitialized() && !type.isArray() && !type.isInterface() && !type.isPrimitive()) { return NewInstanceNode.create(type, fillContents()); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfDynamicNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfDynamicNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -63,7 +63,7 @@ public ValueNode canonical(CanonicalizerTool tool, ValueNode forObject, ValueNode forMirror) { if (forMirror.isConstant()) { - ResolvedJavaType t = tool.getConstantReflection().asJavaType(forMirror.asJavaConstant()); + ResolvedJavaType t = tool.getConstantReflection().asJavaType(forMirror.asConstant()); if (t != null) { if (t.isPrimitive()) { return LogicConstantNode.contradiction();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -74,7 +74,7 @@ @Override public void virtualize(VirtualizerTool tool) { - if (length().asJavaConstant() != null) { + if (length().asConstant() != null) { final int constantLength = length().asJavaConstant().asInt(); if (constantLength >= 0 && constantLength < tool.getMaximumEntryCount()) { ValueNode[] state = new ValueNode[constantLength];
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java Mon Nov 24 12:13:31 2014 +0100 @@ -52,12 +52,9 @@ private static final DebugMetric metricObjectEqualsRemoved = Debug.metric("ObjectEqualsRemoved"); private static final DebugMetric metricGuardsRemoved = Debug.metric("GuardsRemoved"); - private final MetaAccessProvider metaAccess; - private StructuredGraph graph; - public ConditionalEliminationPhase(MetaAccessProvider metaAccess) { - this.metaAccess = metaAccess; + public ConditionalEliminationPhase() { } @Override @@ -702,7 +699,7 @@ PiNode piNode; if (isNull) { ConstantNode nullObject = ConstantNode.defaultForKind(Kind.Object, graph); - piNode = graph.unique(PiNode.create(nullObject, StampFactory.forConstant(nullObject.asJavaConstant(), metaAccess), replacementAnchor.asNode())); + piNode = graph.unique(PiNode.create(nullObject, nullObject.stamp(), replacementAnchor.asNode())); } else { piNode = graph.unique(PiNode.create(object, StampFactory.declaredTrusted(type, nonNull), replacementAnchor.asNode())); }
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConvertDeoptimizeToGuardPhase.java Mon Nov 24 12:13:31 2014 +0100 @@ -75,11 +75,11 @@ CompareNode compare = (CompareNode) fixedGuard.condition(); List<AbstractEndNode> mergePredecessors = merge.cfgPredecessors().snapshot(); - JavaConstant[] xs = IfNode.constantValues(compare.getX(), merge, true); + Constant[] xs = IfNode.constantValues(compare.getX(), merge, true); if (xs == null) { continue; } - JavaConstant[] ys = IfNode.constantValues(compare.getY(), merge, true); + Constant[] ys = IfNode.constantValues(compare.getY(), merge, true); if (ys == null) { continue; } @@ -94,7 +94,7 @@ if (ys[i] == null) { continue; } - if (xs[i].getKind() != Kind.Object && ys[i].getKind() != Kind.Object && + if (xs[i] instanceof PrimitiveConstant && ys[i] instanceof PrimitiveConstant && compare.condition().foldCondition(xs[i], ys[i], null, compare.unorderedIsTrue()) == fixedGuard.isNegated()) { visitDeoptBegin(BeginNode.prevBegin(mergePredecessor), fixedGuard.getAction(), fixedGuard.getReason(), graph); }
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IterativeConditionalEliminationPhase.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/IterativeConditionalEliminationPhase.java Mon Nov 24 12:13:31 2014 +0100 @@ -45,7 +45,7 @@ @Override protected void run(StructuredGraph graph, PhaseContext context) { - ConditionalEliminationPhase eliminate = new ConditionalEliminationPhase(context.getMetaAccess()); + ConditionalEliminationPhase eliminate = new ConditionalEliminationPhase(); HashSetNodeEventListener listener = new HashSetNodeEventListener().exclude(NODE_ADDED); int count = 0; while (true) {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java Mon Nov 24 12:13:31 2014 +0100 @@ -100,7 +100,7 @@ for (AbstractEndNode end : merge.cfgPredecessors().snapshot()) { ValueNode thisReason = reasons != null ? reasons.get(index) : reason; ValueNode thisSpeculation = speculations != null ? speculations.get(index++) : speculation; - if (!thisReason.isConstant() || !thisSpeculation.isConstant() || !thisSpeculation.asJavaConstant().equals(JavaConstant.NULL_OBJECT)) { + if (!thisReason.isConstant() || !thisSpeculation.isConstant() || !thisSpeculation.asConstant().equals(JavaConstant.NULL_OBJECT)) { continue; } DeoptimizationReason deoptimizationReason = metaAccessProvider.decodeDeoptReason(thisReason.asJavaConstant());
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningUtil.java Mon Nov 24 12:13:31 2014 +0100 @@ -211,7 +211,7 @@ return "the invoke is marked to be not used for inlining"; } ValueNode receiver = callTarget.receiver(); - if (receiver != null && receiver.isConstant() && receiver.asJavaConstant().isNull()) { + if (receiver != null && receiver.isConstant() && receiver.isNullConstant()) { return "receiver is null"; } return null;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/InlineableGraph.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/InlineableGraph.java Mon Nov 24 12:13:31 2014 +0100 @@ -198,10 +198,10 @@ if (param.usages().isNotEmpty()) { ValueNode arg = args.get(param.index()); if (arg.isConstant()) { - JavaConstant constant = arg.asJavaConstant(); + Constant constant = arg.asConstant(); parameterUsages = trackParameterUsages(param, parameterUsages); // collect param usages before replacing the param - graph.replaceFloating(param, ConstantNode.forConstant(constant, context.getMetaAccess(), graph)); + graph.replaceFloating(param, ConstantNode.forConstant(arg.stamp(), constant, context.getMetaAccess(), graph)); // param-node gone, leaving a gap in the sequence given by param.index() } else { Stamp impro = improvedStamp(arg, param);
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyUsageWithEquals.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/verify/VerifyUsageWithEquals.java Mon Nov 24 12:13:31 2014 +0100 @@ -56,7 +56,7 @@ } private static boolean isNullConstant(ValueNode node) { - return node.isConstant() && node.asJavaConstant().isNull(); + return node.isConstant() && node.isNullConstant(); } private boolean checkUsage(ValueNode x, ValueNode y, MetaAccessProvider metaAccess) {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/DefaultJavaLoweringProvider.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/DefaultJavaLoweringProvider.java Mon Nov 24 12:13:31 2014 +0100 @@ -402,7 +402,7 @@ ValueNode value = commit.getValues().get(valuePos); assert value instanceof VirtualObjectNode; ValueNode allocValue = allocations[commit.getVirtualObjects().indexOf(value)]; - if (!(allocValue.isConstant() && allocValue.asJavaConstant().isDefaultForKind())) { + if (!(allocValue.isConstant() && allocValue.asConstant().isDefaultForKind())) { assert virtual.entryKind(i) == Kind.Object && allocValue.getKind() == Kind.Object; LocationNode location; BarrierType barrierType;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/InstanceOfSnippetsTemplates.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/InstanceOfSnippetsTemplates.java Mon Nov 24 12:13:31 2014 +0100 @@ -139,7 +139,7 @@ assert isInitialized(); if (result.isConstant()) { assert testValue.isConstant(); - return LogicConstantNode.forBoolean(result.asJavaConstant().equals(testValue.asJavaConstant()), result.graph()); + return LogicConstantNode.forBoolean(result.asConstant().equals(testValue.asConstant()), result.graph()); } if (condition == null || condition.getY() != testValue) { // Re-use previously generated condition if the trueValue for the test is the same
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java Mon Nov 24 12:13:31 2014 +0100 @@ -169,22 +169,23 @@ return null; } ConstantNode constantNode = (ConstantNode) argument; - JavaConstant constant = constantNode.asJavaConstant(); + Constant constant = constantNode.asConstant(); ResolvedJavaType type = providers.getConstantReflection().asJavaType(constant); if (type != null) { reflectionCallArguments[i] = snippetReflection.forObject(type); parameterTypes[i] = providers.getMetaAccess().lookupJavaType(ResolvedJavaType.class); } else { + JavaConstant javaConstant = (JavaConstant) constant; if (parameterTypes[i].getKind() == Kind.Boolean) { - reflectionCallArguments[i] = snippetReflection.forObject(Boolean.valueOf(constant.asInt() != 0)); + reflectionCallArguments[i] = snippetReflection.forObject(Boolean.valueOf(javaConstant.asInt() != 0)); } else if (parameterTypes[i].getKind() == Kind.Byte) { - reflectionCallArguments[i] = snippetReflection.forObject(Byte.valueOf((byte) constant.asInt())); + reflectionCallArguments[i] = snippetReflection.forObject(Byte.valueOf((byte) javaConstant.asInt())); } else if (parameterTypes[i].getKind() == Kind.Short) { - reflectionCallArguments[i] = snippetReflection.forObject(Short.valueOf((short) constant.asInt())); + reflectionCallArguments[i] = snippetReflection.forObject(Short.valueOf((short) javaConstant.asInt())); } else if (parameterTypes[i].getKind() == Kind.Char) { - reflectionCallArguments[i] = snippetReflection.forObject(Character.valueOf((char) constant.asInt())); + reflectionCallArguments[i] = snippetReflection.forObject(Character.valueOf((char) javaConstant.asInt())); } else { - reflectionCallArguments[i] = constant; + reflectionCallArguments[i] = javaConstant; } } } else {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DeferredPiNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DeferredPiNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -61,7 +61,7 @@ @Override public Node canonical(CanonicalizerTool tool) { if (type.isConstant()) { - ResolvedJavaType javaType = tool.getConstantReflection().asJavaType(type.asJavaConstant()); + ResolvedJavaType javaType = tool.getConstantReflection().asJavaType(type.asConstant()); ObjectStamp objectStamp = (ObjectStamp) stamp(); return PiNode.create(object, javaType, objectStamp.isExactType(), objectStamp.nonNull()); }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Mon Nov 24 12:13:31 2014 +0100 @@ -294,9 +294,9 @@ for (ParameterNode param : graphCopy.getNodes(ParameterNode.class).snapshot()) { ValueNode arg = arguments.get(param.index()); if (arg.isConstant()) { - JavaConstant constant = arg.asJavaConstant(); + Constant constant = arg.asConstant(); param.usages().snapshotTo(modifiedNodes); - param.replaceAndDelete(ConstantNode.forConstant(constant, phaseContext.getMetaAccess(), graphCopy)); + param.replaceAndDelete(ConstantNode.forConstant(arg.stamp(), constant, phaseContext.getMetaAccess(), graphCopy)); } else { ValueNode length = GraphUtil.arrayLength(arg); if (length != null && length.isConstant()) {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCacheImpl.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCacheImpl.java Mon Nov 24 12:13:31 2014 +0100 @@ -177,7 +177,7 @@ partialEscapePhase.apply(graph, phaseContext); // Conditional elimination. - ConditionalEliminationPhase conditionalEliminationPhase = new ConditionalEliminationPhase(phaseContext.getMetaAccess()); + ConditionalEliminationPhase conditionalEliminationPhase = new ConditionalEliminationPhase(); conditionalEliminationPhase.apply(graph); // Canonicalize / constant propagate.
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleConstantReflectionProvider.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleConstantReflectionProvider.java Mon Nov 24 12:13:31 2014 +0100 @@ -100,7 +100,7 @@ return graalConstantReflection.forString(value); } - public ResolvedJavaType asJavaType(JavaConstant constant) { + public ResolvedJavaType asJavaType(Constant constant) { return graalConstantReflection.asJavaType(constant); }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/BailoutNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/BailoutNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -54,7 +54,7 @@ @Override public Node canonical(CanonicalizerTool tool) { if (getMessage().isConstant()) { - throw new BailoutException(getMessage().asJavaConstant().toValueString()); + throw new BailoutException(getMessage().asConstant().toValueString()); } return this; }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeLoadFinalNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeLoadFinalNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -95,7 +95,7 @@ public void lower(LoweringTool tool) { CompareNode compare = CompareNode.createCompareNode(graph(), Condition.EQ, condition, ConstantNode.forBoolean(true, graph())); LocationIdentity locationIdentity; - if (!location.isConstant() || location.asJavaConstant().isNull()) { + if (!location.isConstant() || location.isNullConstant()) { locationIdentity = LocationIdentity.ANY_LOCATION; } else { locationIdentity = ObjectLocationIdentity.create(location.asJavaConstant());
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeLoadMacroNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeLoadMacroNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -64,7 +64,7 @@ ValueNode offsetArgument = arguments.get(OFFSET_ARGUMENT_INDEX); ValueNode conditionArgument = arguments.get(CONDITION_ARGUMENT_INDEX); LocationIdentity locationIdentity; - if (locationArgument.asJavaConstant().isNull()) { + if (locationArgument.isNullConstant()) { locationIdentity = LocationIdentity.ANY_LOCATION; } else { locationIdentity = ObjectLocationIdentity.create(locationArgument.asJavaConstant());
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeStoreMacroNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeStoreMacroNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -60,7 +60,7 @@ ValueNode offsetArgument = arguments.get(OFFSET_ARGUMENT_INDEX); ValueNode valueArgument = arguments.get(VALUE_ARGUMENT_INDEX); LocationIdentity locationIdentity; - if (locationArgument.asJavaConstant().isNull()) { + if (locationArgument.isNullConstant()) { locationIdentity = LocationIdentity.ANY_LOCATION; } else { locationIdentity = ObjectLocationIdentity.create(locationArgument.asJavaConstant());
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/UnsafeTypeCastMacroNode.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/UnsafeTypeCastMacroNode.java Mon Nov 24 12:13:31 2014 +0100 @@ -61,7 +61,7 @@ if (classArgument.isConstant() && nonNullArgument.isConstant()) { ValueNode objectArgument = arguments.get(OBJECT_ARGUMENT_INDEX); ValueNode conditionArgument = arguments.get(CONDITION_ARGUMENT_INDEX); - ResolvedJavaType lookupJavaType = tool.getConstantReflection().asJavaType(classArgument.asJavaConstant()); + ResolvedJavaType lookupJavaType = tool.getConstantReflection().asJavaType(classArgument.asConstant()); tool.addToWorkList(usages()); if (lookupJavaType == null) { replaceAtUsages(objectArgument);
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java Sun Nov 23 16:09:26 2014 -0800 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java Mon Nov 24 12:13:31 2014 +0100 @@ -435,7 +435,7 @@ Kind valueKind = value.getKind(); if (valueKind != twoSlotKinds[valueIndex]) { ValueNode nextValue = objStates[i].getEntry(valueIndex + 1); - if (value.isConstant() && value.asJavaConstant().equals(JavaConstant.INT_0) && nextValue.isConstant() && nextValue.asJavaConstant().equals(JavaConstant.INT_0)) { + if (value.isConstant() && value.asConstant().equals(JavaConstant.INT_0) && nextValue.isConstant() && nextValue.asConstant().equals(JavaConstant.INT_0)) { // rewrite to a zero constant of the larger kind objStates[i].setEntry(valueIndex, ConstantNode.defaultForKind(twoSlotKinds[valueIndex], merge.graph())); objStates[i].setEntry(valueIndex + 1, ConstantNode.forConstant(JavaConstant.forIllegal(), tool.getMetaAccessProvider(), merge.graph()));