Merge pull request #20459 from dmitripivkine/master

Clean up GC_Finalizable*Buffer classes code

Author: amicic

runtime/gc_base/FinalizableClassLoaderBuffer.hpp

@@ -38,7 +38,7 @@ class GC_FinalizableClassLoaderBuffer
 private:
 	J9ClassLoader *_head; /**< the head of the linked list of J9ClassLoader */
 	J9ClassLoader *_tail; /**< the tail of the linked list of J9ClassLoader */
-	UDATA _count; /**< the number of buffered J9ClassLoader */
+	uintptr_t _count; /**< the number of buffered J9ClassLoader */
 	MM_GCExtensions * const _extensions; /**< a cached pointer to the extensions structure */
 protected:
 public:
@@ -51,7 +51,7 @@ class GC_FinalizableClassLoaderBuffer
 	 * @param env[in] the current thread
 	 * @param object[in] the object to add
 	 */
-	void add(MM_EnvironmentBase* env, J9ClassLoader *loader)
+	void add(MM_EnvironmentBase *env, J9ClassLoader *loader)
 	{
 		if (NULL == _head) {
 			Assert_MM_true(NULL == _tail);
@@ -69,7 +69,7 @@ class GC_FinalizableClassLoaderBuffer
 		}
 	}
 
-	void flush(MM_EnvironmentBase* env)
+	void flush(MM_EnvironmentBase *env)
 	{
 		if (NULL != _head) {
 			Assert_MM_true(NULL != _tail);
@@ -88,9 +88,9 @@ class GC_FinalizableClassLoaderBuffer
 	 */
 	GC_FinalizableClassLoaderBuffer(MM_GCExtensions *extensions) :
 		_head(NULL)
-		,_tail(NULL)
-		,_count(0)
-		,_extensions(extensions)
+		, _tail(NULL)
+		, _count(0)
+		, _extensions(extensions)
 	{}
 };
 #endif /* FINALIZABLECLASSLOADERBUFFER_HPP_ */

runtime/gc_base/FinalizableObjectBuffer.hpp

@@ -39,17 +39,17 @@ class GC_FinalizableObjectBuffer
 private:
 	j9object_t _systemHead; /**< the head of the linked list of finalizable objects loaded by the system class loader */
 	j9object_t _systemTail; /**< the tail of the linked list of unfinalized objects loaded by the system class loader */
-	UDATA _systemObjectCount; /**< the number of buffered objects loaded by the system class loader */
+	uintptr_t _systemObjectCount; /**< the number of buffered objects loaded by the system class loader */
 	j9object_t _defaultHead; /**< the head of the linked list of unfinalized objects not loaded by the system class loader */
 	j9object_t _defaultTail; /**< the tail of the linked list of unfinalized objects not loaded by the system class loader */
-	UDATA _defaultObjectCount; /**< the number of buffered objects not loaded by the system class loader */
+	uintptr_t _defaultObjectCount; /**< the number of buffered objects not loaded by the system class loader */
 	MM_GCExtensions * const _extensions; /**< a cached pointer to the extensions structure */
-	J9ClassLoader* const _systemClassLoader;
+	J9ClassLoader * const _systemClassLoader;
 protected:
 public:
 
 private:
-	void addSystemObject(MM_EnvironmentBase* env, j9object_t object) {
+	void addSystemObject(MM_EnvironmentBase *env, j9object_t object) {
 		if (NULL == _systemHead) {
 			Assert_MM_true(NULL == _systemTail);
 			Assert_MM_true(0 == _systemObjectCount);
@@ -66,7 +66,7 @@ class GC_FinalizableObjectBuffer
 		}
 	}
 
-	void addDefaultObject(MM_EnvironmentBase* env, j9object_t object) {
+	void addDefaultObject(MM_EnvironmentBase *env, j9object_t object) {
 		if (NULL == _defaultHead) {
 			_extensions->accessBarrier->setFinalizeLink(object, NULL);
 			_defaultHead = object;
@@ -85,7 +85,7 @@ class GC_FinalizableObjectBuffer
 	 * @param env[in] the current thread
 	 * @param object[in] the object to add
 	 */
-	virtual void add(MM_EnvironmentBase* env, j9object_t object)
+	virtual void add(MM_EnvironmentBase *env, j9object_t object)
 	{
 		if (_systemClassLoader == (J9OBJECT_CLAZZ((J9VMThread *)env->getOmrVMThread()->_language_vmthread, object)->classLoader)) {
 			addSystemObject(env, object);
@@ -94,7 +94,7 @@ class GC_FinalizableObjectBuffer
 		}
 	}
 
-	void flush(MM_EnvironmentBase* env)
+	void flush(MM_EnvironmentBase *env)
 	{
 		GC_FinalizeListManager *finalizeListManager = _extensions->finalizeListManager;
 		if (NULL != _systemHead) {
@@ -117,13 +117,13 @@ class GC_FinalizableObjectBuffer
 	 */
 	GC_FinalizableObjectBuffer(MM_GCExtensions *extensions) :
 		_systemHead(NULL)
-		,_systemTail(NULL)
-		,_systemObjectCount(0)
-		,_defaultHead(NULL)
-		,_defaultTail(NULL)
-		,_defaultObjectCount(0)
-		,_extensions(extensions)
-		,_systemClassLoader(((J9JavaVM *)extensions->getOmrVM()->_language_vm)->systemClassLoader)
+		, _systemTail(NULL)
+		, _systemObjectCount(0)
+		, _defaultHead(NULL)
+		, _defaultTail(NULL)
+		, _defaultObjectCount(0)
+		, _extensions(extensions)
+		, _systemClassLoader(((J9JavaVM *)extensions->getOmrVM()->_language_vm)->systemClassLoader)
 	{}
 };
 #endif /* FINALIZABLEOBJECTBUFFER_HPP_ */

runtime/gc_base/FinalizableReferenceBuffer.hpp

@@ -39,7 +39,7 @@ class GC_FinalizableReferenceBuffer
 private:
 	j9object_t _head; /**< the head of the linked list of reference objects */
 	j9object_t _tail; /**< the tail of the linked list of reference objects */
-	UDATA _count; /**< the number of buffered objects */
+	uintptr_t _count; /**< the number of buffered objects */
 	MM_GCExtensions * const _extensions; /**< a cached pointer to the extensions structure */
 protected:
 public:
@@ -52,7 +52,7 @@ class GC_FinalizableReferenceBuffer
 	 * @param env[in] the current thread
 	 * @param object[in] the object to add
 	 */
-	void add(MM_EnvironmentBase* env, j9object_t object)
+	void add(MM_EnvironmentBase *env, j9object_t object)
 	{
 		if (NULL == _head) {
 			Assert_MM_true(NULL == _tail);
@@ -70,7 +70,7 @@ class GC_FinalizableReferenceBuffer
 		}
 	}
 
-	void flush(MM_EnvironmentBase* env)
+	void flush(MM_EnvironmentBase *env)
 	{
 		if (NULL != _head) {
 			Assert_MM_true(NULL != _tail);
@@ -89,9 +89,9 @@ class GC_FinalizableReferenceBuffer
 	 */
 	GC_FinalizableReferenceBuffer(MM_GCExtensions *extensions) :
 		_head(NULL)
-		,_tail(NULL)
-		,_count(0)
-		,_extensions(extensions)
+		, _tail(NULL)
+		, _count(0)
+		, _extensions(extensions)
 	{}
 };
 #endif /* FINALIZABLEREFERENCEBUFFER_HPP_ */