Mercurial > hg > graal-jvmci-8
changeset 10683:ae4c79ee71d1
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 09 Jul 2013 22:05:40 +0200 |
parents | 725922588833 (diff) 311abd52ffeb (current diff) |
children | 6ff467cdb105 d2055a110396 |
files | |
diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCache.java Tue Jul 09 21:20:03 2013 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCache.java Tue Jul 09 22:05:40 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()) {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java Tue Jul 09 21:20:03 2013 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java Tue Jul 09 22:05:40 2013 +0200 @@ -56,7 +56,7 @@ @Option(help = "") public static final OptionValue<Integer> TruffleOperationCacheMaxNodes = new OptionValue<>(200); @Option(help = "") - public static final OptionValue<Integer> TruffleGraphMaxNodes = new OptionValue<>(10000); + public static final OptionValue<Integer> TruffleGraphMaxNodes = new OptionValue<>(12000); // tracing @Option(help = "")