--- a/hotspot/src/share/vm/runtime/vmStructs.cpp Mon Nov 09 11:35:45 2015 +0000
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp Fri Nov 06 16:30:40 2015 -0500
@@ -1030,7 +1030,7 @@
nonstatic_field(JavaThread, _stack_size, size_t) \
nonstatic_field(JavaThread, _vframe_array_head, vframeArray*) \
nonstatic_field(JavaThread, _vframe_array_last, vframeArray*) \
- nonstatic_field(JavaThread, _satb_mark_queue, ObjPtrQueue) \
+ nonstatic_field(JavaThread, _satb_mark_queue, SATBMarkQueue) \
nonstatic_field(JavaThread, _dirty_card_queue, DirtyCardQueue) \
nonstatic_field(Thread, _resource_area, ResourceArea*) \
nonstatic_field(CompilerThread, _env, ciEnv*) \
@@ -1622,7 +1622,7 @@
declare_toplevel_type(MemRegion) \
declare_toplevel_type(ThreadLocalAllocBuffer) \
declare_toplevel_type(VirtualSpace) \
- declare_toplevel_type(ObjPtrQueue) \
+ declare_toplevel_type(SATBMarkQueue) \
declare_toplevel_type(DirtyCardQueue) \
\
/* Pointers to Garbage Collection types */ \