1.1 --- a/src/share/vm/memory/space.cpp Fri Apr 13 01:59:38 2012 +0200 1.2 +++ b/src/share/vm/memory/space.cpp Mon Apr 16 08:57:18 2012 +0200 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -531,7 +531,7 @@ 1.11 bottom(), top(), _offsets.threshold(), end()); 1.12 } 1.13 1.14 -void ContiguousSpace::verify(bool allow_dirty) const { 1.15 +void ContiguousSpace::verify() const { 1.16 HeapWord* p = bottom(); 1.17 HeapWord* t = top(); 1.18 HeapWord* prev_p = NULL; 1.19 @@ -965,27 +965,12 @@ 1.20 initialize(mr, SpaceDecorator::Clear, SpaceDecorator::Mangle); 1.21 } 1.22 1.23 - 1.24 -class VerifyOldOopClosure : public OopClosure { 1.25 - public: 1.26 - oop _the_obj; 1.27 - bool _allow_dirty; 1.28 - void do_oop(oop* p) { 1.29 - _the_obj->verify_old_oop(p, _allow_dirty); 1.30 - } 1.31 - void do_oop(narrowOop* p) { 1.32 - _the_obj->verify_old_oop(p, _allow_dirty); 1.33 - } 1.34 -}; 1.35 - 1.36 #define OBJ_SAMPLE_INTERVAL 0 1.37 #define BLOCK_SAMPLE_INTERVAL 100 1.38 1.39 -void OffsetTableContigSpace::verify(bool allow_dirty) const { 1.40 +void OffsetTableContigSpace::verify() const { 1.41 HeapWord* p = bottom(); 1.42 HeapWord* prev_p = NULL; 1.43 - VerifyOldOopClosure blk; // Does this do anything? 1.44 - blk._allow_dirty = allow_dirty; 1.45 int objs = 0; 1.46 int blocks = 0; 1.47 1.48 @@ -1007,8 +992,6 @@ 1.49 1.50 if (objs == OBJ_SAMPLE_INTERVAL) { 1.51 oop(p)->verify(); 1.52 - blk._the_obj = oop(p); 1.53 - oop(p)->oop_iterate(&blk); 1.54 objs = 0; 1.55 } else { 1.56 objs++;