# HG changeset patch # User Thomas Wuerthinger # Date 1373399630 -7200 # Node ID 72592258883389cfd4bce8025a0b6d2e8e7935c5 # Parent 759415ed915a5a2e65c85752105272a58d8f3057 Fix Truffle cache inlining strategy to skip exception edges. diff -r 759415ed915a -r 725922588833 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCache.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCache.java Tue Jul 09 20:09:24 2013 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCache.java Tue Jul 09 21:53:50 2013 +0200 @@ -210,7 +210,10 @@ } } - if (next instanceof ControlSplitNode) { + if (next instanceof InvokeWithExceptionNode) { + InvokeWithExceptionNode invokeWithExceptionNode = (InvokeWithExceptionNode) next; + next = invokeWithExceptionNode.next(); + } else if (next instanceof ControlSplitNode) { ControlSplitNode controlSplitNode = (ControlSplitNode) next; AbstractBeginNode maxProbNode = null; for (Node succ : controlSplitNode.cfgSuccessors()) { diff -r 759415ed915a -r 725922588833 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java Tue Jul 09 20:09:24 2013 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java Tue Jul 09 21:53:50 2013 +0200 @@ -56,7 +56,7 @@ @Option(help = "") public static final OptionValue TruffleOperationCacheMaxNodes = new OptionValue<>(200); @Option(help = "") - public static final OptionValue TruffleGraphMaxNodes = new OptionValue<>(10000); + public static final OptionValue TruffleGraphMaxNodes = new OptionValue<>(12000); // tracing @Option(help = "")