Mercurial > hg > graal-compiler

changeset 16838:27f457a47a44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed @NodeInfo from non-Node classes
author Doug Simon <doug.simon@oracle.com>
date Thu, 14 Aug 2014 23:28:21 +0200
parents a4ab20ebeed5
children 7eca83fd5419
files graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotNodeLIRBuilder.java graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotNodeLIRBuilder.java graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotNodeLIRBuilder.java graal/com.oracle.graal.java/src/com/oracle/graal/java/ComputeLoopFrequenciesClosure.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/TailDuplicationPhase.java graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/AddTestNode.java graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/ConstantTestNode.java graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/LoadLocalTestNode.java graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/LoopTestNode.java graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/StoreLocalTestNode.java
diffstat 13 files changed, 25 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java	Thu Aug 14 23:27:53 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java	Thu Aug 14 23:28:21 2014 +0200
@@ -55,7 +55,6 @@
 /**
  * LIR generator specialized for AMD64 HotSpot.
  */
-@NodeInfo
 public class AMD64HotSpotNodeLIRBuilder extends AMD64NodeLIRBuilder implements HotSpotNodeLIRBuilder {
 
     private static ValueNode filterCompression(ValueNode node) {
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotNodeLIRBuilder.java	Thu Aug 14 23:27:53 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotNodeLIRBuilder.java	Thu Aug 14 23:28:21 2014 +0200
@@ -29,7 +29,6 @@
 import com.oracle.graal.compiler.common.*;
 import com.oracle.graal.compiler.hsail.*;
 import com.oracle.graal.debug.*;
-import com.oracle.graal.graph.*;
 import com.oracle.graal.hotspot.*;
 import com.oracle.graal.hotspot.HotSpotVMConfig.CompressEncoding;
 import com.oracle.graal.hotspot.meta.*;
@@ -43,7 +42,6 @@
 /**
  * The HotSpot specific portion of the HSAIL LIR generator.
  */
-@NodeInfo
 public class HSAILHotSpotNodeLIRBuilder extends HSAILNodeLIRBuilder implements HotSpotNodeLIRBuilder {
 
     public HSAILHotSpotNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) {
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotNodeLIRBuilder.java	Thu Aug 14 23:27:53 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotNodeLIRBuilder.java	Thu Aug 14 23:28:21 2014 +0200
@@ -25,7 +25,6 @@
 
 import com.oracle.graal.compiler.common.*;
 import com.oracle.graal.compiler.ptx.*;
-import com.oracle.graal.graph.*;
 import com.oracle.graal.hotspot.*;
 import com.oracle.graal.hotspot.nodes.*;
 import com.oracle.graal.lir.gen.*;
@@ -34,7 +33,6 @@
 /**
  * LIR generator specialized for PTX HotSpot.
  */
-@NodeInfo
 public class PTXHotSpotNodeLIRBuilder extends PTXNodeLIRBuilder implements HotSpotNodeLIRBuilder {
 
     protected PTXHotSpotNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) {
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotNodeLIRBuilder.java	Thu Aug 14 23:27:53 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotNodeLIRBuilder.java	Thu Aug 14 23:28:21 2014 +0200
@@ -42,7 +42,6 @@
 import com.oracle.graal.nodes.*;
 import com.oracle.graal.nodes.CallTargetNode.InvokeKind;
 
-@NodeInfo
 public class SPARCHotSpotNodeLIRBuilder extends SPARCNodeLIRBuilder implements HotSpotNodeLIRBuilder {
 
     public SPARCHotSpotNodeLIRBuilder(StructuredGraph graph, LIRGeneratorTool lirGen) {
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/ComputeLoopFrequenciesClosure.java	Thu Aug 14 23:27:53 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/ComputeLoopFrequenciesClosure.java	Thu Aug 14 23:28:21 2014 +0200
@@ -27,11 +27,9 @@
 import java.util.*;
 import java.util.stream.*;
 
-import com.oracle.graal.graph.*;
 import com.oracle.graal.nodes.*;
 import com.oracle.graal.phases.graph.*;
 
-@NodeInfo
 public class ComputeLoopFrequenciesClosure extends ReentrantNodeIterator.NodeIteratorClosure<Double> {
 
     private static final ComputeLoopFrequenciesClosure INSTANCE = new ComputeLoopFrequenciesClosure();
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java	Thu Aug 14 23:27:53 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java	Thu Aug 14 23:28:21 2014 +0200
@@ -332,7 +332,6 @@
         }
     }
 
-    @NodeInfo
     public class ConditionalElimination extends SinglePassNodeIterator<State> {
 
         private final LogicNode trueConstant;
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java	Thu Aug 14 23:27:53 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java	Thu Aug 14 23:28:21 2014 +0200
@@ -46,6 +46,30 @@
  */
 public class LoweringPhase extends BasePhase<PhaseContext> {
 
+    @NodeInfo
+    static class DummyGuardHandle extends ValueNode implements GuardedNode {
+        @Input(InputType.Guard) private GuardingNode guard;
+
+        public DummyGuardHandle(GuardingNode guard) {
+            super(StampFactory.forVoid());
+            this.guard = guard;
+        }
+
+        public GuardingNode getGuard() {
+            return guard;
+        }
+
+        public void setGuard(GuardingNode guard) {
+            updateUsagesInterface(this.guard, guard);
+            this.guard = guard;
+        }
+
+        @Override
+        public ValueNode asNode() {
+            return this;
+        }
+    }
+
     final class LoweringToolImpl implements LoweringTool {
 
         private final PhaseContext context;
@@ -102,31 +126,6 @@
             return context.getAssumptions();
         }
 
-        @NodeInfo
-        private class DummyGuardHandle extends ValueNode implements GuardedNode {
-            @Input(InputType.Guard) private GuardingNode guard;
-
-            public DummyGuardHandle(GuardingNode guard) {
-                super(StampFactory.forVoid());
-                this.guard = guard;
-            }
-
-            public GuardingNode getGuard() {
-                return guard;
-            }
-
-            public void setGuard(GuardingNode guard) {
-                updateUsagesInterface(this.guard, guard);
-                this.guard = guard;
-            }
-
-            @Override
-            public ValueNode asNode() {
-                return this;
-            }
-
-        }
-
         @Override
         public GuardingNode createGuard(FixedNode before, LogicNode condition, DeoptimizationReason deoptReason, DeoptimizationAction action, boolean negated) {
             if (OptEliminateGuards.getValue()) {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/TailDuplicationPhase.java	Thu Aug 14 23:27:53 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/TailDuplicationPhase.java	Thu Aug 14 23:28:21 2014 +0200
@@ -62,7 +62,7 @@
     private final CanonicalizerPhase canonicalizer;
 
     @NodeInfo
-    private static class DummyAnchorNode extends FixedWithNextNode implements GuardingNode {
+    static class DummyAnchorNode extends FixedWithNextNode implements GuardingNode {
         public DummyAnchorNode() {
             super(StampFactory.forVoid());
         }
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/AddTestNode.java	Thu Aug 14 23:27:53 2014 +0200
+++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/AddTestNode.java	Thu Aug 14 23:28:21 2014 +0200
@@ -22,10 +22,8 @@
  */
 package com.oracle.graal.truffle.test.nodes;
 
-import com.oracle.graal.graph.*;
 import com.oracle.truffle.api.frame.*;
 
-@NodeInfo
 public class AddTestNode extends AbstractTestNode {
 
     @Child private AbstractTestNode left;
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/ConstantTestNode.java	Thu Aug 14 23:27:53 2014 +0200
+++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/ConstantTestNode.java	Thu Aug 14 23:28:21 2014 +0200
@@ -22,10 +22,8 @@
  */
 package com.oracle.graal.truffle.test.nodes;
 
-import com.oracle.graal.graph.*;
 import com.oracle.truffle.api.frame.*;
 
-@NodeInfo
 public class ConstantTestNode extends AbstractTestNode {
 
     private final int value;
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/LoadLocalTestNode.java	Thu Aug 14 23:27:53 2014 +0200
+++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/LoadLocalTestNode.java	Thu Aug 14 23:28:21 2014 +0200
@@ -22,10 +22,8 @@
  */
 package com.oracle.graal.truffle.test.nodes;
 
-import com.oracle.graal.graph.*;
 import com.oracle.truffle.api.frame.*;
 
-@NodeInfo
 public class LoadLocalTestNode extends AbstractTestNode {
 
     private final FrameSlot slot;
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/LoopTestNode.java	Thu Aug 14 23:27:53 2014 +0200
+++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/LoopTestNode.java	Thu Aug 14 23:28:21 2014 +0200
@@ -22,10 +22,8 @@
  */
 package com.oracle.graal.truffle.test.nodes;
 
-import com.oracle.graal.graph.*;
 import com.oracle.truffle.api.frame.*;
 
-@NodeInfo
 public class LoopTestNode extends AbstractTestNode {
 
     private final int numberOfIterations;
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/StoreLocalTestNode.java	Thu Aug 14 23:27:53 2014 +0200
+++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/nodes/StoreLocalTestNode.java	Thu Aug 14 23:28:21 2014 +0200
@@ -22,10 +22,8 @@
  */
 package com.oracle.graal.truffle.test.nodes;
 
-import com.oracle.graal.graph.*;
 import com.oracle.truffle.api.frame.*;
 
-@NodeInfo
 public class StoreLocalTestNode extends AbstractTestNode {
 
     private final FrameSlot slot;