Mercurial > hg > truffle

changeset 16549:0f28c558d850

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename fieldValues to values in VirtualObjectState
author Lukas Stadler <lukas.stadler@oracle.com>
date Thu, 17 Jul 2014 14:25:41 +0200
parents a3b0a2d61e62
children af52fd81a7a3
files graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/VirtualObjectState.java
diffstat 2 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java	Thu Jul 17 11:51:35 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java	Thu Jul 17 14:25:41 2014 +0200
@@ -89,11 +89,11 @@
                             assert currentField != null;
                             int pos = 0;
                             for (int i = 0; i < vobj.entryCount(); i++) {
-                                if (!currentField.fieldValues().get(i).isConstant() || currentField.fieldValues().get(i).asConstant().getKind() != Kind.Illegal) {
-                                    values[pos++] = toValue(currentField.fieldValues().get(i));
+                                if (!currentField.values().get(i).isConstant() || currentField.values().get(i).asConstant().getKind() != Kind.Illegal) {
+                                    values[pos++] = toValue(currentField.values().get(i));
                                 } else {
-                                    assert currentField.fieldValues().get(i - 1).getKind() == Kind.Double || currentField.fieldValues().get(i - 1).getKind() == Kind.Long : vobj + " " + i + " " +
-                                                    currentField.fieldValues().get(i - 1);
+                                    assert currentField.values().get(i - 1).getKind() == Kind.Double || currentField.values().get(i - 1).getKind() == Kind.Long : vobj + " " + i + " " +
+                                                    currentField.values().get(i - 1);
                                 }
                             }
                             if (pos != vobj.entryCount()) {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/VirtualObjectState.java	Thu Jul 17 11:51:35 2014 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/VirtualObjectState.java	Thu Jul 17 14:25:41 2014 +0200
@@ -33,32 +33,32 @@
  */
 public final class VirtualObjectState extends EscapeObjectState implements Node.ValueNumberable {
 
-    @Input private final NodeInputList<ValueNode> fieldValues;
+    @Input private final NodeInputList<ValueNode> values;
 
-    public NodeInputList<ValueNode> fieldValues() {
-        return fieldValues;
+    public NodeInputList<ValueNode> values() {
+        return values;
     }
 
-    public VirtualObjectState(VirtualObjectNode object, ValueNode[] fieldValues) {
+    public VirtualObjectState(VirtualObjectNode object, ValueNode[] values) {
         super(object);
-        assert object.entryCount() == fieldValues.length;
-        this.fieldValues = new NodeInputList<>(this, fieldValues);
+        assert object.entryCount() == values.length;
+        this.values = new NodeInputList<>(this, values);
     }
 
-    public VirtualObjectState(VirtualObjectNode object, List<ValueNode> fieldValues) {
+    public VirtualObjectState(VirtualObjectNode object, List<ValueNode> values) {
         super(object);
-        assert object.entryCount() == fieldValues.size();
-        this.fieldValues = new NodeInputList<>(this, fieldValues);
+        assert object.entryCount() == values.size();
+        this.values = new NodeInputList<>(this, values);
     }
 
     @Override
     public VirtualObjectState duplicateWithVirtualState() {
-        return graph().addWithoutUnique(new VirtualObjectState(object(), fieldValues));
+        return graph().addWithoutUnique(new VirtualObjectState(object(), values));
     }
 
     @Override
     public void applyToNonVirtual(NodeClosure<? super ValueNode> closure) {
-        for (ValueNode value : fieldValues) {
+        for (ValueNode value : values) {
             closure.apply(this, value);
         }
     }