src/share/vm/memory/defNewGeneration.cpp

rev 7211 : [mq]: remove_ngen
rev 7212 : [mq]: remove_get_gen
rev 7213 : imported patch move_genspecs
rev 7215 : imported patch remove_levels
rev 7216 : imported patch cleanup

*** 852,862 ****
  
  #undef DefNew_SINCE_SAVE_MARKS_DEFN
  
  void DefNewGeneration::contribute_scratch(ScratchBlock*& list, Generation* requestor,
                                           size_t max_alloc_words) {
!   if (requestor == this || _promotion_failed) return;
    assert(requestor == GenCollectedHeap::heap()->old_gen(), "We should not call our own generation");
  
    /* $$$ Assert this?  "trace" is a "MarkSweep" function so that's not appropriate.
    if (to_space->top() > to_space->bottom()) {
      trace("to_space not empty when contribute_scratch called");
--- 852,864 ----
  
  #undef DefNew_SINCE_SAVE_MARKS_DEFN
  
  void DefNewGeneration::contribute_scratch(ScratchBlock*& list, Generation* requestor,
                                           size_t max_alloc_words) {
!   if (requestor == this || _promotion_failed) {
!     return;
!   }
    assert(requestor == GenCollectedHeap::heap()->old_gen(), "We should not call our own generation");
  
    /* $$$ Assert this?  "trace" is a "MarkSweep" function so that's not appropriate.
    if (to_space->top() > to_space->bottom()) {
      trace("to_space not empty when contribute_scratch called");