1.1 --- a/src/share/vm/runtime/compilationPolicy.hpp Fri Jul 01 10:35:54 2011 -0700 1.2 +++ b/src/share/vm/runtime/compilationPolicy.hpp Fri Jul 01 10:37:37 2011 -0700 1.3 @@ -62,7 +62,7 @@ 1.4 virtual int compiler_count(CompLevel comp_level) = 0; 1.5 // main notification entry, return a pointer to an nmethod if the OSR is required, 1.6 // returns NULL otherwise. 1.7 - virtual nmethod* event(methodHandle method, methodHandle inlinee, int branch_bci, int bci, CompLevel comp_level, TRAPS) = 0; 1.8 + virtual nmethod* event(methodHandle method, methodHandle inlinee, int branch_bci, int bci, CompLevel comp_level, nmethod* nm, TRAPS) = 0; 1.9 // safepoint() is called at the end of the safepoint 1.10 virtual void do_safepoint_work() = 0; 1.11 // reprofile request 1.12 @@ -80,6 +80,7 @@ 1.13 virtual bool is_mature(methodOop method) = 0; 1.14 // Do policy initialization 1.15 virtual void initialize() = 0; 1.16 + virtual bool should_not_inline(ciEnv* env, ciMethod* method) { return false; } 1.17 }; 1.18 1.19 // A base class for baseline policies. 1.20 @@ -101,7 +102,7 @@ 1.21 virtual bool is_mature(methodOop method); 1.22 virtual void initialize(); 1.23 virtual CompileTask* select_task(CompileQueue* compile_queue); 1.24 - virtual nmethod* event(methodHandle method, methodHandle inlinee, int branch_bci, int bci, CompLevel comp_level, TRAPS); 1.25 + virtual nmethod* event(methodHandle method, methodHandle inlinee, int branch_bci, int bci, CompLevel comp_level, nmethod* nm, TRAPS); 1.26 virtual void method_invocation_event(methodHandle m, TRAPS) = 0; 1.27 virtual void method_back_branch_event(methodHandle m, int bci, TRAPS) = 0; 1.28 };