tamarin-finalizable-merge-fixup
author Benjamin Smedberg <benjamin@smedbergs.us>
Sat, 26 Jul 2008 22:49:39 -0400
changeset 167 a4da40849f5436e629c5732f4368c6c48189637f
parent 149 13eaa3adde4be1d470346a98e7cc7ab6b2ada1c8
permissions -rw-r--r--
State as of now

diff -r 489e90b5f706 js/tamarin/MMgc/GC.cpp
--- a/js/tamarin/MMgc/GC.cpp	Wed Jul 02 13:34:50 2008 -0700
+++ b/js/tamarin/MMgc/GC.cpp	Wed Jul 02 13:35:35 2008 -0700
@@ -2491,7 +2491,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;
@@ -2566,7 +2566,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;
@@ -2768,7 +2768,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;
 	}