--- old/src/share/vm/opto/compile.cpp	2016-02-10 10:49:53.009356849 +0100
+++ new/src/share/vm/opto/compile.cpp	2016-02-10 10:49:52.881356844 +0100
@@ -625,10 +625,10 @@
 
 
 Compile::Compile( ciEnv* ci_env, C2Compiler* compiler, ciMethod* target, int osr_bci,
-                  bool subsume_loads, bool do_escape_analysis, bool eliminate_boxing, DirectiveSet* directive)
+                  bool subsume_loads, bool do_escape_analysis, bool eliminate_boxing)
                 : Phase(Compiler),
                   _env(ci_env),
-                  _directive(directive),
+                  _directive(ci_env->directive()),
                   _log(ci_env->log()),
                   _compile_id(ci_env->compile_id()),
                   _save_argument_registers(false),
@@ -658,7 +658,7 @@
                   _dead_node_list(comp_arena()),
                   _dead_node_count(0),
 #ifndef PRODUCT
-                  _trace_opto_output(directive->TraceOptoOutputOption),
+                  _trace_opto_output(ci_env->directive()->TraceOptoOutputOption),
                   _in_dump_cnt(0),
                   _printer(IdealGraphPrinter::printer()),
 #endif
@@ -701,9 +701,9 @@
   TraceTime t2(NULL, &_t_methodCompilation, CITime, false);
 
 #ifndef PRODUCT
-  bool print_opto_assembly = directive->PrintOptoAssemblyOption;
+  bool print_opto_assembly = _directive->PrintOptoAssemblyOption;
   if (!print_opto_assembly) {
-    bool print_assembly = directive->PrintAssemblyOption;
+    bool print_assembly = _directive->PrintAssemblyOption;
     if (print_assembly && !Disassembler::can_decode()) {
       tty->print_cr("PrintAssembly request changed to PrintOptoAssembly");
       print_opto_assembly = true;
@@ -712,12 +712,12 @@
   set_print_assembly(print_opto_assembly);
   set_parsed_irreducible_loop(false);
 
-  if (directive->ReplayInlineOption) {
+  if (_directive->ReplayInlineOption) {
     _replay_inline_data = ciReplay::load_inline_data(method(), entry_bci(), ci_env->comp_level());
   }
 #endif
-  set_print_inlining(directive->PrintInliningOption || PrintOptoInlining);
-  set_print_intrinsics(directive->PrintIntrinsicsOption);
+  set_print_inlining(_directive->PrintInliningOption || PrintOptoInlining);
+  set_print_intrinsics(_directive->PrintIntrinsicsOption);
   set_has_irreducible_loop(true); // conservative until build_loop_tree() reset it
 
   if (ProfileTraps RTM_OPT_ONLY( || UseRTMLocking )) {
@@ -885,10 +885,10 @@
   NOT_PRODUCT( verify_barriers(); )
 
   // Dump compilation data to replay it.
-  if (directive->DumpReplayOption) {
+  if (_directive->DumpReplayOption) {
     env()->dump_replay_data(_compile_id);
   }
-  if (directive->DumpInlineOption && (ilt() != NULL)) {
+  if (_directive->DumpInlineOption && (ilt() != NULL)) {
     env()->dump_inline_data(_compile_id);
   }
 
@@ -951,11 +951,10 @@
                   int is_fancy_jump,
                   bool pass_tls,
                   bool save_arg_registers,
-                  bool return_pc,
-                  DirectiveSet* directive)
+                  bool return_pc)
   : Phase(Compiler),
     _env(ci_env),
-    _directive(directive),
+    _directive(ci_env->directive()),
     _log(ci_env->log()),
     _compile_id(0),
     _save_argument_registers(save_arg_registers),
@@ -981,7 +980,7 @@
     _java_calls(0),
     _inner_loops(0),
 #ifndef PRODUCT
-    _trace_opto_output(TraceOptoOutput),
+    _trace_opto_output(ci_env->directive()->TraceOptoOutputOption),
     _in_dump_cnt(0),
     _printer(NULL),
 #endif