diff src/share/vm/c1/c1_GraphBuilder.cpp @ 12336:5186dcaca431

Merge
author jiangli
date Fri, 27 Sep 2013 13:53:43 -0400
parents 1b64d46620a3
children cefad50507d8 d13d7aba8c12
line wrap: on
line diff
--- a/src/share/vm/c1/c1_GraphBuilder.cpp	Fri Sep 27 13:49:57 2013 -0400
+++ b/src/share/vm/c1/c1_GraphBuilder.cpp	Fri Sep 27 13:53:43 2013 -0400
@@ -4219,7 +4219,9 @@
     }
   }
 
-  if (!PrintInlining)  return;
+  if (!PrintInlining && !compilation()->method()->has_option("PrintInlining")) {
+    return;
+  }
   CompileTask::print_inlining(callee, scope()->level(), bci(), msg);
   if (success && CIPrintMethodCodes) {
     callee->print_codes();