finalizable-merge-fixup
author Benjamin Smedberg <benjamin@smedbergs.us>
Sun, 20 Apr 2008 21:43:09 -0400
changeset 42 53c5098cb79e0223016b6901194a89d913f235fb
parent 26 9b49c7cbe92c06169695cd824b1582d4ceb86591
permissions -rw-r--r--
Updates and imports

diff --git a/MMgc/GC.cpp b/MMgc/GC.cpp
--- a/MMgc/GC.cpp
+++ b/MMgc/GC.cpp
@@ -2512,7 +2512,7 @@ bail:
 					{
 						// try custom marking
 						if ((bits2 & (GCAlloc::kFinalize<<shift)) != 0
-							&& ((GCFinalizedObject *) GetUserPointer(item))->CustomMark())
+							&& ((GCFinalizable *) GetUserPointer(item))->CustomMark())
 						{
 							GCAssert((*pbits & (GCAlloc::kMark<<shift)) != 0);
 							continue;
@@ -2590,7 +2590,7 @@ bail:
 					{
 						// try custom marking
 						if ((b->flags & GCLargeAlloc::kFinalizeFlag) != 0
-							&& ((GCFinalizedObject *) GetUserPointer(item))->CustomMark())
+							&& ((GCFinalizable *) GetUserPointer(item))->CustomMark())
 						{
 							GCAssert((b->flags & GCLargeAlloc::kMarkFlag) != 0);
 							continue;
@@ -2776,7 +2776,7 @@ bail:
 	// TODO: fix headers so this can be declared there and inlined
 	void GC::WriteBarrierWrite(const void *address, const void *value)
 	{
-		GCAssert(!IsRCObject(value));
+		// GCAssert(!IsRCObject(value));
 		*(uintptr*)address = (uintptr) value;
 	}