1.1 --- a/src/share/vm/oops/objArrayKlass.cpp Wed Mar 12 15:25:35 2014 +0100 1.2 +++ b/src/share/vm/oops/objArrayKlass.cpp Tue Jun 24 16:20:15 2014 +0200 1.3 @@ -29,6 +29,7 @@ 1.4 #include "gc_implementation/shared/markSweep.inline.hpp" 1.5 #include "gc_interface/collectedHeap.inline.hpp" 1.6 #include "memory/genOopClosures.inline.hpp" 1.7 +#include "memory/iterator.inline.hpp" 1.8 #include "memory/metadataFactory.hpp" 1.9 #include "memory/resourceArea.hpp" 1.10 #include "memory/universe.inline.hpp" 1.11 @@ -476,12 +477,6 @@ 1.12 } 1.13 #endif // INCLUDE_ALL_GCS 1.14 1.15 -#define if_do_metadata_checked(closure, nv_suffix) \ 1.16 - /* Make sure the non-virtual and the virtual versions match. */ \ 1.17 - assert(closure->do_metadata##nv_suffix() == closure->do_metadata(), \ 1.18 - "Inconsistency in do_metadata"); \ 1.19 - if (closure->do_metadata##nv_suffix()) 1.20 - 1.21 #define ObjArrayKlass_OOP_OOP_ITERATE_DEFN(OopClosureType, nv_suffix) \ 1.22 \ 1.23 int ObjArrayKlass::oop_oop_iterate##nv_suffix(oop obj, \