# HG changeset patch
# User Andreas Woess <andreas.woess@jku.at>
# Date 1372033154 -7200
# Node ID 175a4900c2302eb2ad0cd93c61f9483178cfec77
# Parent  77016aeda39a8b0b740ae24f252cf0c3be468534
OptimizedCallTarget: always disable compilation on exception; cleanup

diff -r 77016aeda39a -r 175a4900c230 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	Sun Jun 23 16:35:17 2013 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Mon Jun 24 02:19:14 2013 +0200
@@ -96,12 +96,10 @@
                             invokeCounter = 2;
                             loopAndInvokeCounter = inliningReprofileCount;
                             originalInvokeCounter = inliningReprofileCount;
-                        } else {
-                            compile();
+                            continue;
                         }
-                    } else {
-                        compile();
                     }
+                    compile();
                 }
             }
         }
@@ -125,13 +123,10 @@
                 }
             }
         } catch (Throwable e) {
-            invokeCounter = Integer.MAX_VALUE;
-            loopAndInvokeCounter = Integer.MAX_VALUE;
+            disableCompilation = true;
             if (TraceTruffleCompilation.getValue()) {
                 if (e instanceof BailoutException) {
-                    disableCompilation = true;
-                    BailoutException bailoutException = (BailoutException) e;
-                    OUT.printf("[truffle] opt bailout %-48s  %s\n", rootNode, bailoutException.getMessage());
+                    OUT.printf("[truffle] opt bailout %-48s  %s\n", rootNode, e.getMessage());
                 } else {
                     OUT.printf("[truffle] opt failed %-49s  %s\n", rootNode, e.toString());
                     if (TraceTruffleCompilationExceptions.getValue()) {