# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1326707994 -3600
# Node ID f9552a2593635c94bc7e80cf84b71d2005f9c437
# Parent  dd67881406c26541783820575a715e4d47f503a2# Parent  1339f1817d285700b606b03ee5d12e92fa5c5cba
Merge

diff -r 1339f1817d28 -r f9552a259363 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompiler.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompiler.java	Fri Jan 13 16:26:37 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompiler.java	Mon Jan 16 10:59:54 2012 +0100
@@ -219,6 +219,11 @@
 
             if (GraalOptions.Lower) {
                 new FloatingReadPhase().apply(graph, context);
+
+                if (GraalOptions.OptGVN) {
+                    new GlobalValueNumberingPhase().apply(graph, context);
+                }
+
                 if (GraalOptions.OptReadElimination) {
                     new ReadEliminationPhase().apply(graph, context);
                 }
diff -r 1339f1817d28 -r f9552a259363 mxtool/mx.py
--- a/mxtool/mx.py	Fri Jan 13 16:26:37 2012 +0100
+++ b/mxtool/mx.py	Mon Jan 16 10:59:54 2012 +0100
@@ -1189,6 +1189,16 @@
         doc = doc.format(*fmtArgs)
     print 'mx {0} {1}\n\n{2}\n'.format(name, usage, doc)
 
+def projectgraph(args, suite=None):
+    """create dot graph for project structure ("mx projectgraph | dot -Tpdf -oprojects.pdf")"""
+    
+    print 'digraph projects {'
+    print 'rankdir=BT;'
+    print 'node [shape=rect];'
+    for p in projects():
+        for dep in p.canonical_deps():
+            print '"' + p.name + '"->"' + dep + '"'
+    print '}'
 
 def eclipseinit(args, suite=None):
     """(re)generate Eclipse project configurations"""
@@ -1585,6 +1595,7 @@
     'help': [help_, '[command]'],
     'ideclean': [ideclean, ''],
     'ideinit': [ideinit, ''],
+    'projectgraph': [projectgraph, ''],
     'javap': [javap, ''],
     'netbeansinit': [netbeansinit, ''],
     'projects': [show_projects, ''],