# HG changeset patch
# User Gilles Duboscq <gilles.duboscq@oracle.com>
# Date 1307560872 -7200
# Node ID 9d80049e76bd3433bb26e082dd4885e94ddcda03
# Parent  d6cfe798a2654465369a70be2f920e5370af9c77
Fix created node count metric, Fix wrong asserts in graalVMExits & FloatAdd

diff -r d6cfe798a265 -r 9d80049e76bd graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatAdd.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatAdd.java	Wed Jun 08 18:57:33 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatAdd.java	Wed Jun 08 21:21:12 2011 +0200
@@ -83,7 +83,7 @@
                         return x;
                     }
                 } else {
-                    assert kind == CiKind.Long;
+                    assert kind == CiKind.Double;
                     double c = y.asConstant().asDouble();
                     if (c == 0.0) {
                         return x;
diff -r d6cfe798a265 -r 9d80049e76bd graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/Phase.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/Phase.java	Wed Jun 08 18:57:33 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/Phase.java	Wed Jun 08 21:21:12 2011 +0200
@@ -62,7 +62,7 @@
         }
         if (GraalOptions.Meter) {
             int deletedNodeCount = graph.getDeletedNodeCount() - startDeletedNodeCount;
-            int createdNodeCount = graph.getNodeCount() - startNodeCount;
+            int createdNodeCount = graph.getNodeCount() - startNodeCount + deletedNodeCount;
             GraalMetrics.get(getName().concat(".executed")).increment();
             GraalMetrics.get(getName().concat(".deletedNodes")).increment(deletedNodeCount);
             GraalMetrics.get(getName().concat(".createdNodes")).increment(createdNodeCount);
diff -r d6cfe798a265 -r 9d80049e76bd src/share/vm/graal/graalVMExits.cpp
--- a/src/share/vm/graal/graalVMExits.cpp	Wed Jun 08 18:57:33 2011 +0200
+++ b/src/share/vm/graal/graalVMExits.cpp	Wed Jun 08 21:21:12 2011 +0200
@@ -111,7 +111,6 @@
 }
 
 void VMExits::shutdownCompiler() {
-  assert(!name.is_null(), "just checking");
   JavaThread* THREAD = JavaThread::current();
   JavaValue result(T_VOID);
   JavaCallArguments args;