1.1 --- a/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Tue Nov 22 14:18:39 2011 -0800 1.2 +++ b/src/share/vm/gc_implementation/shared/markSweep.inline.hpp Tue Nov 22 14:59:34 2011 -0800 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2000, 2011, 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 @@ -63,18 +63,6 @@ 1.11 follow_stack(); 1.12 } 1.13 1.14 -template <class T> inline void MarkSweep::mark_and_follow(T* p) { 1.15 -// assert(Universe::heap()->is_in_reserved(p), "should be in object space"); 1.16 - T heap_oop = oopDesc::load_heap_oop(p); 1.17 - if (!oopDesc::is_null(heap_oop)) { 1.18 - oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); 1.19 - if (!obj->mark()->is_marked()) { 1.20 - mark_object(obj); 1.21 - obj->follow_contents(); 1.22 - } 1.23 - } 1.24 -} 1.25 - 1.26 template <class T> inline void MarkSweep::mark_and_push(T* p) { 1.27 // assert(Universe::heap()->is_in_reserved(p), "should be in object space"); 1.28 T heap_oop = oopDesc::load_heap_oop(p);