forked from pool/java-1_8_0-openj9
82 lines
3.0 KiB
Diff
82 lines
3.0 KiB
Diff
--- a/openj9/openj9/runtime/gc_structs/MixedObjectIterator.hpp
|
|
+++ b/openj9/runtime/gc_structs/MixedObjectIterator.hpp
|
|
@@ -234,7 +234,7 @@ public:
|
|
/**
|
|
* @param vm[in] pointer to the JVM
|
|
*/
|
|
- GC_MixedObjectIterator (OMR_VM *omrVM)
|
|
+ GC_MixedObjectIterator(OMR_VM *omrVM)
|
|
: _slotObject(GC_SlotObject(omrVM, NULL))
|
|
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
|
|
, _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM))
|
|
@@ -251,20 +251,11 @@ public:
|
|
* @param vm[in] pointer to the JVM
|
|
* @param objectPtr[in] the object to be processed
|
|
*/
|
|
- GC_MixedObjectIterator (OMR_VM *omrVM, J9Object *objectPtr)
|
|
- : _slotObject(GC_SlotObject(omrVM, NULL))
|
|
-#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
|
|
- , _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM))
|
|
-#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
|
|
- , _objectPtr(NULL)
|
|
- , _scanPtr(NULL)
|
|
- , _endPtr(NULL)
|
|
- , _descriptionPtr(NULL)
|
|
- , _description(0)
|
|
- , _descriptionIndex(0)
|
|
- {
|
|
+ GC_MixedObjectIterator(OMR_VM *omrVM, J9Object *objectPtr)
|
|
+ : GC_MixedObjectIterator(omrVM)
|
|
+ {
|
|
initialize(omrVM, objectPtr);
|
|
- }
|
|
+ }
|
|
};
|
|
|
|
#endif /* MIXEDOBJECTITERATOR_HPP_ */
|
|
--- a/openj9/openj9/runtime/gc_structs/PointerArrayIterator.hpp
|
|
+++ b/openj9/runtime/gc_structs/PointerArrayIterator.hpp
|
|
@@ -58,14 +58,12 @@ public:
|
|
* @param objectPtr the array object to be processed
|
|
*/
|
|
GC_PointerArrayIterator(J9JavaVM *javaVM, J9Object *objectPtr)
|
|
- : _contiguousArrayIterator(javaVM->omrVM)
|
|
- , _pointerArrayletIterator(javaVM)
|
|
+ : GC_PointerArrayIterator(javaVM)
|
|
{
|
|
initialize(javaVM, objectPtr);
|
|
}
|
|
|
|
GC_PointerArrayIterator(J9JavaVM *javaVM)
|
|
- /* It is unnecessary to initialize one of those iterators */
|
|
: _contiguousArrayIterator(javaVM->omrVM)
|
|
, _pointerArrayletIterator(javaVM)
|
|
{
|
|
--- a/openj9/openj9/runtime/gc_structs/PointerContiguousArrayIterator.hpp
|
|
+++ b/openj9/runtime/gc_structs/PointerContiguousArrayIterator.hpp
|
|
@@ -96,7 +96,10 @@ public:
|
|
}
|
|
|
|
GC_PointerContiguousArrayIterator(OMR_VM *omrVM)
|
|
- : _slotObject(GC_SlotObject(omrVM, NULL))
|
|
+ : _arrayPtr(NULL)
|
|
+ , _slotObject(GC_SlotObject(omrVM, NULL))
|
|
+ , _scanPtr(NULL)
|
|
+ , _endPtr(NULL)
|
|
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
|
|
, _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM))
|
|
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
|
|
@@ -108,11 +111,7 @@ public:
|
|
* @param objectPtr the array object to be processed
|
|
*/
|
|
GC_PointerContiguousArrayIterator(OMR_VM *omrVM, J9Object *objectPtr)
|
|
- : _slotObject(GC_SlotObject(omrVM, NULL))
|
|
-#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
|
|
- , _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM))
|
|
-#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
|
|
- , _omrVM(omrVM)
|
|
+ : GC_PointerContiguousArrayIterator(omrVM)
|
|
{
|
|
initialize(objectPtr);
|
|
}
|