# HG changeset patch
# User Christian Humer <christian.humer@gmail.com>
# Date 1398278999 -7200
# Node ID 3994ff31091da90a776053e19e59cd8cb08c6e00
# Parent  265c47be2308150b11f7c9a731f7e966895205ed# Parent  5e544920ad9f40f6d3df4b6d25578ffa6b4f9257
Merge.

diff -r 5e544920ad9f -r 3994ff31091d 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 13:18:58 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Wed Apr 23 20:49:59 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 5e544920ad9f -r 3994ff31091d 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 13:18:58 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInliningHandler.java	Wed Apr 23 20:49:59 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 {