Mercurial > hg > truffle
changeset 2917:9d80049e76bd
Fix created node count metric, Fix wrong asserts in graalVMExits & FloatAdd
| author | Gilles Duboscq <gilles.duboscq@oracle.com> |
|---|---|
| date | Wed, 08 Jun 2011 21:21:12 +0200 |
| parents | d6cfe798a265 |
| children | e7ba2bad98fb |
| files | graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatAdd.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/Phase.java src/share/vm/graal/graalVMExits.cpp |
| diffstat | 3 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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);
--- 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;