# HG changeset patch
# User Bernhard Urban <bernhard.urban@jku.at>
# Date 1398281011 -7200
# Node ID 5b29e4b54f2e051ce0acb8ddac58401c277c6734
# Parent  947dea972b664fe4b38e5db451e65d4af82d2d34# Parent  3994ff31091da90a776053e19e59cd8cb08c6e00
Merge

diff -r 947dea972b66 -r 5b29e4b54f2e 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	Wed Apr 23 21:01:40 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Wed Apr 23 21:23:31 2014 +0200
@@ -241,7 +241,6 @@
         if (inliningPerformed) {
             return;
         }
-        inliningPerformed = true;
         TruffleInliningHandler handler = new TruffleInliningHandler(new DefaultInliningPolicy());
         TruffleInliningResult result = handler.decideInlining(this, 0);
         performInlining(result);
@@ -249,6 +248,10 @@
     }
 
     private static void performInlining(TruffleInliningResult result) {
+        if (result.getCallTarget().inliningPerformed) {
+            return;
+        }
+        result.getCallTarget().inliningPerformed = true;
         for (TruffleInliningProfile profile : result) {
             profile.getCallNode().inline();
             TruffleInliningResult recursiveResult = profile.getRecursiveResult();
diff -r 947dea972b66 -r 5b29e4b54f2e graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInliningHandler.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInliningHandler.java	Wed Apr 23 21:01:40 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInliningHandler.java	Wed Apr 23 21:23:31 2014 +0200
@@ -94,7 +94,7 @@
         int deepNodeCount;
         TruffleInliningResult recursiveResult;
         boolean recursiveCall = false;
-        if (depth > MAXIMUM_RECURSIVE_DEPTH) {
+        if (target.inliningPerformed || depth > MAXIMUM_RECURSIVE_DEPTH) {
             deepNodeCount = OptimizedCallUtils.countNonTrivialNodes(target, true);
             recursiveResult = null;
         } else {