# HG changeset patch # User Thomas Wuerthinger # Date 1376664599 -7200 # Node ID 41c5234a3f274e624214016c86d0b7015d315f19 # Parent 3384b4cf035705f59e09f0652ae14368e142952c# Parent 602a25aade245468eb60c4f52996bf552e530f1b Merge. diff -r 602a25aade24 -r 41c5234a3f27 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Fri Aug 16 14:47:05 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Fri Aug 16 16:49:59 2013 +0200 @@ -667,11 +667,6 @@ assert loadHub.kind() == wordKind; ValueNode object = loadHub.object(); GuardingNode guard = loadHub.getGuard(); - // A hub read must not float outside its block otherwise - // it may float above an explicit null check on its object. - if (guard == null) { - guard = AbstractBeginNode.prevBegin(tool.lastFixedNode()); - } FloatingReadNode hub = createReadHub(graph, wordKind, object, guard); graph.replaceFloating(loadHub, hub); } else if (n instanceof LoadMethodNode) { diff -r 602a25aade24 -r 41c5234a3f27 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java Fri Aug 16 14:47:05 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java Fri Aug 16 16:49:59 2013 +0200 @@ -59,7 +59,9 @@ @Override public void lower(LoweringTool tool, LoweringType loweringType) { - tool.getRuntime().lower(this, tool); + if (loweringType == LoweringType.AFTER_GUARDS) { + tool.getRuntime().lower(this, tool); + } } @Override diff -r 602a25aade24 -r 41c5234a3f27 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Fri Aug 16 14:47:05 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Fri Aug 16 16:49:59 2013 +0200 @@ -32,21 +32,12 @@ */ public class UnsafeCastNode extends PiNode implements Canonicalizable, LIRLowerable { - private final Object customType; - public UnsafeCastNode(ValueNode object, Stamp stamp) { super(object, stamp); - customType = null; } public UnsafeCastNode(ValueNode object, Stamp stamp, GuardingNode anchor) { super(object, stamp, anchor); - customType = null; - } - - public UnsafeCastNode(ValueNode object, Stamp stamp, GuardingNode anchor, Object customType) { - super(object, stamp, anchor); - this.customType = customType; } public UnsafeCastNode(ValueNode object, Stamp stamp, ValueNode anchor) { @@ -57,10 +48,6 @@ this(object, toType.getKind() == Kind.Object ? StampFactory.object(toType, exactType, nonNull || ObjectStamp.isObjectNonNull(object.stamp())) : StampFactory.forKind(toType.getKind())); } - public Object getCustomType() { - return customType; - } - @Override public boolean inferStamp() { if (stamp() == StampFactory.forNodeIntrinsic()) { diff -r 602a25aade24 -r 41c5234a3f27 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/TypeCastMacroNode.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/TypeCastMacroNode.java Fri Aug 16 14:47:05 2013 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/TypeCastMacroNode.java Fri Aug 16 16:49:59 2013 +0200 @@ -24,22 +24,21 @@ import com.oracle.graal.api.meta.*; import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.spi.*; -import com.oracle.graal.nodes.type.*; import com.oracle.graal.truffle.nodes.asserts.*; import com.oracle.truffle.api.*; /** * Macro node for method {@link CompilerDirectives#unsafeCast(Object, Class)} and - * {@link CompilerDirectives#unsafeCast(Object, Class, Object)}. + * {@link CompilerDirectives#unsafeCast(Object, Class, Object, Object)}. */ public class TypeCastMacroNode extends NeverPartOfCompilationNode implements Canonicalizable { - private static final int ARGUMENT_COUNT = 3; + private static final int ARGUMENT_COUNT = 4; private static final int OBJECT_ARGUMENT_INDEX = 0; private static final int CLASS_ARGUMENT_INDEX = 1; - private static final int CUSTOM_TYPE_ARGUMENT_INDEX = 2; + private static final int RECEIVER_ARGUMENT_INDEX = 2; + private static final int CUSTOM_TYPE_ARGUMENT_INDEX = 3; public TypeCastMacroNode(Invoke invoke) { super(invoke, "The class of the unsafe cast could not be reduced to a compile time constant."); @@ -53,13 +52,10 @@ if (classArgument.isConstant() && customTypeArgument.isConstant()) { Class c = (Class) classArgument.asConstant().asObject(); ResolvedJavaType lookupJavaType = tool.runtime().lookupJavaType(c); - Stamp s = StampFactory.declaredNonNull(lookupJavaType); - ValueAnchorNode valueAnchorNode = graph().add(new ValueAnchorNode()); ValueNode objectArgument = arguments.get(OBJECT_ARGUMENT_INDEX); + ValueNode receiverArgument = arguments.get(RECEIVER_ARGUMENT_INDEX); Object customType = customTypeArgument.asConstant().asObject(); - UnsafeCastNode unsafeCast = graph().unique(new UnsafeCastNode(objectArgument, s, valueAnchorNode, customType)); - this.replaceAtUsages(unsafeCast); - return valueAnchorNode; + return graph().add(new TypeCastNode(objectArgument, lookupJavaType, receiverArgument, customType)); } return this; } diff -r 602a25aade24 -r 41c5234a3f27 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/TypeCastNode.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/TypeCastNode.java Fri Aug 16 16:49:59 2013 +0200 @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.graal.truffle.nodes.typesystem; + +import com.oracle.graal.api.meta.*; +import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.nodes.spi.*; +import com.oracle.graal.nodes.type.*; + +public final class TypeCastNode extends FixedWithNextNode implements Lowerable, com.oracle.graal.graph.Node.IterableNodeType, ValueProxy { + + @Input private ValueNode receiver; + @Input private ValueNode object; + private final Object customType; + private final ResolvedJavaType castTarget; + + public TypeCastNode(ValueNode object, ResolvedJavaType castTarget, ValueNode receiver, Object customType) { + super(StampFactory.declaredNonNull(castTarget)); + this.receiver = receiver; + this.object = object; + this.customType = customType; + this.castTarget = castTarget; + } + + public ValueNode getObject() { + return object; + } + + public ValueNode getReceiver() { + return receiver; + } + + public ResolvedJavaType getCastTarget() { + return castTarget; + } + + public Object getCustomType() { + return customType; + } + + public void lower(LoweringTool tool, LoweringType loweringType) { + if (loweringType == LoweringType.BEFORE_GUARDS) { + ValueAnchorNode valueAnchorNode = graph().add(new ValueAnchorNode()); + UnsafeCastNode unsafeCast = graph().unique(new UnsafeCastNode(object, this.stamp(), (GuardingNode) valueAnchorNode)); + this.replaceAtUsages(unsafeCast); + graph().replaceFixedWithFixed(this, valueAnchorNode); + } + } + + public ValueNode getOriginalValue() { + return object; + } +} diff -r 602a25aade24 -r 41c5234a3f27 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/CompilerDirectivesSubstitutions.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/CompilerDirectivesSubstitutions.java Fri Aug 16 14:47:05 2013 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/CompilerDirectivesSubstitutions.java Fri Aug 16 16:49:59 2013 +0200 @@ -65,7 +65,7 @@ public static native void bailout(String reason); @MacroSubstitution(macro = TypeCastMacroNode.class, isStatic = true) - public static native Object unsafeCast(Object value, Class clazz, Object customType); + public static native Object unsafeCast(Object value, Class clazz, Object receiver, Object customType); @MacroSubstitution(macro = CustomTypeCheckMacroNode.class, isStatic = true) public static native boolean customTypeCheck(boolean condition, Object value, Object customType); diff -r 602a25aade24 -r 41c5234a3f27 graal/com.oracle.truffle.api/src/com/oracle/truffle/api/CompilerDirectives.java --- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/CompilerDirectives.java Fri Aug 16 14:47:05 2013 +0200 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/CompilerDirectives.java Fri Aug 16 16:49:59 2013 +0200 @@ -147,7 +147,7 @@ */ @Unsafe public static T unsafeCast(Object value, Class clazz) { - return unsafeCast(value, clazz, null); + return unsafeCast(value, clazz, null, null); } /** @@ -168,12 +168,13 @@ * * @param value the value that is known to have the specified type * @param clazz the specified type of the value + * @param receiver the receiver on which the custom type is tested * @param customType the custom type that if present on a value makes this unsafe cast safe * @return the value */ @SuppressWarnings("unchecked") @Unsafe - public static T unsafeCast(Object value, Class clazz, Object customType) { + public static T unsafeCast(Object value, Class clazz, Object receiver, Object customType) { return (T) value; }