diff -r 08222df07d0d -r 0712796e4039 hotspot/src/share/vm/compiler/compileBroker.hpp --- a/hotspot/src/share/vm/compiler/compileBroker.hpp Tue Oct 20 13:36:20 2015 +0000 +++ b/hotspot/src/share/vm/compiler/compileBroker.hpp Tue Oct 20 18:07:28 2015 +0200 @@ -28,8 +28,10 @@ #include "ci/compilerInterface.hpp" #include "compiler/abstractCompiler.hpp" #include "compiler/compileTask.hpp" +#include "compiler/compilerDirectives.hpp" #include "runtime/perfData.hpp" #include "trace/tracing.hpp" +#include "utilities/stack.hpp" class nmethod; class nmethodLocker; @@ -129,13 +131,12 @@ ~CompileTaskWrapper(); }; - // Compilation // // The broker for all compilation requests. class CompileBroker: AllStatic { friend class Threads; - friend class CompileTaskWrapper; + friend class CompileTaskWrapper; public: enum { @@ -238,7 +239,6 @@ static void set_last_compile(CompilerThread *thread, methodHandle method, bool is_osr, int comp_level); static void push_jni_handle_block(); static void pop_jni_handle_block(); - static bool check_break_at(methodHandle method, int compile_id, bool is_osr); static void collect_statistics(CompilerThread* thread, elapsedTimer time, CompileTask* task); static void compile_method_base(methodHandle method, @@ -253,7 +253,11 @@ static bool init_compiler_runtime(); static void shutdown_compiler_runtime(AbstractCompiler* comp, CompilerThread* thread); - public: +public: + + static DirectivesStack* dirstack(); + static void set_dirstack(DirectivesStack* stack); + enum { // The entry bci used for non-OSR compilations. standard_entry_bci = InvocationEntryBci @@ -267,6 +271,7 @@ static bool compilation_is_in_queue(methodHandle method); static void print_compile_queues(outputStream* st); + static void print_directives(outputStream* st); static int queue_size(int comp_level) { CompileQueue *q = compile_queue(comp_level); return q != NULL ? q->size() : 0;