# HG changeset patch
# User Christian Humer <christian.humer@gmail.com>
# Date 1390912576 -3600
# Node ID 0a20f43a4a784067b75e3cebb774f8a544fca508
# Parent  739194d1e813733b1d4435d9d9821d73bdc5590f
Merge fixes.

diff -r 739194d1e813 -r 0a20f43a4a78 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Tue Jan 28 12:55:06 2014 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Tue Jan 28 13:36:16 2014 +0100
@@ -261,8 +261,8 @@
             }
 
             int notInlinedCallSiteCount = TruffleInliningImpl.getInlinableCallSites(callTarget).size();
-            int nodeCount = NodeUtil.countNodes(callTarget.rootNode);
-            int inlinedCallSiteCount = countInlinedNodes(callTarget.rootNode);
+            int nodeCount = NodeUtil.countNodes(callTarget.getRootNode());
+            int inlinedCallSiteCount = countInlinedNodes(callTarget.getRootNode());
             String comment = callTarget.installedCode == null ? " int" : "";
             comment += callTarget.compilationEnabled ? "" : " fail";
             OUT.printf("%-50s | %10d | %15d | %15d | %10d | %3d%s\n", callTarget.getRootNode(), callTarget.callCount, inlinedCallSiteCount, notInlinedCallSiteCount, nodeCount,
diff -r 739194d1e813 -r 0a20f43a4a78 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInliningImpl.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInliningImpl.java	Tue Jan 28 12:55:06 2014 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInliningImpl.java	Tue Jan 28 13:36:16 2014 +0100
@@ -166,7 +166,7 @@
             assert callSite.isInlinable();
             this.callSite = callSite;
             this.callCount = CallNode.internalGetCallCount(callSite);
-            DefaultCallTarget target = (DefaultCallTarget) callSite.getCallTarget();
+            RootCallTarget target = (RootCallTarget) callSite.getCallTarget();
             this.nodeCount = target.getRootNode().getInlineNodeCount();
             this.recursiveDepth = calculateRecursiveDepth();
         }