- Fixing the count of nil objects in the remembered set

- Fixing the assert to get if the PermSpaceRememberedSet is sane
hernanmd · Jul 7, 2022 · ddeb1b9 · ddeb1b9
1 parent cc56865
commit ddeb1b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/smalltalksrc/VMMaker/SpurMemoryManager.class.st b/smalltalksrc/VMMaker/SpurMemoryManager.class.st
@@ -7464,10 +7464,9 @@ SpurMemoryManager >> isPermSpaceRememberedSetSane [
 		0 to: numPointerSlots - 1 do: [ :index |
 			referenced := self fetchPointer: index ofObject: objOop.
 	
-			((self isFixedKnownObject: referenced) not 
-				and: [ (self isNonImmediate: referenced)
-				and: [(self getMemoryMap isYoungObject: referenced)
-			  		or: [ self getMemoryMap isOldObject: referenced ]]])
+			(((self isFixedKnownObject: referenced) not 
+				and: [ (self isNonImmediate: referenced) and: [ referenced >= self getMemoryMap newSpaceStart ]])
+				and: [(self getMemoryMap isYoungObject: referenced) or: [ self getMemoryMap isOldObject: referenced ]])
 				ifTrue: [ mustBeRemembered := true]].
 			
 			mustBeRemembered ifTrue: [ 

diff --git a/smalltalksrc/VMMaker/VMRememberedSet.class.st b/smalltalksrc/VMMaker/VMRememberedSet.class.st
@@ -69,7 +69,7 @@ VMRememberedSet >> countNotNilObjects [
 
 	0 to: self rememberedSetLimit do: [ :i | 
 		"The remembered set might be initialized with 0"
-		((self objectAt: i) = manager nilObject or: [ (self objectAt: i) = 0 ]) ifTrue: [ ^ count ].
+		((self objectAt: i) = manager nilObject or: [ (self objectAt: i) = 0 ]) ifTrue: [ ^ i ].
 		count := i ].
 
 	^ count