Mercurial > hg > graal-compiler
changeset 13806:0a20f43a4a78
Merge fixes.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Tue, 28 Jan 2014 13:36:16 +0100 |
parents | 739194d1e813 |
children | 533b21375e58 |
files | graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInliningImpl.java |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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,
--- 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(); }