Mercurial > hg > truffle
changeset 16833:445f6456c4a5
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Thu, 14 Aug 2014 16:49:45 +0200 |
parents | 13cf9b6b325c (current diff) 217eee2ddead (diff) |
children | 21e0ab3c1395 |
files | |
diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Thu Aug 14 16:49:18 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java Thu Aug 14 16:49:45 2014 +0200 @@ -378,6 +378,10 @@ if (c.dontCompileHugeMethods && javaMethod.getCodeSize() > c.hugeMethodLimit) { return false; } + // Allow use of -XX:CompileCommand=dontinline to exclude problematic methods + if (!javaMethod.canBeInlined()) { + return false; + } // Skip @Snippets for now if (javaMethod.getAnnotation(Snippet.class) != null) { return false;