Mercurial > hg > truffle

changeset 7662:7e5581ae1e43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small cleanup in MaterializeObjectNode
author Lukas Stadler <lukas.stadler@jku.at>
date Fri, 01 Feb 2013 17:34:18 +0100
parents 1b3ca8791ced
children f78ac2ce44ef
files graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/MaterializeObjectNode.java
diffstat 1 files changed, 9 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/MaterializeObjectNode.java	Fri Feb 01 17:34:01 2013 +0100
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/MaterializeObjectNode.java	Fri Feb 01 17:34:18 2013 +0100
@@ -59,34 +59,32 @@
      *         are {@link Constant#defaultForKind(Kind)}, false otherwise.
      */
     public boolean isDefault() {
-        boolean defaultEntries = true;
         if (lockCount > 0) {
-            defaultEntries = false;
+            return false;
         } else {
             for (ValueNode value : values) {
                 if (!value.isConstant() || !value.asConstant().isDefaultForKind()) {
-                    defaultEntries = false;
-                    break;
+                    return false;
                 }
             }
         }
-        return defaultEntries;
+        return true;
     }
 
     @Override
     public void lower(LoweringTool tool) {
         StructuredGraph graph = (StructuredGraph) graph();
 
-        boolean defaultEntries = isDefault();
+        boolean defaultValuesOnly = isDefault();
 
         if (virtualObject instanceof VirtualInstanceNode) {
             VirtualInstanceNode virtual = (VirtualInstanceNode) virtualObject;
 
-            NewInstanceNode newInstance = graph.add(new NewInstanceNode(virtual.type(), defaultEntries, lockCount > 0));
+            NewInstanceNode newInstance = graph.add(new NewInstanceNode(virtual.type(), defaultValuesOnly, lockCount > 0));
             this.replaceAtUsages(newInstance);
             graph.addBeforeFixed(this, newInstance);
 
-            if (!defaultEntries) {
+            if (!defaultValuesOnly) {
                 for (int i = 0; i < virtual.entryCount(); i++) {
                     graph.addBeforeFixed(this, graph.add(new StoreFieldNode(newInstance, virtual.field(i), values.get(i))));
                 }
@@ -98,14 +96,14 @@
             ResolvedJavaType element = virtual.componentType();
             NewArrayNode newArray;
             if (element.getKind() == Kind.Object) {
-                newArray = graph.add(new NewObjectArrayNode(element, ConstantNode.forInt(virtual.entryCount(), graph), defaultEntries, lockCount > 0));
+                newArray = graph.add(new NewObjectArrayNode(element, ConstantNode.forInt(virtual.entryCount(), graph), defaultValuesOnly, lockCount > 0));
             } else {
-                newArray = graph.add(new NewPrimitiveArrayNode(element, ConstantNode.forInt(virtual.entryCount(), graph), defaultEntries, lockCount > 0));
+                newArray = graph.add(new NewPrimitiveArrayNode(element, ConstantNode.forInt(virtual.entryCount(), graph), defaultValuesOnly, lockCount > 0));
             }
             this.replaceAtUsages(newArray);
             graph.addBeforeFixed(this, newArray);
 
-            if (!defaultEntries) {
+            if (!defaultValuesOnly) {
                 for (int i = 0; i < virtual.entryCount(); i++) {
                     graph.addBeforeFixed(this, graph.add(new StoreIndexedNode(newArray, ConstantNode.forInt(i, graph), element.getKind(), values.get(i))));
                 }