src/share/vm/opto/output.cpp

rev 6114 : 8037821: Account for trampoline stubs when estimating code buffer sizes
Summary: Correct calculation of stubs section size when trampoline stubs are used.
Contributed-by: Lutz.Schmidt@sap.com

*** 40,61 ****
  #include "opto/subnode.hpp"
  #include "opto/type.hpp"
  #include "runtime/handles.inline.hpp"
  #include "utilities/xmlstream.hpp"
  
- extern uint size_exception_handler();
- extern uint size_deopt_handler();
- 
  #ifndef PRODUCT
  #define DEBUG_ARG(x) , x
  #else
  #define DEBUG_ARG(x)
  #endif
  
- extern int emit_exception_handler(CodeBuffer &cbuf);
- extern int emit_deopt_handler(CodeBuffer &cbuf);
- 
  // Convert Nodes to instruction bits and pass off to the VM
  void Compile::Output() {
    // RootNode goes
    assert( _cfg->get_root_block()->number_of_nodes() == 0, "" );
  
--- 40,55 ----
*** 392,401 ****
--- 386,400 ----
        if (nj->is_Mach()) {
          MachNode *mach = nj->as_Mach();
          blk_size += (mach->alignment_required() - 1) * relocInfo::addr_unit(); // assume worst case padding
          reloc_size += mach->reloc();
          if (mach->is_MachCall()) {
+           // add size information for trampoline stub
+           // class CallStubImpl is platform-specific and defined in the *.ad files.
+           stub_size  += CallStubImpl::size_call_trampoline();
+           reloc_size += CallStubImpl::reloc_call_trampoline();
+ 
            MachCallNode *mcall = mach->as_MachCall();
            // This destination address is NOT PC-relative
  
            mcall->method_set((intptr_t)mcall->entry_point());
  
*** 1131,1144 ****
    // Pre-compute the length of blocks and replace
    // long branches with short if machine supports it.
    shorten_branches(blk_starts, code_req, locs_req, stub_req);
  
    // nmethod and CodeBuffer count stubs & constants as part of method's code.
!   int exception_handler_req = size_exception_handler();
!   int deopt_handler_req = size_deopt_handler();
!   exception_handler_req += MAX_stubs_size; // add marginal slop for handler
!   deopt_handler_req += MAX_stubs_size; // add marginal slop for handler
    stub_req += MAX_stubs_size;   // ensure per-stub margin
    code_req += MAX_inst_size;    // ensure per-instruction margin
  
    if (StressCodeBuffers)
      code_req = const_req = stub_req = exception_handler_req = deopt_handler_req = 0x10;  // force expansion
--- 1130,1142 ----
    // Pre-compute the length of blocks and replace
    // long branches with short if machine supports it.
    shorten_branches(blk_starts, code_req, locs_req, stub_req);
  
    // nmethod and CodeBuffer count stubs & constants as part of method's code.
!   // class HandlerImpl is platform-specific and defined in the *.ad files.
!   int exception_handler_req = HandlerImpl::size_exception_handler() + MAX_stubs_size; // add marginal slop for handler
!   int deopt_handler_req     = HandlerImpl::size_deopt_handler()     + MAX_stubs_size; // add marginal slop for handler
    stub_req += MAX_stubs_size;   // ensure per-stub margin
    code_req += MAX_inst_size;    // ensure per-instruction margin
  
    if (StressCodeBuffers)
      code_req = const_req = stub_req = exception_handler_req = deopt_handler_req = 0x10;  // force expansion
*** 1620,1640 ****
    // ------------------
    // Fill in exception table entries.
    FillExceptionTables(inct_cnt, call_returns, inct_starts, blk_labels);
  
    // Only java methods have exception handlers and deopt handlers
    if (_method) {
      // Emit the exception handler code.
!     _code_offsets.set_value(CodeOffsets::Exceptions, emit_exception_handler(*cb));
      // Emit the deopt handler code.
!     _code_offsets.set_value(CodeOffsets::Deopt, emit_deopt_handler(*cb));
  
      // Emit the MethodHandle deopt handler code (if required).
      if (has_method_handle_invokes()) {
        // We can use the same code as for the normal deopt handler, we
        // just need a different entry point address.
!       _code_offsets.set_value(CodeOffsets::DeoptMH, emit_deopt_handler(*cb));
      }
    }
  
    // One last check for failed CodeBuffer::expand:
    if ((cb->blob() == NULL) || (!CompileBroker::should_compile_new_jobs())) {
--- 1618,1639 ----
    // ------------------
    // Fill in exception table entries.
    FillExceptionTables(inct_cnt, call_returns, inct_starts, blk_labels);
  
    // Only java methods have exception handlers and deopt handlers
+   // class HandlerImpl is platform-specific and defined in the *.ad files.
    if (_method) {
      // Emit the exception handler code.
!     _code_offsets.set_value(CodeOffsets::Exceptions, HandlerImpl::emit_exception_handler(*cb));
      // Emit the deopt handler code.
!     _code_offsets.set_value(CodeOffsets::Deopt, HandlerImpl::emit_deopt_handler(*cb));
  
      // Emit the MethodHandle deopt handler code (if required).
      if (has_method_handle_invokes()) {
        // We can use the same code as for the normal deopt handler, we
        // just need a different entry point address.
!       _code_offsets.set_value(CodeOffsets::DeoptMH, HandlerImpl::emit_deopt_handler(*cb));
      }
    }
  
    // One last check for failed CodeBuffer::expand:
    if ((cb->blob() == NULL) || (!CompileBroker::should_compile_new_jobs())) {