Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/c1/c1_GraphBuilder.cpp	Wed Jul 11 14:50:30 2012 -0700
     1.2 +++ b/src/share/vm/c1/c1_GraphBuilder.cpp	Thu Jul 12 00:39:53 2012 -0700
     1.3 @@ -3505,8 +3505,10 @@
     1.4    }
     1.5  
     1.6    // now perform tests that are based on flag settings
     1.7 -  if (callee->should_inline()) {
     1.8 +  if (callee->force_inline() || callee->should_inline()) {
     1.9      // ignore heuristic controls on inlining
    1.10 +    if (callee->force_inline())
    1.11 +      CompileTask::print_inlining(callee, scope()->level(), bci(), "force inline by annotation");
    1.12    } else {
    1.13      if (inline_level() > MaxInlineLevel                         ) INLINE_BAILOUT("too-deep inlining");
    1.14      if (recursive_inline_level(callee) > MaxRecursiveInlineLevel) INLINE_BAILOUT("too-deep recursive inlining");
    1.15 @@ -3531,7 +3533,7 @@
    1.16    }
    1.17  
    1.18  #ifndef PRODUCT
    1.19 -      // printing
    1.20 +  // printing
    1.21    if (PrintInlining) {
    1.22      print_inline_result(callee, true);
    1.23    }