*** old/src/share/vm/opto/block.cpp	Tue Sep 22 16:26:53 2015
--- new/src/share/vm/opto/block.cpp	Tue Sep 22 16:26:53 2015

*** 23,32 ****
--- 23,33 ----
   */
  
  #include "precompiled.hpp"
  #include "libadt/vectset.hpp"
  #include "memory/allocation.inline.hpp"
+ #include "compiler/compilerDirectives.hpp"
  #include "opto/block.hpp"
  #include "opto/cfgnode.hpp"
  #include "opto/chaitin.hpp"
  #include "opto/loopnode.hpp"
  #include "opto/machnode.hpp"

*** 363,373 ****
--- 364,374 ----
  , _root(root)
  , _matcher(matcher)
  , _node_to_block_mapping(arena)
  , _node_latency(NULL)
  #ifndef PRODUCT
! , _trace_opto_pipelining(TraceOptoPipelining || C->method_has_option("TraceOptoPipelining"))
! , _trace_opto_pipelining(C->env()->dirset()->TraceOptoPipeliningOption)
  #endif
  #ifdef ASSERT
  , _raw_oops(arena)
  #endif
  {