1.1 --- a/src/share/vm/runtime/simpleThresholdPolicy.hpp Thu Jan 26 16:49:22 2012 +0100 1.2 +++ b/src/share/vm/runtime/simpleThresholdPolicy.hpp Thu Jan 26 12:15:24 2012 -0800 1.3 @@ -67,9 +67,9 @@ 1.4 // Print policy-specific information if necessary 1.5 virtual void print_specific(EventType type, methodHandle mh, methodHandle imh, int bci, CompLevel level) { } 1.6 // Check if the method can be compiled, change level if necessary 1.7 - void compile(methodHandle mh, int bci, CompLevel level, TRAPS); 1.8 + void compile(methodHandle mh, int bci, CompLevel level, JavaThread* thread); 1.9 // Submit a given method for compilation 1.10 - virtual void submit_compile(methodHandle mh, int bci, CompLevel level, TRAPS); 1.11 + virtual void submit_compile(methodHandle mh, int bci, CompLevel level, JavaThread* thread); 1.12 // Simple methods are as good being compiled with C1 as C2. 1.13 // This function tells if it's such a function. 1.14 inline bool is_trivial(methodOop method); 1.15 @@ -88,9 +88,9 @@ 1.16 return CompLevel_none; 1.17 } 1.18 virtual void method_invocation_event(methodHandle method, methodHandle inlinee, 1.19 - CompLevel level, nmethod* nm, TRAPS); 1.20 + CompLevel level, nmethod* nm, JavaThread* thread); 1.21 virtual void method_back_branch_event(methodHandle method, methodHandle inlinee, 1.22 - int bci, CompLevel level, nmethod* nm, TRAPS); 1.23 + int bci, CompLevel level, nmethod* nm, JavaThread* thread); 1.24 public: 1.25 SimpleThresholdPolicy() : _c1_count(0), _c2_count(0) { } 1.26 virtual int compiler_count(CompLevel comp_level) { 1.27 @@ -104,7 +104,7 @@ 1.28 virtual void disable_compilation(methodOop method) { } 1.29 virtual void reprofile(ScopeDesc* trap_scope, bool is_osr); 1.30 virtual nmethod* event(methodHandle method, methodHandle inlinee, 1.31 - int branch_bci, int bci, CompLevel comp_level, nmethod* nm, TRAPS); 1.32 + int branch_bci, int bci, CompLevel comp_level, nmethod* nm, JavaThread* thread); 1.33 // Select task is called by CompileBroker. We should return a task or NULL. 1.34 virtual CompileTask* select_task(CompileQueue* compile_queue); 1.35 // Tell the runtime if we think a given method is adequately profiled.