Mercurial > hg > truffle

changeset 7572:bbb2619857d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove LIRLowerable from VirtualState subclasses, not needed because they are not scheduled
author Lukas Stadler <lukas.stadler@jku.at>
date Thu, 31 Jan 2013 11:23:55 +0100
parents 6078d41cecb2
children 17b6a63fe7c2
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EscapeObjectState.java graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/MaterializedObjectState.java graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/VirtualObjectState.java
diffstat 4 files changed, 4 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java	Wed Jan 30 22:44:51 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java	Thu Jan 31 11:23:55 2013 +0100
@@ -28,7 +28,6 @@
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.graph.*;
 import com.oracle.graal.graph.iterators.*;
-import com.oracle.graal.nodes.spi.*;
 import com.oracle.graal.nodes.virtual.*;
 
 /**
@@ -36,7 +35,7 @@
  * stack) at a particular point in the abstract interpretation.
  */
 @NodeInfo(nameTemplate = "FrameState@{p#method/s}:{p#bci}")
-public final class FrameState extends VirtualState implements Node.IterableNodeType, LIRLowerable {
+public final class FrameState extends VirtualState implements Node.IterableNodeType {
 
     protected final int localsSize;
 
@@ -304,11 +303,6 @@
         return usages().filter(FrameState.class);
     }
 
-    @Override
-    public void generate(LIRGeneratorTool gen) {
-        // Nothing to do, frame states are processed as part of the handling of StateSplit nodes.
-    }
-
     private static String toString(FrameState frameState) {
         StringBuilder sb = new StringBuilder();
         String nl = CodeUtil.NEW_LINE;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EscapeObjectState.java	Wed Jan 30 22:44:51 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EscapeObjectState.java	Thu Jan 31 11:23:55 2013 +0100
@@ -24,9 +24,8 @@
 
 import com.oracle.graal.graph.*;
 import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.spi.*;
 
-public abstract class EscapeObjectState extends VirtualState implements Node.IterableNodeType, LIRLowerable {
+public abstract class EscapeObjectState extends VirtualState implements Node.IterableNodeType {
 
     @Input private VirtualObjectNode object;
 
@@ -39,12 +38,6 @@
     }
 
     @Override
-    public void generate(LIRGeneratorTool generator) {
-        // Nothing to do, virtual object states are processed as part of the handling of StateSplit
-        // nodes.
-    }
-
-    @Override
     public abstract EscapeObjectState duplicateWithVirtualState();
 
     @Override
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/MaterializedObjectState.java	Wed Jan 30 22:44:51 2013 +0100
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/MaterializedObjectState.java	Thu Jan 31 11:23:55 2013 +0100
@@ -24,13 +24,12 @@
 
 import com.oracle.graal.graph.*;
 import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.spi.*;
 import com.oracle.graal.nodes.virtual.*;
 
 /**
  * This class encapsulated the materialized state of an escape analyzed object.
  */
-public final class MaterializedObjectState extends EscapeObjectState implements Node.IterableNodeType, LIRLowerable, Node.ValueNumberable {
+public final class MaterializedObjectState extends EscapeObjectState implements Node.IterableNodeType, Node.ValueNumberable {
 
     @Input private ValueNode materializedValue;
 
@@ -44,12 +43,6 @@
     }
 
     @Override
-    public void generate(LIRGeneratorTool generator) {
-        // Nothing to do, virtual object states are processed as part of the handling of StateSplit
-        // nodes.
-    }
-
-    @Override
     public MaterializedObjectState duplicateWithVirtualState() {
         return graph().add(new MaterializedObjectState(object(), materializedValue));
     }
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/VirtualObjectState.java	Wed Jan 30 22:44:51 2013 +0100
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/VirtualObjectState.java	Thu Jan 31 11:23:55 2013 +0100
@@ -26,13 +26,12 @@
 
 import com.oracle.graal.graph.*;
 import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.spi.*;
 import com.oracle.graal.nodes.virtual.*;
 
 /**
  * This class encapsulated the virtual state of an escape analyzed object.
  */
-public final class VirtualObjectState extends EscapeObjectState implements Node.IterableNodeType, LIRLowerable, Node.ValueNumberable {
+public final class VirtualObjectState extends EscapeObjectState implements Node.IterableNodeType, Node.ValueNumberable {
 
     @Input private final NodeInputList<ValueNode> fieldValues;
 
@@ -53,12 +52,6 @@
     }
 
     @Override
-    public void generate(LIRGeneratorTool generator) {
-        // Nothing to do, virtual object states are processed as part of the handling of StateSplit
-        // nodes.
-    }
-
-    @Override
     public VirtualObjectState duplicateWithVirtualState() {
         return graph().add(new VirtualObjectState(object(), fieldValues));
     }