Mercurial > hg > graal-compiler
changeset 9089:5ab06146e985
Rename "node()" methods in interfaces to "asNode"
Remove erroneous javadoc in CyclicMaterializeStoreNode
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PartialEscapeAnalysisTest.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ea/PartialEscapeAnalysisTest.java Fri Apr 12 14:15:59 2013 +0200 @@ -157,7 +157,7 @@ StructuredGraph graph = parse(snippet); new ComputeProbabilityPhase().apply(graph); for (Invoke n : graph.getInvokes()) { - n.node().setProbability(100000); + n.asNode().setProbability(100000); } Assumptions assumptions = new Assumptions(false); new InliningPhase(runtime(), null, replacements, assumptions, null, getDefaultPhasePlan(), OptimisticOptimizations.ALL).apply(graph);
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Fri Apr 12 14:15:59 2013 +0200 @@ -599,7 +599,7 @@ @Override public void emitInvoke(Invoke x) { AbstractCallTargetNode callTarget = (AbstractCallTargetNode) x.callTarget(); - CallingConvention cc = frameMap.registerConfig.getCallingConvention(callTarget.callType(), x.node().stamp().javaType(runtime), callTarget.signature(), target(), false); + CallingConvention cc = frameMap.registerConfig.getCallingConvention(callTarget.callType(), x.asNode().stamp().javaType(runtime), callTarget.signature(), target(), false); frameMap.callsMethod(cc); Value[] parameters = visitInvokeArguments(cc, callTarget.arguments()); @@ -620,7 +620,7 @@ } if (isLegal(result)) { - setResult(x.node(), emitMove(result)); + setResult(x.asNode(), emitMove(result)); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Fri Apr 12 14:15:59 2013 +0200 @@ -505,7 +505,7 @@ NodeInputList<ValueNode> parameters = callTarget.arguments(); ValueNode receiver = parameters.size() <= 0 ? null : parameters.get(0); if (!callTarget.isStatic() && receiver.kind() == Kind.Object && !receiver.objectStamp().nonNull()) { - invoke.node().dependencies().add(tool.createNullCheckGuard(receiver)); + invoke.asNode().dependencies().add(tool.createNullCheckGuard(receiver)); } JavaType[] signature = MetaUtil.signatureToTypes(callTarget.targetMethod().getSignature(), callTarget.isStatic() ? null : callTarget.targetMethod().getDeclaringClass()); @@ -525,10 +525,10 @@ ReadNode compiledEntry = graph.add(new ReadNode(metaspaceMethod, LocationNode.create(LocationNode.ANY_LOCATION, wordKind, config.methodCompiledEntryOffset, graph), StampFactory.forKind(wordKind()))); - loweredCallTarget = graph.add(new HotSpotIndirectCallTargetNode(metaspaceMethod, compiledEntry, parameters, invoke.node().stamp(), signature, callTarget.targetMethod(), + loweredCallTarget = graph.add(new HotSpotIndirectCallTargetNode(metaspaceMethod, compiledEntry, parameters, invoke.asNode().stamp(), signature, callTarget.targetMethod(), CallingConvention.Type.JavaCall)); - graph.addBeforeFixed(invoke.node(), hub); + graph.addBeforeFixed(invoke.asNode(), hub); graph.addAfterFixed(hub, metaspaceMethod); graph.addAfterFixed(metaspaceMethod, compiledEntry); } @@ -536,7 +536,7 @@ } if (loweredCallTarget == null) { - loweredCallTarget = graph.add(new HotSpotDirectCallTargetNode(parameters, invoke.node().stamp(), signature, callTarget.targetMethod(), CallingConvention.Type.JavaCall, + loweredCallTarget = graph.add(new HotSpotDirectCallTargetNode(parameters, invoke.asNode().stamp(), signature, callTarget.targetMethod(), CallingConvention.Type.JavaCall, callTarget.invokeKind())); } callTarget.replaceAndDelete(loweredCallTarget);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/Invoke.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/Invoke.java Fri Apr 12 14:15:59 2013 +0200 @@ -41,7 +41,7 @@ int bci(); - FixedNode node(); + FixedNode asNode(); FrameState stateDuring();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Fri Apr 12 14:15:59 2013 +0200 @@ -140,7 +140,7 @@ } @Override - public FixedNode node() { + public FixedNode asNode() { return this; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Fri Apr 12 14:15:59 2013 +0200 @@ -126,7 +126,7 @@ } @Override - public FixedNode node() { + public FixedNode asNode() { return this; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/Access.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/Access.java Fri Apr 12 14:15:59 2013 +0200 @@ -33,5 +33,5 @@ void setNullCheck(boolean check); - Node node(); + Node asNode(); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AccessNode.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AccessNode.java Fri Apr 12 14:15:59 2013 +0200 @@ -79,7 +79,7 @@ } @Override - public Node node() { + public Node asNode() { return this; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java Fri Apr 12 14:15:59 2013 +0200 @@ -76,7 +76,7 @@ } @Override - public Node node() { + public Node asNode() { return this; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java Fri Apr 12 14:15:59 2013 +0200 @@ -202,7 +202,7 @@ while (n != null) { if (n instanceof MethodCallTargetNode) { elements.add(((MethodCallTargetNode) n).targetMethod().asStackTraceElement(-1)); - n = ((MethodCallTargetNode) n).invoke().node(); + n = ((MethodCallTargetNode) n).invoke().asNode(); } if (n instanceof StateSplit) {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/GuardLoweringPhase.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/GuardLoweringPhase.java Fri Apr 12 14:15:59 2013 +0200 @@ -114,12 +114,12 @@ Access fixedAccess = access; if (access instanceof FloatingAccessNode) { fixedAccess = ((FloatingAccessNode) access).asFixedNode(); - replaceCurrent((FixedWithNextNode) fixedAccess.node()); + replaceCurrent((FixedWithNextNode) fixedAccess.asNode()); } assert fixedAccess instanceof FixedNode; fixedAccess.setNullCheck(true); LogicNode condition = guard.condition(); - guard.replaceAndDelete(fixedAccess.node()); + guard.replaceAndDelete(fixedAccess.asNode()); if (condition.usages().isEmpty()) { GraphUtil.killWithUnusedFloatingInputs(condition); }
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java Fri Apr 12 14:15:59 2013 +0200 @@ -111,7 +111,7 @@ if (isWorthInlining) { int mark = graph.getMark(); try { - List<Node> invokeUsages = candidate.invoke().node().usages().snapshot(); + List<Node> invokeUsages = candidate.invoke().asNode().usages().snapshot(); candidate.inline(graph, runtime, replacements, this, assumptions); Debug.dump(graph, "after %s", candidate); Iterable<Node> newNodes = graph.getNewNodes(mark); @@ -278,7 +278,7 @@ private static int countInvokeUsages(InlineInfo info) { // inlining calls with lots of usages simplifies the caller int usages = 0; - for (Node n : info.invoke().node().usages()) { + for (Node n : info.invoke().asNode().usages()) { if (!(n instanceof FrameState)) { usages++; }
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java Fri Apr 12 14:15:59 2013 +0200 @@ -258,9 +258,9 @@ try { macroNode = macroNodeClass.getConstructor(Invoke.class).newInstance(invoke); } catch (ReflectiveOperationException | IllegalArgumentException | SecurityException e) { - throw new GraalInternalError(e).addContext(invoke.node()).addContext("macroSubstitution", macroNodeClass); + throw new GraalInternalError(e).addContext(invoke.asNode()).addContext("macroSubstitution", macroNodeClass); } - macroNode.setProbability(invoke.node().probability()); + macroNode.setProbability(invoke.asNode().probability()); CallTargetNode callTarget = invoke.callTarget(); if (invoke instanceof InvokeNode) { graph.replaceFixedWithFixed((InvokeNode) invoke, graph.add(macroNode)); @@ -299,7 +299,7 @@ protected void replaceInvokeCallTarget(StructuredGraph graph, InvokeKind invokeKind, ResolvedJavaMethod targetMethod) { MethodCallTargetNode oldCallTarget = invoke.methodCallTarget(); MethodCallTargetNode newCallTarget = graph.add(new MethodCallTargetNode(invokeKind, targetMethod, oldCallTarget.arguments().toArray(new ValueNode[0]), oldCallTarget.returnType())); - invoke.node().replaceFirstInput(oldCallTarget, newCallTarget); + invoke.asNode().replaceFirstInput(oldCallTarget, newCallTarget); } } @@ -395,9 +395,9 @@ ValueNode anchoredReceiver = createAnchoredReceiver(graph, anchor, type, receiver, true); invoke.callTarget().replaceFirstInput(receiver, anchoredReceiver); - graph.addBeforeFixed(invoke.node(), receiverHub); - graph.addBeforeFixed(invoke.node(), guard); - graph.addBeforeFixed(invoke.node(), anchor); + graph.addBeforeFixed(invoke.asNode(), receiverHub); + graph.addBeforeFixed(invoke.asNode(), guard); + graph.addBeforeFixed(invoke.asNode(), anchor); } @Override @@ -470,8 +470,8 @@ returnMerge.setStateAfter(invoke.stateAfter().duplicate(invoke.stateAfter().bci)); PhiNode returnValuePhi = null; - if (invoke.node().kind() != Kind.Void) { - returnValuePhi = graph.unique(new PhiNode(invoke.node().kind(), returnMerge)); + if (invoke.asNode().kind() != Kind.Void) { + returnValuePhi = graph.unique(new PhiNode(invoke.asNode().kind(), returnMerge)); } MergeNode exceptionMerge = null; @@ -520,7 +520,7 @@ GraphUtil.killCFG(invokeWithExceptionNode.exceptionEdge()); } - assert invoke.node().isAlive(); + assert invoke.asNode().isAlive(); // replace the invoke with a switch on the type of the actual receiver createDispatchOnTypeBeforeInvoke(graph, successors, false); @@ -528,8 +528,8 @@ assert invoke.next() == continuation; invoke.setNext(null); returnMerge.setNext(continuation); - invoke.node().replaceAtUsages(returnValuePhi); - invoke.node().replaceAndDelete(null); + invoke.asNode().replaceAtUsages(returnValuePhi); + invoke.asNode().replaceAndDelete(null); ArrayList<PiNode> replacementNodes = new ArrayList<>(); @@ -617,7 +617,7 @@ BeginNode[] successors = new BeginNode[]{calleeEntryNode, unknownTypeSux}; createDispatchOnTypeBeforeInvoke(graph, successors, false); - calleeEntryNode.setNext(invoke.node()); + calleeEntryNode.setNext(invoke.asNode()); ResolvedJavaMethod concrete = concretes.get(0); inline(invoke, concrete, callback, replacements, assumptions, false); @@ -628,7 +628,7 @@ Kind hubKind = invoke.methodCallTarget().targetMethod().getDeclaringClass().getEncoding(Representation.ObjectHub).getKind(); LoadHubNode hub = graph.add(new LoadHubNode(invoke.methodCallTarget().receiver(), hubKind)); - graph.addBeforeFixed(invoke.node(), hub); + graph.addBeforeFixed(invoke.asNode(), hub); ResolvedJavaType[] keys = new ResolvedJavaType[ptypes.size()]; double[] keyProbabilities = new double[ptypes.size() + 1]; @@ -643,7 +643,7 @@ keySuccessors[keySuccessors.length - 1] = successors.length - 1; TypeSwitchNode typeSwitch = graph.add(new TypeSwitchNode(hub, successors, keys, keyProbabilities, keySuccessors)); - FixedWithNextNode pred = (FixedWithNextNode) invoke.node().predecessor(); + FixedWithNextNode pred = (FixedWithNextNode) invoke.asNode().predecessor(); pred.setNext(typeSwitch); } @@ -651,7 +651,7 @@ double probability, boolean useForInlining) { Invoke duplicatedInvoke = duplicateInvokeForInlining(graph, invoke, exceptionMerge, exceptionObjectPhi, useForInlining, probability); BeginNode calleeEntryNode = graph.add(new BeginNode()); - calleeEntryNode.setNext(duplicatedInvoke.node()); + calleeEntryNode.setNext(duplicatedInvoke.asNode()); calleeEntryNode.setProbability(probability); EndNode endNode = graph.add(new EndNode()); @@ -661,24 +661,24 @@ returnMerge.addForwardEnd(endNode); if (returnValuePhi != null) { - returnValuePhi.addInput(duplicatedInvoke.node()); + returnValuePhi.addInput(duplicatedInvoke.asNode()); } return calleeEntryNode; } private static Invoke duplicateInvokeForInlining(StructuredGraph graph, Invoke invoke, MergeNode exceptionMerge, PhiNode exceptionObjectPhi, boolean useForInlining, double probability) { - Invoke result = (Invoke) invoke.node().copyWithInputs(); + Invoke result = (Invoke) invoke.asNode().copyWithInputs(); Node callTarget = result.callTarget().copyWithInputs(); - result.node().replaceFirstInput(result.callTarget(), callTarget); + result.asNode().replaceFirstInput(result.callTarget(), callTarget); result.setUseForInlining(useForInlining); result.setProbability(probability); result.setInliningRelevance(invoke.inliningRelevance() * probability); - Kind kind = invoke.node().kind(); + Kind kind = invoke.asNode().kind(); if (kind != Kind.Void) { FrameState stateAfter = invoke.stateAfter(); stateAfter = stateAfter.duplicate(stateAfter.bci); - stateAfter.replaceFirstInput(invoke.node(), result.node()); + stateAfter.replaceFirstInput(invoke.asNode(), result.asNode()); result.setStateAfter(stateAfter); } @@ -743,7 +743,7 @@ BeginNode[] successors = new BeginNode[]{invocationEntry, unknownTypeSux}; createDispatchOnTypeBeforeInvoke(graph, successors, true); - invocationEntry.setNext(invoke.node()); + invocationEntry.setNext(invoke.asNode()); ValueNode receiver = invoke.methodCallTarget().receiver(); PiNode anchoredReceiver = createAnchoredReceiver(graph, invocationEntry, target.getDeclaringClass(), receiver, false); invoke.callTarget().replaceFirstInput(receiver, anchoredReceiver); @@ -966,7 +966,7 @@ } private static boolean checkInvokeConditions(Invoke invoke) { - if (invoke.predecessor() == null || !invoke.node().isAlive()) { + if (invoke.predecessor() == null || !invoke.asNode().isAlive()) { return logNotInlinedMethodAndReturnFalse(invoke, "the invoke is dead code"); } else if (!(invoke.callTarget() instanceof MethodCallTargetNode)) { return logNotInlinedMethodAndReturnFalse(invoke, "the invoke has already been lowered, or has been created as a low-level node"); @@ -1048,7 +1048,7 @@ */ public static Map<Node, Node> inline(Invoke invoke, StructuredGraph inlineGraph, boolean receiverNullCheck) { NodeInputList<ValueNode> parameters = invoke.callTarget().arguments(); - StructuredGraph graph = (StructuredGraph) invoke.node().graph(); + StructuredGraph graph = (StructuredGraph) invoke.asNode().graph(); FrameState stateAfter = invoke.stateAfter(); assert stateAfter.isAlive(); @@ -1076,17 +1076,17 @@ } } // ensure proper anchoring of things that were anchored to the StartNode - replacements.put(entryPointNode, BeginNode.prevBegin(invoke.node())); + replacements.put(entryPointNode, BeginNode.prevBegin(invoke.asNode())); - assert invoke.node().successors().first() != null : invoke; - assert invoke.node().predecessor() != null; + assert invoke.asNode().successors().first() != null : invoke; + assert invoke.asNode().predecessor() != null; Map<Node, Node> duplicates = graph.addDuplicates(nodes, replacements); FixedNode firstCFGNodeDuplicate = (FixedNode) duplicates.get(firstCFGNode); if (receiverNullCheck) { receiverNullCheck(invoke); } - invoke.node().replaceAtPredecessor(firstCFGNodeDuplicate); + invoke.asNode().replaceAtPredecessor(firstCFGNodeDuplicate); FrameState stateAtExceptionEdge = null; if (invoke instanceof InvokeWithExceptionNode) { @@ -1125,7 +1125,7 @@ } FrameState outerFrameState = null; - double invokeProbability = invoke.node().probability(); + double invokeProbability = invoke.asNode().probability(); int callerLockDepth = stateAfter.nestedLockDepth(); for (Node node : duplicates.values()) { if (GraalOptions.ProbabilityAnalysis) { @@ -1163,7 +1163,7 @@ if (frameState.outerFrameState() == null) { assert frameState.bci == FrameState.INVALID_FRAMESTATE_BCI || frameState.method() == inlineGraph.method(); if (outerFrameState == null) { - outerFrameState = stateAfter.duplicateModified(invoke.bci(), stateAfter.rethrowException(), invoke.node().kind()); + outerFrameState = stateAfter.duplicateModified(invoke.bci(), stateAfter.rethrowException(), invoke.asNode().kind()); outerFrameState.setDuringCall(true); } frameState.setOuterFrameState(outerFrameState); @@ -1183,7 +1183,7 @@ } else { returnValue = duplicates.get(returnNode.result()); } - invoke.node().replaceAtUsages(returnValue); + invoke.asNode().replaceAtUsages(returnValue); Node returnDuplicate = duplicates.get(returnNode); returnDuplicate.clearInputs(); Node n = invoke.next(); @@ -1191,8 +1191,8 @@ returnDuplicate.replaceAndDelete(n); } - invoke.node().replaceAtUsages(null); - GraphUtil.killCFG(invoke.node()); + invoke.asNode().replaceAtUsages(null); + GraphUtil.killCFG(invoke.asNode()); return duplicates; } @@ -1203,7 +1203,7 @@ NodeInputList<ValueNode> parameters = callTarget.arguments(); ValueNode firstParam = parameters.size() <= 0 ? null : parameters.get(0); if (!callTarget.isStatic() && firstParam.kind() == Kind.Object && !firstParam.objectStamp().nonNull()) { - graph.addBeforeFixed(invoke.node(), + graph.addBeforeFixed(invoke.asNode(), graph.add(new FixedGuardNode(graph.unique(new IsNullNode(firstParam)), DeoptimizationReason.NullCheckException, DeoptimizationAction.InvalidateReprofile, true))); } }
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/PostOrderNodeIterator.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/PostOrderNodeIterator.java Fri Apr 12 14:15:59 2013 +0200 @@ -217,7 +217,7 @@ } protected void invoke(Invoke invoke) { - node(invoke.node()); + node(invoke.asNode()); } protected void finished() {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java Fri Apr 12 14:15:59 2013 +0200 @@ -104,7 +104,7 @@ Node newInstance = createNodeInstance(runtime, c, parameterTypes, returnType, intrinsic.setStampFromReturnType(), nodeConstructorArguments); // Replace the invoke with the new node. - invoke.node().graph().add(newInstance); + invoke.asNode().graph().add(newInstance); invoke.intrinsify(newInstance); // Clean up checkcast instructions inserted by javac if the return type is generic. @@ -130,7 +130,7 @@ if (constant != null) { // Replace the invoke with the result of the call - ConstantNode node = ConstantNode.forConstant(constant, runtime, invoke.node().graph()); + ConstantNode node = ConstantNode.forConstant(constant, runtime, invoke.asNode().graph()); invoke.intrinsify(node); // Clean up checkcast instructions inserted by javac if the return type is generic.
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java Fri Apr 12 14:15:59 2013 +0200 @@ -41,7 +41,7 @@ private final JavaType returnType; protected MacroNode(Invoke invoke) { - super(invoke.node().stamp(), invoke.stateAfter()); + super(invoke.asNode().stamp(), invoke.stateAfter()); this.arguments = new NodeInputList<>(this, invoke.methodCallTarget().arguments()); this.bci = invoke.bci(); this.targetMethod = invoke.methodCallTarget().targetMethod();
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/CyclicMaterializeStoreNode.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/CyclicMaterializeStoreNode.java Fri Apr 12 14:15:59 2013 +0200 @@ -30,9 +30,6 @@ import com.oracle.graal.nodes.type.*; import com.oracle.graal.nodes.virtual.*; -/** - * The {@code StoreFieldNode} represents a write to a static or instance field. - */ @NodeInfo(nameTemplate = "MaterializeStore#{p#target/s}") public final class CyclicMaterializeStoreNode extends FixedWithNextNode implements Lowerable, Virtualizable {
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/phases/WordTypeRewriterPhase.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/phases/WordTypeRewriterPhase.java Fri Apr 12 14:15:59 2013 +0200 @@ -183,7 +183,7 @@ case TO_OBJECT: assert arguments.size() == 1; - replace(invoke, graph.unique(new UnsafeCastNode(arguments.get(0), invoke.node().stamp()))); + replace(invoke, graph.unique(new UnsafeCastNode(arguments.get(0), invoke.asNode().stamp()))); break; default: @@ -227,7 +227,7 @@ Constructor<? extends ValueNode> constructor = nodeClass.getConstructor(Kind.class, ValueNode.class, ValueNode.class); ValueNode result = graph.add(constructor.newInstance(wordKind, left, right)); if (result instanceof FixedWithNextNode) { - graph.addBeforeFixed(invoke.node(), (FixedWithNextNode) result); + graph.addBeforeFixed(invoke.asNode(), (FixedWithNextNode) result); } return result; } catch (Throwable ex) { @@ -267,11 +267,11 @@ private static ValueNode readOp(StructuredGraph graph, ValueNode base, ValueNode offset, Invoke invoke, Kind readKind, Object locationIdentity) { IndexedLocationNode location = IndexedLocationNode.create(locationIdentity, readKind, 0, offset, graph, 1); - ReadNode read = graph.add(new ReadNode(base, location, invoke.node().stamp())); - graph.addBeforeFixed(invoke.node(), read); + ReadNode read = graph.add(new ReadNode(base, location, invoke.asNode().stamp())); + graph.addBeforeFixed(invoke.asNode(), read); // The read must not float outside its block otherwise it may float above an explicit zero // check on its base address - read.dependencies().add(BeginNode.prevBegin(invoke.node())); + read.dependencies().add(BeginNode.prevBegin(invoke.asNode())); return read; } @@ -279,16 +279,16 @@ IndexedLocationNode location = IndexedLocationNode.create(locationIdentity, writeKind, 0, offset, graph, 1); WriteNode write = graph.add(new WriteNode(base, value, location, false)); write.setStateAfter(invoke.stateAfter()); - graph.addBeforeFixed(invoke.node(), write); + graph.addBeforeFixed(invoke.asNode(), write); return write; } private static void replace(Invoke invoke, ValueNode value) { FixedNode next = invoke.next(); invoke.setNext(null); - invoke.node().replaceAtPredecessor(next); - invoke.node().replaceAtUsages(value); - GraphUtil.killCFG(invoke.node()); + invoke.asNode().replaceAtPredecessor(next); + invoke.asNode().replaceAtUsages(value); + GraphUtil.killCFG(invoke.asNode()); } public boolean isWord(ValueNode node) {
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/phases/WordTypeVerificationPhase.java Fri Apr 12 14:05:42 2013 +0200 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/phases/WordTypeVerificationPhase.java Fri Apr 12 14:15:59 2013 +0200 @@ -80,9 +80,9 @@ ValueNode receiver = arguments.get(argc); if (receiver == node && isWord(node)) { ResolvedJavaMethod resolvedMethod = wordAccess.getWordImplType().resolveMethod(method); - verify(resolvedMethod != null, node, invoke.node(), "cannot resolve method on Word class: " + MetaUtil.format("%H.%n(%P) %r", method)); + verify(resolvedMethod != null, node, invoke.asNode(), "cannot resolve method on Word class: " + MetaUtil.format("%H.%n(%P) %r", method)); Operation operation = resolvedMethod.getAnnotation(Word.Operation.class); - verify(operation != null, node, invoke.node(), "cannot dispatch on word value to non @Operation annotated method " + resolvedMethod); + verify(operation != null, node, invoke.asNode(), "cannot dispatch on word value to non @Operation annotated method " + resolvedMethod); } argc++; } @@ -91,7 +91,7 @@ ValueNode argument = arguments.get(argc); if (argument == node) { ResolvedJavaType type = (ResolvedJavaType) signature.getParameterType(i, method.getDeclaringClass()); - verify(isWord(type) == isWord(argument), node, invoke.node(), "cannot pass word value to non-word parameter " + i + " or vice-versa"); + verify(isWord(type) == isWord(argument), node, invoke.asNode(), "cannot pass word value to non-word parameter " + i + " or vice-versa"); } argc++; }