Mercurial > hg > truffle
changeset 15215:ca250afc78ec
Simplification of OptimizedCallTarget.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Thu, 17 Apr 2014 22:14:29 +0200 |
parents | bf37ce7df3fd |
children | d59f48be0ed6 |
files | graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java |
diffstat | 1 files changed, 4 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java Thu Apr 17 21:50:14 2014 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java Thu Apr 17 22:14:29 2014 +0200 @@ -82,15 +82,12 @@ @TruffleCallBoundary private Object callBoundary(Object[] args) { if (CompilerDirectives.inInterpreter()) { - return compiledCallFallback(args); + // We are called and we are still in Truffle interpreter mode. + interpreterCall(); } else { // We come here from compiled code (i.e., we have been inlined). - return executeHelper(args); } - } - - private Object compiledCallFallback(Object[] args) { - return interpreterCall(args); + return executeHelper(args); } @Override @@ -115,7 +112,7 @@ } } - private Object interpreterCall(Object[] args) { + private void interpreterCall() { CompilerAsserts.neverPartOfCompilation(); compilationProfile.reportInterpreterCall(); if (TruffleCallTargetProfiling.getValue()) { @@ -124,11 +121,7 @@ if (compilationPolicy.shouldCompile(compilationProfile)) { compile(); - if (isValid()) { - return call(args); - } } - return executeHelper(args); } public void compile() {