src/share/vm/interpreter/templateTable.cpp

rev 12310 : [mq]: gcinterface.patch

*** 224,234 ****
  
  #if defined(TEMPLATE_TABLE_BUG)
  //
  // It appears that gcc (version 2.91) generates bad code for the template
  // table init if this macro is not defined.  My symptom was an assertion
! // assert(Universe::heap()->is_in(obj), "sanity check") in handles.cpp line 24.
  // when called from interpreterRuntime.resolve_invoke().
  //
    #define iload  TemplateTable::iload
    #define lload  TemplateTable::lload
    #define fload  TemplateTable::fload
--- 224,234 ----
  
  #if defined(TEMPLATE_TABLE_BUG)
  //
  // It appears that gcc (version 2.91) generates bad code for the template
  // table init if this macro is not defined.  My symptom was an assertion
! // assert(GC::gc()->heap()->is_in(obj), "sanity check") in handles.cpp line 24.
  // when called from interpreterRuntime.resolve_invoke().
  //
    #define iload  TemplateTable::iload
    #define lload  TemplateTable::lload
    #define fload  TemplateTable::fload
*** 245,255 ****
    if (_is_initialized) return;
  
    // Initialize table
    TraceTime timer("TemplateTable initialization", TRACETIME_LOG(Info, startuptime));
  
!   _bs = Universe::heap()->barrier_set();
  
    // For better readability
    const char _    = ' ';
    const int  ____ = 0;
    const int  ubcp = 1 << Template::uses_bcp_bit;
--- 245,255 ----
    if (_is_initialized) return;
  
    // Initialize table
    TraceTime timer("TemplateTable initialization", TRACETIME_LOG(Info, startuptime));
  
!   _bs = GC::gc()->heap()->barrier_set();
  
    // For better readability
    const char _    = ' ';
    const int  ____ = 0;
    const int  ubcp = 1 << Template::uses_bcp_bit;