*** old/src/share/vm/ci/ciEnv.cpp	Fri Sep 25 16:23:20 2015
--- new/src/share/vm/ci/ciEnv.cpp	Fri Sep 25 16:23:19 2015

*** 36,46 ****
--- 36,46 ----
  #include "classfile/vmSymbols.hpp"
  #include "code/codeCache.hpp"
  #include "code/scopeDesc.hpp"
  #include "compiler/compileBroker.hpp"
  #include "compiler/compileLog.hpp"
! #include "compiler/compilerOracle.hpp"
! #include "compiler/compilerDirectives.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
  #include "interpreter/linkResolver.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/oopFactory.hpp"
  #include "memory/universe.inline.hpp"

*** 99,109 ****
--- 99,108 ----
    _oop_recorder = NULL;
    _debug_info = NULL;
    _dependencies = NULL;
    _failure_reason = NULL;
    _compilable = MethodCompilable;
    _break_at_compile = false;
    _compiler_data = NULL;
  #ifndef PRODUCT
    assert(!firstEnv, "not initialized properly");
  #endif /* !PRODUCT */
  

*** 159,169 ****
--- 158,167 ----
    _oop_recorder = NULL;
    _debug_info = NULL;
    _dependencies = NULL;
    _failure_reason = NULL;
    _compilable = MethodCompilable_never;
    _break_at_compile = false;
    _compiler_data = NULL;
  #ifndef PRODUCT
    assert(firstEnv, "must be first");
    firstEnv = false;
  #endif /* !PRODUCT */

*** 954,966 ****
--- 952,964 ----
                              int frame_words,
                              OopMapSet* oop_map_set,
                              ExceptionHandlerTable* handler_table,
                              ImplicitExceptionTable* inc_table,
                              AbstractCompiler* compiler,
                              int comp_level,
                              bool has_unsafe_access,
                              bool has_wide_vectors,
+                             DirectiveSet* dirset,
                              RTMState  rtm_state) {
    VM_ENTRY_MARK;
    nmethod* nm = NULL;
    {
      // To prevent compile queue updates.

*** 1032,1046 ****
--- 1030,1053 ----
                                 offsets,
                                 orig_pc_offset,
                                 debug_info(), dependencies(), code_buffer,
                                 frame_words, oop_map_set,
                                 handler_table, inc_table,
!                                compiler, task()->comp_level());
+ 
      // Free codeBlobs
      code_buffer->free_blob();
  
      if (nm != NULL) {
+       bool printnmethods = dirset->PrintAssemblyOption || dirset->PrintNMethodsOption;
+       if (printnmethods || PrintDebugInfo || PrintRelocations || PrintDependencies || PrintExceptionHandlers) {
+         nm->print_nmethod(printnmethods);
+       }
+       if (dirset->PrintAssemblyOption) {
+         Disassembler::decode(nm);
+       }
+ 
        nm->set_has_unsafe_access(has_unsafe_access);
        nm->set_has_wide_vectors(has_wide_vectors);
  #if INCLUDE_RTM_OPT
        nm->set_rtm_state(rtm_state);
  #endif

*** 1067,1088 ****
--- 1074,1095 ----
          if (TraceNMethodInstalls) {
            ResourceMark rm;
            char *method_name = method->name_and_sig_as_C_string();
            ttyLocker ttyl;
            tty->print_cr("Installing method (%d) %s ",
!                         task()->comp_level(),
                          method_name);
          }
          // Allow the code to be executed
          method->set_code(method, nm);
        } else {
          if (TraceNMethodInstalls) {
            ResourceMark rm;
            char *method_name = method->name_and_sig_as_C_string();
            ttyLocker ttyl;
            tty->print_cr("Installing osr method (%d) %s @ %d",
!                         task()->comp_level(),
                          method_name,
                          entry_bci);
          }
          method->method_holder()->add_osr_nmethod(nm);
        }