1.1 --- a/src/share/vm/runtime/compilationPolicy.hpp Thu Jan 26 16:49:22 2012 +0100 1.2 +++ b/src/share/vm/runtime/compilationPolicy.hpp Thu Jan 26 12:15:24 2012 -0800 1.3 @@ -64,7 +64,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, nmethod* nm, TRAPS) = 0; 1.8 + virtual nmethod* event(methodHandle method, methodHandle inlinee, int branch_bci, int bci, CompLevel comp_level, nmethod* nm, JavaThread* thread) = 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 @@ -105,15 +105,15 @@ 1.13 virtual bool is_mature(methodOop method); 1.14 virtual void initialize(); 1.15 virtual CompileTask* select_task(CompileQueue* compile_queue); 1.16 - virtual nmethod* event(methodHandle method, methodHandle inlinee, int branch_bci, int bci, CompLevel comp_level, nmethod* nm, TRAPS); 1.17 - virtual void method_invocation_event(methodHandle m, TRAPS) = 0; 1.18 - virtual void method_back_branch_event(methodHandle m, int bci, TRAPS) = 0; 1.19 + virtual nmethod* event(methodHandle method, methodHandle inlinee, int branch_bci, int bci, CompLevel comp_level, nmethod* nm, JavaThread* thread); 1.20 + virtual void method_invocation_event(methodHandle m, JavaThread* thread) = 0; 1.21 + virtual void method_back_branch_event(methodHandle m, int bci, JavaThread* thread) = 0; 1.22 }; 1.23 1.24 class SimpleCompPolicy : public NonTieredCompPolicy { 1.25 public: 1.26 - virtual void method_invocation_event(methodHandle m, TRAPS); 1.27 - virtual void method_back_branch_event(methodHandle m, int bci, TRAPS); 1.28 + virtual void method_invocation_event(methodHandle m, JavaThread* thread); 1.29 + virtual void method_back_branch_event(methodHandle m, int bci, JavaThread* thread); 1.30 }; 1.31 1.32 // StackWalkCompPolicy - existing C2 policy 1.33 @@ -121,8 +121,8 @@ 1.34 #ifdef COMPILER2 1.35 class StackWalkCompPolicy : public NonTieredCompPolicy { 1.36 public: 1.37 - virtual void method_invocation_event(methodHandle m, TRAPS); 1.38 - virtual void method_back_branch_event(methodHandle m, int bci, TRAPS); 1.39 + virtual void method_invocation_event(methodHandle m, JavaThread* thread); 1.40 + virtual void method_back_branch_event(methodHandle m, int bci, JavaThread* thread); 1.41 1.42 private: 1.43 RFrame* findTopInlinableFrame(GrowableArray<RFrame*>* stack);