# HG changeset patch # User Thomas Wuerthinger # Date 1309189123 -7200 # Node ID 36b6bb73a5cfc4224de4bbbe71cede164e0931e7 # Parent 3ada297d75ed8bcb72c3edac8affad5c0b55ba28 Removed locationToRead array. diff -r 3ada297d75ed -r 36b6bb73a5cf graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/MemoryPhase.java --- 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 e : memoryMap.locationToWrite.entrySet()) { locationToWrite.put(e.getKey(), e.getValue()); } - for (Entry> e : memoryMap.locationToReads.entrySet()) { - locationToReads.put(e.getKey(), new ArrayList(e.getValue())); - } +// for (Entry> e : memoryMap.locationToReads.entrySet()) { +// locationToReads.put(e.getKey(), new ArrayList(e.getValue())); +// } lastReadWriteMerge = memoryMap.lastReadWriteMerge; lastWriteMerge = memoryMap.lastWriteMerge; } @@ -96,11 +96,11 @@ locationToWrite.remove(o); } - for (Entry> e : memoryMap.locationToReads.entrySet()) { - for (Node n : e.getValue()) { - addRead(n, e.getKey()); - } - } +// for (Entry> 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> readEntry : locationToReads.entrySet()) { - memMerge.mergedNodes().addAll(readEntry.getValue()); - } +// for (Entry> 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)) {