# HG changeset patch
# User Christian Humer <christian.humer@gmail.com>
# Date 1408027785 -7200
# Node ID 445f6456c4a5005586e5eeb2ff642278a640fc50
# Parent  13cf9b6b325c2adb806147213f847711f06d68a1# Parent  217eee2ddead7ed6b97ae3dbab20fb9fd799eff3
Merge.

diff -r 13cf9b6b325c -r 445f6456c4a5 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java
--- 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;