*** old/src/share/vm/c1/c1_Runtime1.cpp	Tue Dec 13 12:42:25 2016
--- new/src/share/vm/c1/c1_Runtime1.cpp	Tue Dec 13 12:42:24 2016

*** 31,41 ****
--- 31,40 ----
  #include "c1/c1_MacroAssembler.hpp"
  #include "c1/c1_Runtime1.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "code/codeBlob.hpp"
  #include "code/codeCacheExtensions.hpp"
  #include "code/compiledIC.hpp"
  #include "code/pcDesc.hpp"
  #include "code/scopeDesc.hpp"
  #include "code/vtableStubs.hpp"
  #include "compiler/disassembler.hpp"

*** 187,198 ****
--- 186,195 ----
  
    OopMapSet* oop_maps;
    int frame_size;
    bool must_gc_arguments;
  
    if (!CodeCacheExtensions::skip_compiler_support()) {
      // bypass useless code generation
      Compilation::setup_code_buffer(&code, 0);
  
      // create assembler for code generation
      StubAssembler* sasm = new StubAssembler(&code, name_for(id), id);
      // generate code for runtime stub

*** 227,242 ****
--- 224,233 ----
      // make sure all code is in code buffer
      sasm->flush();
  
      frame_size = sasm->frame_size();
      must_gc_arguments = sasm->must_gc_arguments();
    } else {
      /* ignored values */
      oop_maps = NULL;
      frame_size = 0;
      must_gc_arguments = false;
    }
    // create blob - distinguish a few special cases
    CodeBlob* blob = RuntimeStub::new_runtime_stub(name_for(id),
                                                   &code,
                                                   CodeOffsets::frame_never_safe,
                                                   frame_size,