# HG changeset patch # User Doug Simon # Date 1376902180 -7200 # Node ID d46159285f977e9dfd73b1742a0a201ae5807005 # Parent 231c8a83cf41ef056e89aabcfa68dd24e4d48594 removed Stamp parameter of BeginNode.anchor node intrinsic diff -r 231c8a83cf41 -r d46159285f97 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CheckCastDynamicSnippets.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CheckCastDynamicSnippets.java Sat Aug 17 17:52:21 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CheckCastDynamicSnippets.java Mon Aug 19 10:49:40 2013 +0200 @@ -52,13 +52,13 @@ if (probability(NOT_FREQUENT_PROBABILITY, object == null)) { isNull.inc(); } else { - BeginNode anchorNode = BeginNode.anchor(StampFactory.forNodeIntrinsic()); + BeginNode anchorNode = BeginNode.anchor(); Word objectHub = loadHubIntrinsic(object, getWordKind(), anchorNode); if (!checkUnknownSubType(hub, objectHub)) { DeoptimizeNode.deopt(InvalidateReprofile, ClassCastException); } } - BeginNode anchorNode = BeginNode.anchor(StampFactory.forNodeIntrinsic()); + BeginNode anchorNode = BeginNode.anchor(); return unsafeCast(verifyOop(object), StampFactory.forNodeIntrinsic(), anchorNode); } diff -r 231c8a83cf41 -r d46159285f97 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/InstanceOfSnippets.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/InstanceOfSnippets.java Sat Aug 17 17:52:21 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/InstanceOfSnippets.java Mon Aug 19 10:49:40 2013 +0200 @@ -89,7 +89,7 @@ } return falseValue; } - BeginNode anchorNode = BeginNode.anchor(StampFactory.forNodeIntrinsic()); + BeginNode anchorNode = BeginNode.anchor(); Word objectHub = loadHubIntrinsic(object, getWordKind(), anchorNode); // if we get an exact match: succeed immediately ExplodeLoopNode.explodeLoop(); @@ -118,7 +118,7 @@ isNull.inc(); return falseValue; } - BeginNode anchorNode = BeginNode.anchor(StampFactory.forNodeIntrinsic()); + BeginNode anchorNode = BeginNode.anchor(); Word objectHub = loadHubIntrinsic(object, getWordKind(), anchorNode); if (probability(LIKELY_PROBABILITY, objectHub.notEqual(exactHub))) { exactMiss.inc(); @@ -137,7 +137,7 @@ isNull.inc(); return falseValue; } - BeginNode anchorNode = BeginNode.anchor(StampFactory.forNodeIntrinsic()); + BeginNode anchorNode = BeginNode.anchor(); Word objectHub = loadHubIntrinsic(object, getWordKind(), anchorNode); if (probability(NOT_LIKELY_PROBABILITY, objectHub.readWord(superCheckOffset, LocationIdentity.FINAL_LOCATION).notEqual(hub))) { displayMiss.inc(); @@ -156,7 +156,7 @@ isNull.inc(); return falseValue; } - BeginNode anchorNode = BeginNode.anchor(StampFactory.forNodeIntrinsic()); + BeginNode anchorNode = BeginNode.anchor(); Word objectHub = loadHubIntrinsic(object, getWordKind(), anchorNode); // if we get an exact match: succeed immediately ExplodeLoopNode.explodeLoop(); @@ -183,7 +183,7 @@ isNull.inc(); return falseValue; } - BeginNode anchorNode = BeginNode.anchor(StampFactory.forNodeIntrinsic()); + BeginNode anchorNode = BeginNode.anchor(); Word hub = loadWordFromObject(mirror, klassOffset()); Word objectHub = loadHubIntrinsic(object, getWordKind(), anchorNode); if (!checkUnknownSubType(hub, objectHub)) { diff -r 231c8a83cf41 -r d46159285f97 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/MonitorSnippets.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/MonitorSnippets.java Sat Aug 17 17:52:21 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/MonitorSnippets.java Mon Aug 19 10:49:40 2013 +0200 @@ -83,7 +83,7 @@ if (object == null) { DeoptimizeNode.deopt(DeoptimizationAction.InvalidateReprofile, DeoptimizationReason.NullCheckException); } - BeginNode anchorNode = BeginNode.anchor(StampFactory.forNodeIntrinsic()); + BeginNode anchorNode = BeginNode.anchor(); // Load the mark word - this includes a null-check on object final Word mark = loadWordFromObject(object, markOffset()); diff -r 231c8a83cf41 -r d46159285f97 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java Sat Aug 17 17:52:21 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/NewObjectSnippets.java Mon Aug 19 10:49:40 2013 +0200 @@ -87,7 +87,7 @@ new_stub.inc(); result = NewInstanceStubCall.call(hub); } - BeginNode anchorNode = BeginNode.anchor(StampFactory.forNodeIntrinsic()); + BeginNode anchorNode = BeginNode.anchor(); return unsafeCast(verifyOop(result), StampFactory.forNodeIntrinsic(), anchorNode); } @@ -121,7 +121,7 @@ newarray_stub.inc(); result = NewArrayStubCall.call(hub, length); } - BeginNode anchorNode = BeginNode.anchor(StampFactory.forNodeIntrinsic()); + BeginNode anchorNode = BeginNode.anchor(); return unsafeArrayCast(verifyOop(result), length, StampFactory.forNodeIntrinsic(), anchorNode); } diff -r 231c8a83cf41 -r d46159285f97 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/StubUtil.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/StubUtil.java Sat Aug 17 17:52:21 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/StubUtil.java Mon Aug 19 10:49:40 2013 +0200 @@ -37,7 +37,6 @@ import com.oracle.graal.graph.Node.NodeIntrinsic; import com.oracle.graal.hotspot.nodes.*; import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.type.*; import com.oracle.graal.replacements.*; import com.oracle.graal.replacements.Snippet.Fold; import com.oracle.graal.word.*; @@ -219,7 +218,7 @@ Pointer oop = Word.fromObject(object); if (object != null) { - BeginNode anchorNode = BeginNode.anchor(StampFactory.forNodeIntrinsic()); + BeginNode anchorNode = BeginNode.anchor(); // make sure object is 'reasonable' if (!oop.and(unsigned(verifyOopMask())).equal(unsigned(verifyOopBits()))) { fatal("oop not in heap: %p", oop.rawValue()); diff -r 231c8a83cf41 -r d46159285f97 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginNode.java Sat Aug 17 17:52:21 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginNode.java Mon Aug 19 10:49:40 2013 +0200 @@ -30,10 +30,6 @@ super(StampFactory.dependency()); } - protected BeginNode(Stamp stamp) { - super(stamp); - } - @NodeIntrinsic - public static native BeginNode anchor(@ConstantNodeParameter Stamp stamp); + public static native BeginNode anchor(); }