# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1375433235 -7200
# Node ID b2418691c7cb55463c7c617564c13c2393adbcb9
# Parent  acc261dc165ec0aa189473f38ae3e0eb197bd266
Move cleaning of TypeProfileProxyNode into a compiler phase.

diff -r acc261dc165e -r b2418691c7cb graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java	Fri Aug 02 10:40:33 2013 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java	Fri Aug 02 10:47:15 2013 +0200
@@ -163,7 +163,6 @@
                 }
             }
         }
-        TypeProfileProxyNode.cleanFromGraph(graph);
 
         suites.getHighTier().apply(graph, highTierContext);
 
diff -r acc261dc165e -r b2418691c7cb graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/HighTier.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/HighTier.java	Fri Aug 02 10:40:33 2013 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/HighTier.java	Fri Aug 02 10:47:15 2013 +0200
@@ -36,6 +36,8 @@
     public HighTier() {
         CanonicalizerPhase canonicalizer = new CanonicalizerPhase(!AOTCompilation.getValue());
 
+        appendPhase(new CleanTypeProfileProxyPhase());
+
         if (FullUnroll.getValue()) {
             appendPhase(new LoopFullUnrollPhase(!AOTCompilation.getValue()));
         }
diff -r acc261dc165e -r b2418691c7cb graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/TypeProfileProxyNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/TypeProfileProxyNode.java	Fri Aug 02 10:40:33 2013 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/TypeProfileProxyNode.java	Fri Aug 02 10:47:15 2013 +0200
@@ -118,13 +118,6 @@
         return this;
     }
 
-    public static void cleanFromGraph(StructuredGraph graph) {
-        for (TypeProfileProxyNode proxy : graph.getNodes(TypeProfileProxyNode.class)) {
-            graph.replaceFloating(proxy, proxy.getObject());
-        }
-        assert graph.getNodes(TypeProfileProxyNode.class).count() == 0;
-    }
-
     @Override
     public ValueNode getOriginalValue() {
         return object;
diff -r acc261dc165e -r b2418691c7cb graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CleanTypeProfileProxyPhase.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CleanTypeProfileProxyPhase.java	Fri Aug 02 10:47:15 2013 +0200
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.graal.phases.common;
+
+import com.oracle.graal.nodes.*;
+import com.oracle.graal.phases.*;
+
+public class CleanTypeProfileProxyPhase extends Phase {
+
+    @Override
+    protected void run(StructuredGraph graph) {
+        for (TypeProfileProxyNode proxy : graph.getNodes(TypeProfileProxyNode.class)) {
+            graph.replaceFloating(proxy, proxy.getObject());
+        }
+        assert graph.getNodes(TypeProfileProxyNode.class).count() == 0;
+    }
+}