Mercurial > hg > graal-compiler

changeset 3076:36b6bb73a5cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed locationToRead array.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Mon, 27 Jun 2011 17:38:43 +0200
parents 3ada297d75ed
children 169287a814ae
files graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/MemoryPhase.java
diffstat 1 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/MemoryPhase.java	Mon Jun 27 13:29:53 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/MemoryPhase.java	Mon Jun 27 17:38:43 2011 +0200
@@ -48,9 +48,9 @@
             for (Entry<Object, Node> e : memoryMap.locationToWrite.entrySet()) {
                 locationToWrite.put(e.getKey(), e.getValue());
             }
-            for (Entry<Object, List<Node>> e : memoryMap.locationToReads.entrySet()) {
-                locationToReads.put(e.getKey(), new ArrayList<Node>(e.getValue()));
-            }
+//            for (Entry<Object, List<Node>> e : memoryMap.locationToReads.entrySet()) {
+//                locationToReads.put(e.getKey(), new ArrayList<Node>(e.getValue()));
+//            }
             lastReadWriteMerge = memoryMap.lastReadWriteMerge;
             lastWriteMerge = memoryMap.lastWriteMerge;
         }
@@ -96,11 +96,11 @@
                 locationToWrite.remove(o);
             }
 
-            for (Entry<Object, List<Node>> e : memoryMap.locationToReads.entrySet()) {
-                for (Node n : e.getValue()) {
-                    addRead(n, e.getKey());
-                }
-            }
+//            for (Entry<Object, List<Node>> e : memoryMap.locationToReads.entrySet()) {
+//                for (Node n : e.getValue()) {
+//                    addRead(n, e.getKey());
+//                }
+//            }
 
             mergeOperations++;
         }
@@ -138,7 +138,7 @@
                 memMerge.mergedNodes().add(writeEntry.getValue());
 
                 // Register the merge point as a read such that subsequent writes to this location will depend on it (but subsequent reads do not).
-                addRead(memMerge, writeEntry.getKey());
+//                addRead(memMerge, writeEntry.getKey());
             }
             lastWriteMerge = memMerge;
         }
@@ -155,9 +155,9 @@
             locationToWrite.clear();
 
             // Merge in all reads.
-            for (Entry<Object, List<Node>> readEntry : locationToReads.entrySet()) {
-                memMerge.mergedNodes().addAll(readEntry.getValue());
-            }
+//            for (Entry<Object, List<Node>> readEntry : locationToReads.entrySet()) {
+//                memMerge.mergedNodes().addAll(readEntry.getValue());
+//            }
             locationToReads.clear();
             lastWriteMerge = memMerge;
             lastReadWriteMerge = memMerge;
@@ -170,12 +170,12 @@
             }
 
             boolean connectionAdded = false;
-            if (locationToReads.containsKey(location)) {
-                for (Node prevRead : locationToReads.get(location)) {
-                    node.inputs().variablePart().add(prevRead);
-                    connectionAdded = true;
-                }
-            }
+//            if (locationToReads.containsKey(location)) {
+//                for (Node prevRead : locationToReads.get(location)) {
+//                    node.inputs().variablePart().add(prevRead);
+//                    connectionAdded = true;
+//                }
+//            }
 
             if (!connectionAdded) {
                 if (locationToWrite.containsKey(location)) {