Changeset 449

Timestamp:

Mar 3, 2008, 8:36:36 PM (17 years ago)

Author:

dai

Message:

GCがオブジェクト内の参照をスキャンする際、平たくスキャンするのではなく、基底クラスをたどるような実装に変更した。

Location:

trunk

Files:

• Include/Classes/System/Object.ab (modified) (2 diffs)
• Include/system/gc.sbp (modified) (2 diffs)
• bin/BasicCompiler32.exe (modified) ( previous)

trunk/Include/Classes/System/Object.ab

@@ -59 +59 @@
 
     Private
-        typeInfo As TypeInfo
+        _system_object_member_typeInfo As TypeInfo
 
     Public
@@ -67 +67 @@
             End If
 
-            This.typeInfo = typeInfo
+            This._system_object_member_typeInfo = typeInfo
         End Sub
 
         Virtual Function GetType() As TypeInfo
-            Return typeInfo
+            Return _system_object_member_typeInfo
         End Function
 

trunk/Include/system/gc.sbp

@@ -463 +463 @@
     @date   2007/10/21
     */
-    Function ScanObject(pObject As *Object, pbMark As *Byte) As Boolean
-        Dim classTypeInfo = Nothing As ActiveBasic.Core._System_TypeForClass
-        classTypeInfo = pObject->GetType() As ActiveBasic.Core._System_TypeForClass
-
+    Function ScanObject( classTypeInfo As ActiveBasic.Core._System_TypeForClass, pObject As *Object, pbMark As *Byte) As Boolean
         If IsNull( classTypeInfo ) Then
             Return False
         End If
 
-        If Object.ReferenceEquals( classTypeInfo, ActiveBasic.Core._System_TypeBase.selfTypeInfo ) Then
-            ' TypeInfoクラスの場合はTypeBaseImplクラスとして扱う
-            classTypeInfo = _System_TypeBase_Search( "ActiveBasic.Core.TypeBaseImpl" ) As ActiveBasic.Core._System_TypeForClass
+        ' 基底クラスをスキャン
+        If Not IsNull( classTypeInfo.BaseType ) Then
+            Dim baseClassTypeInfo = Nothing As ActiveBasic.Core._System_TypeForClass
+            baseClassTypeInfo = classTypeInfo.BaseType As ActiveBasic.Core._System_TypeForClass
+            ScanObject( baseClassTypeInfo, pObject, pbMark )
         End If
 
@@ -488 +487 @@
 
         Return True
+    End Function
+    Function ScanObject(pObject As *Object, pbMark As *Byte) As Boolean
+        Dim classTypeInfo = Nothing As ActiveBasic.Core._System_TypeForClass
+        classTypeInfo = pObject->GetType() As ActiveBasic.Core._System_TypeForClass
+
+        If Object.ReferenceEquals( classTypeInfo, ActiveBasic.Core._System_TypeBase.selfTypeInfo ) Then
+            ' TypeInfoクラスの場合はTypeBaseImplクラスとして扱う
+            classTypeInfo = _System_TypeBase_Search( "ActiveBasic.Core.TypeBaseImpl" ) As ActiveBasic.Core._System_TypeForClass
+        End If
+
+        Return ScanObject( classTypeInfo, pObject, pbMark )
     End Function