src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp

rev 8069 : imported patch g1_cleanup

*** 22,31 ****
--- 22,32 ----
   *
   */
  
  #include "precompiled.hpp"
  #include "classfile/javaClasses.inline.hpp"
+ #include "gc_implementation/g1/g1CollectedHeap.hpp"
  #include "gc_implementation/g1/g1StringDedup.hpp"
  #include "gc_implementation/g1/g1StringDedupQueue.hpp"
  #include "memory/gcLocker.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/atomic.inline.hpp"
*** 161,171 ****
    for (size_t i = 0; i < _queue->_nqueues; i++) {
      StackIterator<oop, mtGC> iter(_queue->_queues[i]);
      while (!iter.is_empty()) {
        oop obj = iter.next();
        if (obj != NULL) {
!         guarantee(Universe::heap()->is_in_reserved(obj), "Object must be on the heap");
          guarantee(!obj->is_forwarded(), "Object must not be forwarded");
          guarantee(java_lang_String::is_instance(obj), "Object must be a String");
        }
      }
    }
--- 162,172 ----
    for (size_t i = 0; i < _queue->_nqueues; i++) {
      StackIterator<oop, mtGC> iter(_queue->_queues[i]);
      while (!iter.is_empty()) {
        oop obj = iter.next();
        if (obj != NULL) {
!         guarantee(G1CollectedHeap::heap()->is_in_reserved(obj), "Object must be on the heap");
          guarantee(!obj->is_forwarded(), "Object must not be forwarded");
          guarantee(java_lang_String::is_instance(obj), "Object must be a String");
        }
      }
    }