Mercurial > hg > truffle

changeset 16219:24c30ecf930f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename object() to getValue() in LoadHubNode
author Lukas Stadler <lukas.stadler@oracle.com>
date Wed, 25 Jun 2014 16:55:01 +0200
parents c3260b05fd26
children 4182366b8eed
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadMethodNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.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/cfs/FlowSensitiveReduction.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/DefaultJavaLoweringProvider.java
diffstat 6 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java	Wed Jun 25 16:55:00 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadHubNode.java	Wed Jun 25 16:55:01 2014 +0200
@@ -36,21 +36,21 @@
  */
 public final class LoadHubNode extends FloatingGuardedNode implements Lowerable, Canonicalizable, Virtualizable {
 
-    @Input private ValueNode object;
+    @Input private ValueNode value;
 
-    public ValueNode object() {
-        return object;
+    public ValueNode getValue() {
+        return value;
     }
 
-    public LoadHubNode(ValueNode object, Kind kind) {
+    public LoadHubNode(ValueNode value, Kind kind) {
         super(getKind(kind), null);
-        this.object = object;
+        this.value = value;
     }
 
-    public LoadHubNode(ValueNode object, Kind kind, ValueNode guard) {
+    public LoadHubNode(ValueNode value, Kind kind, ValueNode guard) {
         super(getKind(kind), (GuardingNode) guard);
-        assert object != guard;
-        this.object = object;
+        assert value != guard;
+        this.value = value;
     }
 
     private static Stamp getKind(Kind kind) {
@@ -65,8 +65,8 @@
     @Override
     public Node canonical(CanonicalizerTool tool) {
         MetaAccessProvider metaAccess = tool.getMetaAccess();
-        if (metaAccess != null && object.stamp() instanceof ObjectStamp) {
-            ObjectStamp stamp = (ObjectStamp) object.stamp();
+        if (metaAccess != null && value.stamp() instanceof ObjectStamp) {
+            ObjectStamp stamp = (ObjectStamp) value.stamp();
 
             ResolvedJavaType exactType;
             if (stamp.isExactType()) {
@@ -89,7 +89,7 @@
 
     @Override
     public void virtualize(VirtualizerTool tool) {
-        State state = tool.getObjectState(object);
+        State state = tool.getObjectState(value);
         if (state != null) {
             Constant constantHub = state.getVirtualObject().type().getEncoding(Representation.ObjectHub);
             tool.replaceWithValue(ConstantNode.forConstant(constantHub, tool.getMetaAccessProvider(), graph()));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadMethodNode.java	Wed Jun 25 16:55:00 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LoadMethodNode.java	Wed Jun 25 16:55:01 2014 +0200
@@ -61,7 +61,7 @@
     @Override
     public Node canonical(CanonicalizerTool tool) {
         if (hub instanceof LoadHubNode) {
-            ValueNode object = ((LoadHubNode) hub).object();
+            ValueNode object = ((LoadHubNode) hub).getValue();
             ResolvedJavaType type = StampTool.typeOrNull(object);
             if (StampTool.isExactType(object)) {
                 return resolveExactMethod(tool, type);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java	Wed Jun 25 16:55:00 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java	Wed Jun 25 16:55:01 2014 +0200
@@ -121,8 +121,8 @@
             tool.addToWorkList(blockSuccessor(survivingEdge));
             graph().removeSplit(this, blockSuccessor(survivingEdge));
         }
-        if (value() instanceof LoadHubNode && ((LoadHubNode) value()).object().stamp() instanceof ObjectStamp) {
-            ObjectStamp stamp = (ObjectStamp) ((LoadHubNode) value()).object().stamp();
+        if (value() instanceof LoadHubNode && ((LoadHubNode) value()).getValue().stamp() instanceof ObjectStamp) {
+            ObjectStamp stamp = (ObjectStamp) ((LoadHubNode) value()).getValue().stamp();
             if (stamp.type() != null) {
                 int validKeys = 0;
                 for (int i = 0; i < keyCount(); i++) {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java	Wed Jun 25 16:55:00 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java	Wed Jun 25 16:55:01 2014 +0200
@@ -438,8 +438,8 @@
                         }
                     }
                     if (type != null) {
-                        state.addNullness(false, loadHub.object());
-                        state.addType(type, loadHub.object());
+                        state.addNullness(false, loadHub.getValue());
+                        state.addType(type, loadHub.getValue());
                     }
                 }
             }
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FlowSensitiveReduction.java	Wed Jun 25 16:55:00 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FlowSensitiveReduction.java	Wed Jun 25 16:55:01 2014 +0200
@@ -234,7 +234,7 @@
                 return;
             }
             // it's unwarranted to assume loadHub.object() to be non-null
-            state.trackCC(loadHub.object(), type, begin);
+            state.trackCC(loadHub.getValue(), type, begin);
         }
     }
 
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/DefaultJavaLoweringProvider.java	Wed Jun 25 16:55:00 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/DefaultJavaLoweringProvider.java	Wed Jun 25 16:55:01 2014 +0200
@@ -223,7 +223,7 @@
         if (graph.getGuardsStage().ordinal() < StructuredGraph.GuardsStage.FIXED_DEOPTS.ordinal()) {
             return;
         }
-        ValueNode hub = createReadHub(graph, loadHub.object(), loadHub.getGuard());
+        ValueNode hub = createReadHub(graph, loadHub.getValue(), loadHub.getGuard());
         graph.replaceFloating(loadHub, hub);
     }