1.1 --- a/src/share/vm/memory/specialized_oop_closures.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/memory/specialized_oop_closures.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 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 @@ -54,6 +54,8 @@
1.11 class Par_PushOrMarkClosure;
1.12 class CMSKeepAliveClosure;
1.13 class CMSInnerParMarkAndPushClosure;
1.14 +// Misc
1.15 +class NoHeaderExtendedOopClosure;
1.16
1.17 // This macro applies an argument macro to all OopClosures for which we
1.18 // want specialized bodies of "oop_oop_iterate". The arguments to "f" are:
1.19 @@ -87,6 +89,7 @@
1.20 #endif // SERIALGC
1.21
1.22 #define SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_1(f) \
1.23 + f(NoHeaderExtendedOopClosure,_nv) \
1.24 SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_S(f) \
1.25 SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_P(f)
1.26
1.27 @@ -111,7 +114,7 @@
1.28 // doesn't.
1.29
1.30 #define ALL_OOP_OOP_ITERATE_CLOSURES_1(f) \
1.31 - f(OopClosure,_v) \
1.32 + f(ExtendedOopClosure,_v) \
1.33 SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_1(f)
1.34
1.35 #define ALL_OOP_OOP_ITERATE_CLOSURES_2(f) \
1.36 @@ -131,7 +134,7 @@
1.37 f(Par_PushAndMarkClosure,_nv)
1.38
1.39 #define ALL_PAR_OOP_ITERATE_CLOSURES(f) \
1.40 - f(OopClosure,_v) \
1.41 + f(ExtendedOopClosure,_v) \
1.42 SPECIALIZED_PAR_OOP_ITERATE_CLOSURES(f)
1.43 #endif // SERIALGC
1.44
1.45 @@ -195,7 +198,7 @@
1.46 class SpecializationStats {
1.47 public:
1.48 enum Kind {
1.49 - ik, // instanceKlass
1.50 + ik, // InstanceKlass
1.51 irk, // instanceRefKlass
1.52 oa, // objArrayKlass
1.53 NUM_Kinds
