Mercurial > hg > truffle
changeset 19001:5a79fa76b489
Run eclipse format.
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginStateSplitNode.java Wed Jan 28 03:28:31 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BeginStateSplitNode.java Wed Jan 28 04:05:07 2015 +0100 @@ -28,9 +28,9 @@ /** * Base class for {@link AbstractBeginNode}s that are associated with a frame state. * - * TODO (dnsimon) this not needed until {@link AbstractBeginNode} no longer implements {@link StateSplit} - * which is not possible until loop peeling works without requiring begin nodes to have frames - * states. + * TODO (dnsimon) this not needed until {@link AbstractBeginNode} no longer implements + * {@link StateSplit} which is not possible until loop peeling works without requiring begin nodes + * to have frames states. */ @NodeInfo public abstract class BeginStateSplitNode extends AbstractBeginNode implements StateSplit {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java Wed Jan 28 03:28:31 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java Wed Jan 28 04:05:07 2015 +0100 @@ -80,8 +80,8 @@ /** * Returns the 0-based index of this loop end. This is <b>not</b> the index into {@link PhiNode} - * values at the loop begin. Use {@link AbstractMergeNode#phiPredecessorIndex(AbstractEndNode)} for this - * purpose. + * values at the loop begin. Use {@link AbstractMergeNode#phiPredecessorIndex(AbstractEndNode)} + * for this purpose. * * @return The 0-based index of this loop end. */
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Wed Jan 28 03:28:31 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Wed Jan 28 04:05:07 2015 +0100 @@ -32,10 +32,11 @@ import com.oracle.graal.nodes.calc.*; /** - * {@code PhiNode}s represent the merging of edges at a control flow merges ({@link AbstractMergeNode} or - * {@link LoopBeginNode}). For a {@link AbstractMergeNode}, the order of the values corresponds to the order - * of the ends. For {@link LoopBeginNode}s, the first value corresponds to the loop's predecessor, - * while the rest of the values correspond to the {@link LoopEndNode}s. + * {@code PhiNode}s represent the merging of edges at a control flow merges ( + * {@link AbstractMergeNode} or {@link LoopBeginNode}). For a {@link AbstractMergeNode}, the order + * of the values corresponds to the order of the ends. For {@link LoopBeginNode}s, the first value + * corresponds to the loop's predecessor, while the rest of the values correspond to the + * {@link LoopEndNode}s. */ @NodeInfo public abstract class PhiNode extends FloatingNode implements Simplifiable {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Wed Jan 28 03:28:31 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Wed Jan 28 04:05:07 2015 +0100 @@ -94,14 +94,16 @@ private boolean hasValueProxies = true; /** - * Creates a new Graph containing a single {@link AbstractBeginNode} as the {@link #start() start} node. + * Creates a new Graph containing a single {@link AbstractBeginNode} as the {@link #start() + * start} node. */ public StructuredGraph() { this(null, null); } /** - * Creates a new Graph containing a single {@link AbstractBeginNode} as the {@link #start() start} node. + * Creates a new Graph containing a single {@link AbstractBeginNode} as the {@link #start() + * start} node. */ public StructuredGraph(String name, ResolvedJavaMethod method) { this(name, method, uniqueGraphIds.incrementAndGet(), INVOCATION_ENTRY_BCI);
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Wed Jan 28 03:28:31 2015 +0100 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Wed Jan 28 04:05:07 2015 +0100 @@ -321,8 +321,8 @@ graph.removeFloating((FloatingNode) node); } else { // case 2 - assert !(canonical instanceof FixedNode) || (canonical.predecessor() != null || canonical instanceof StartNode || canonical instanceof AbstractMergeNode) : node + " -> " + canonical + - " : replacement should be floating or fixed and connected"; + assert !(canonical instanceof FixedNode) || (canonical.predecessor() != null || canonical instanceof StartNode || canonical instanceof AbstractMergeNode) : node + " -> " + + canonical + " : replacement should be floating or fixed and connected"; graph.replaceFloating((FloatingNode) node, canonical); } } else {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/TailDuplicationPhase.java Wed Jan 28 03:28:31 2015 +0100 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/TailDuplicationPhase.java Wed Jan 28 04:05:07 2015 +0100 @@ -172,9 +172,9 @@ * This method attempts to duplicate the tail of the given merge. The merge must not be a * {@link LoopBeginNode}. If the merge is eligible for duplication (at least one fixed node in * its tail, no {@link MonitorEnterNode}/ {@link MonitorExitNode}, non-null - * {@link AbstractMergeNode#stateAfter()}) then the decision callback is used to determine whether the - * tail duplication should actually be performed. If replacements is non-null, then this list of - * {@link PiNode}s is used to replace one value per merge end. + * {@link AbstractMergeNode#stateAfter()}) then the decision callback is used to determine + * whether the tail duplication should actually be performed. If replacements is non-null, then + * this list of {@link PiNode}s is used to replace one value per merge end. * * @param merge The merge whose tail should be duplicated. * @param decision A callback that can make the final decision if tail duplication should occur @@ -209,7 +209,8 @@ } /** - * This class encapsulates one tail duplication operation on a specific {@link AbstractMergeNode}. + * This class encapsulates one tail duplication operation on a specific + * {@link AbstractMergeNode}. */ private static class DuplicationOperation {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java Wed Jan 28 03:28:31 2015 +0100 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java Wed Jan 28 04:05:07 2015 +0100 @@ -459,8 +459,8 @@ return costEstimateMethodDispatch < costEstimateTypeDispatch; } - private static AbstractBeginNode createInvocationBlock(StructuredGraph graph, Invoke invoke, AbstractMergeNode returnMerge, PhiNode returnValuePhi, AbstractMergeNode exceptionMerge, PhiNode exceptionObjectPhi, - boolean useForInlining) { + private static AbstractBeginNode createInvocationBlock(StructuredGraph graph, Invoke invoke, AbstractMergeNode returnMerge, PhiNode returnValuePhi, AbstractMergeNode exceptionMerge, + PhiNode exceptionObjectPhi, boolean useForInlining) { Invoke duplicatedInvoke = duplicateInvokeForInlining(graph, invoke, exceptionMerge, exceptionObjectPhi, useForInlining); AbstractBeginNode calleeEntryNode = graph.add(new BeginNode()); calleeEntryNode.setNext(duplicatedInvoke.asNode());
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/FixedNodeProbabilityCache.java Wed Jan 28 03:28:31 2015 +0100 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/FixedNodeProbabilityCache.java Wed Jan 28 04:05:07 2015 +0100 @@ -40,8 +40,8 @@ /** * <p> - * Given a {@link FixedNode} this method finds the most immediate {@link AbstractBeginNode} preceding it - * that either: + * Given a {@link FixedNode} this method finds the most immediate {@link AbstractBeginNode} + * preceding it that either: * <ul> * <li>has no predecessor (ie, the begin-node is a merge, in particular a loop-begin, or the * start-node)</li> @@ -50,8 +50,8 @@ * </p> * * <p> - * The thus found {@link AbstractBeginNode} is equi-probable with the {@link FixedNode} it was obtained - * from. When computed for the first time (afterwards a cache lookup returns it) that + * The thus found {@link AbstractBeginNode} is equi-probable with the {@link FixedNode} it was + * obtained from. When computed for the first time (afterwards a cache lookup returns it) that * probability is computed as follows, again depending on the begin-node's predecessor: * <ul> * <li>No predecessor. In this case the begin-node is either:</li>
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/SinglePassNodeIterator.java Wed Jan 28 03:28:31 2015 +0100 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/SinglePassNodeIterator.java Wed Jan 28 04:05:07 2015 +0100 @@ -41,8 +41,8 @@ * * <p> * For this iterator the CFG is defined by the classical CFG nodes ( - * {@link com.oracle.graal.nodes.ControlSplitNode}, {@link com.oracle.graal.nodes.AbstractMergeNode}...) and - * the {@link com.oracle.graal.nodes.FixedWithNextNode#next() next} pointers of + * {@link com.oracle.graal.nodes.ControlSplitNode}, {@link com.oracle.graal.nodes.AbstractMergeNode} + * ...) and the {@link com.oracle.graal.nodes.FixedWithNextNode#next() next} pointers of * {@link com.oracle.graal.nodes.FixedWithNextNode}. * </p> * @@ -101,8 +101,8 @@ * <p> * Correspondingly each item may stand for: * <ul> - * <li>a {@link AbstractMergeNode} whose pre-state results from merging those of its forward-ends, see - * {@link #nextQueuedNode()}</li> + * <li>a {@link AbstractMergeNode} whose pre-state results from merging those of its + * forward-ends, see {@link #nextQueuedNode()}</li> * <li>a successor of a control-split node, in which case the state on entry to it (the * successor) is also stored in the item, see {@link #nextQueuedNode()}</li> * </ul> @@ -228,8 +228,8 @@ * the pre-state for that node. * * <p> - * Upon reaching a {@link AbstractMergeNode}, some entries are pruned from {@link #nodeStates} (ie, the - * entries associated to forward-ends for that merge-node). + * Upon reaching a {@link AbstractMergeNode}, some entries are pruned from {@link #nodeStates} + * (ie, the entries associated to forward-ends for that merge-node). * </p> */ private FixedNode nextQueuedNode() {