truffle: src/share/vm/gc_implementation/g1/heapRegion.cpp comparison

comparison src/share/vm/gc_implementation/g1/heapRegion.cpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works

author	Doug Simon <doug.simon@oracle.com>
date	Mon, 12 Nov 2012 23:14:12 +0100
parents	c38f13903fdf 8fbf05030e24
children	ff4fa8b0516e

comparison

equal deleted inserted replaced

-:ae13cc658b80
+:e522a00b91aa
 size_t HeapRegion::GrainBytes        = 0;
 size_t HeapRegion::GrainWords        = 0;
 size_t HeapRegion::CardsPerRegion    = 0;
 HeapRegionDCTOC::HeapRegionDCTOC(G1CollectedHeap* g1,
-HeapRegion* hr, OopClosure* cl,
+HeapRegion* hr, ExtendedOopClosure* cl,
 CardTableModRefBS::PrecisionStyle precision,
 FilterKind fk) :
 ContiguousSpaceDCTOC(hr, cl, precision, NULL),
 _hr(hr), _fk(fk), _g1(g1) { }
 virtual void do_oop(narrowOop* p) { do_oop_work(p); }
 virtual void do_oop(      oop* p) { do_oop_work(p); }
 void print_object(outputStream* out, oop obj) {
 #ifdef PRODUCT
-klassOop k = obj->klass();
+Klass* k = obj->klass();
-const char* class_name = instanceKlass::cast(k)->external_name();
+const char* class_name = InstanceKlass::cast(k)->external_name();
 out->print_cr("class name %s", class_name);
 #else // PRODUCT
 obj->print_on(out);
 #endif // PRODUCT
 }
 }
 void HeapRegionDCTOC::walk_mem_region_with_cl(MemRegion mr,
 HeapWord* bottom,
 HeapWord* top,
-OopClosure* cl) {
+ExtendedOopClosure* cl) {
 G1CollectedHeap* g1h = _g1;
 int oop_size;
-OopClosure* cl2 = NULL;
+ExtendedOopClosure* cl2 = NULL;
 FilterIntoCSClosure intoCSFilt(this, g1h, cl);
 FilterOutOfRegionClosure outOfRegionFilt(_hr, cl);
 switch (_fk) {
 }
 assert(low == high && low >= addr, "Didn't work.");
 return low;
 }
-void HeapRegion::initialize(MemRegion mr, bool clear_space, bool mangle_space) {
-G1OffsetTableContigSpace::initialize(mr, false, mangle_space);
-hr_clear(false/*par*/, clear_space);
-}
 #ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away
 #pragma warning( disable:4355 ) // 'this' : used in base member initializer list
 #endif // _MSC_VER
 HeapRegion::HeapRegion(uint hrs_index,
 G1BlockOffsetSharedArray* sharedOffsetArray,
-MemRegion mr, bool is_zeroed) :
+MemRegion mr) :
-G1OffsetTableContigSpace(sharedOffsetArray, mr, is_zeroed),
+G1OffsetTableContigSpace(sharedOffsetArray, mr),
 _hrs_index(hrs_index),
 _humongous_type(NotHumongous), _humongous_start_region(NULL),
 _in_collection_set(false),
 _next_in_special_set(NULL), _orig_end(NULL),
 _claimed(InitialClaimValue), _evacuation_failed(false),
 _predicted_bytes_to_copy(0)
 {
 _orig_end = mr.end();
 // Note that initialize() will set the start of the unmarked area of the
 // region.
-this->initialize(mr, !is_zeroed, SpaceDecorator::Mangle);
+hr_clear(false /*par*/, false /*clear_space*/);
 set_top(bottom());
 set_saved_mark();
 _rem_set =  new HeapRegionRemSet(sharedOffsetArray, this);
 void HeapRegion::save_marks() {
 set_saved_mark();
 }
-void HeapRegion::oops_in_mr_iterate(MemRegion mr, OopClosure* cl) {
+void HeapRegion::oops_in_mr_iterate(MemRegion mr, ExtendedOopClosure* cl) {
 HeapWord* p = mr.start();
 HeapWord* e = mr.end();
 oop obj;
 while (p < e) {
 obj = oop(p);
 ContiguousSpace::oop_since_save_marks_iterate##nv_suffix(cl);              \
 }
 SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES(HeapRegion_OOP_SINCE_SAVE_MARKS_DEFN)
-void HeapRegion::oop_before_save_marks_iterate(OopClosure* cl) {
+void HeapRegion::oop_before_save_marks_iterate(ExtendedOopClosure* cl) {
 oops_in_mr_iterate(MemRegion(bottom(), saved_mark_word()), cl);
 }
 void HeapRegion::note_self_forwarding_removal_start(bool during_initial_mark,
 bool during_conc_mark) {
 return;
 }
 if (!g1->is_obj_dead_cond(obj, this, vo)) {
 if (obj->is_oop()) {
-klassOop klass = obj->klass();
+Klass* klass = obj->klass();
-if (!klass->is_perm()) {
+if (!klass->is_metadata()) {
 gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" "
-"not in perm", klass, obj);
+"not metadata", klass, obj);
 *failures = true;
 return;
 } else if (!klass->is_klass()) {
 gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" "
 "not a klass", klass, obj);
 *failures = true;
 return;
 } else {
 vl_cl.set_containing_obj(obj);
-obj->oop_iterate(&vl_cl);
+obj->oop_iterate_no_header(&vl_cl);
 if (vl_cl.failures()) {
 *failures = true;
 }
 if (G1MaxVerifyFailures >= 0 &&
 vl_cl.n_failures() >= G1MaxVerifyFailures) {
 }
 }
 // G1OffsetTableContigSpace code; copied from space.cpp.  Hope this can go
 // away eventually.
-void G1OffsetTableContigSpace::initialize(MemRegion mr, bool clear_space, bool mangle_space) {
-// false ==> we'll do the clearing if there's clearing to be done.
-ContiguousSpace::initialize(mr, false, mangle_space);
-_offsets.zero_bottom_entry();
-_offsets.initialize_threshold();
-if (clear_space) clear(mangle_space);
-}
 void G1OffsetTableContigSpace::clear(bool mangle_space) {
 ContiguousSpace::clear(mangle_space);
 _offsets.zero_bottom_entry();
 _offsets.initialize_threshold();
 }
 }
 G1OffsetTableContigSpace::
 G1OffsetTableContigSpace(G1BlockOffsetSharedArray* sharedOffsetArray,
-MemRegion mr, bool is_zeroed) :
+MemRegion mr) :
 _offsets(sharedOffsetArray, mr),
 _par_alloc_lock(Mutex::leaf, "OffsetTableContigSpace par alloc lock", true),
 _gc_time_stamp(0)
 {
 _offsets.set_space(this);
-initialize(mr, !is_zeroed, SpaceDecorator::Mangle);
+// false ==> we'll do the clearing if there's clearing to be done.
-}
+ContiguousSpace::initialize(mr, false, SpaceDecorator::Mangle);
+_offsets.zero_bottom_entry();
+_offsets.initialize_threshold();
+}

Mercurial > hg > truffle

comparison src/share/vm/gc_implementation/g1/heapRegion.cpp @ 6948:e522a00b91aa