changeset 14885:000c283d7b71

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sun, 30 Mar 2014 16:08:33 +0200
parents 1617b1e25d31 (diff) 1415a62ac8b2 (current diff)
children f02fc7294a1d
files graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/ExternalCompilationResult.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCache.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/UnexpectedResultExceptionSubstitutions.java graal/findbugsExcludeFilter.xml src/gpu/hsail/vm/hsailKernelArguments.cpp
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/NodesToDoubles.java	Sat Mar 29 00:28:49 2014 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/NodesToDoubles.java	Sun Mar 30 16:08:33 2014 +0200
@@ -48,4 +48,8 @@
         assert value != null;
         return value;
     }
+
+    public int getCount() {
+        return nodeProbabilities.size();
+    }
 }