Mercurial > hg > graal-compiler

changeset 10489:175a4900c230

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OptimizedCallTarget: always disable compilation on exception; cleanup
author Andreas Woess <andreas.woess@jku.at>
date Mon, 24 Jun 2013 02:19:14 +0200
parents 77016aeda39a
children dcbdf71c4507
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java
diffstat 1 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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()) {