Mercurial > hg > graal-compiler

diff src/share/vm/c1/c1_GraphBuilder.cpp @ 6222:6d8f36bcef55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6711908: JVM needs direct access to some annotations Summary: Add annotation extraction code to class file parser. Reviewed-by: twisti, jrose, kvn Contributed-by: michael.haupt@oracle.com
author jrose
date Thu, 12 Jul 2012 00:39:53 -0700
parents 8b0a4867acf0
children 1d7922586cf6
line wrap: on
line diff
--- a/src/share/vm/c1/c1_GraphBuilder.cpp	Wed Jul 11 14:50:30 2012 -0700
+++ b/src/share/vm/c1/c1_GraphBuilder.cpp	Thu Jul 12 00:39:53 2012 -0700
@@ -3505,8 +3505,10 @@
   }
 
   // now perform tests that are based on flag settings
-  if (callee->should_inline()) {
+  if (callee->force_inline() || callee->should_inline()) {
     // ignore heuristic controls on inlining
+    if (callee->force_inline())
+      CompileTask::print_inlining(callee, scope()->level(), bci(), "force inline by annotation");
   } else {
     if (inline_level() > MaxInlineLevel                         ) INLINE_BAILOUT("too-deep inlining");
     if (recursive_inline_level(callee) > MaxRecursiveInlineLevel) INLINE_BAILOUT("too-deep recursive inlining");
@@ -3531,7 +3533,7 @@
   }
 
 #ifndef PRODUCT
-      // printing
+  // printing
   if (PrintInlining) {
     print_inline_result(callee, true);
   }