Mutant pharo-project#18, Reverting [ Replace #- with #+ ] on method […

… scavengingGCTenuringIf: ] SURVIVED 14/14 test cases.
hogoww · Dec 22, 2021 · 2e56105 · 2e56105
1 parent a7e3c65
commit 2e56105
Showing 1 changed file with 7 additions and 16 deletions.
diff --git a/smalltalksrc/VMMaker/SpurMemoryManager.class.st b/smalltalksrc/VMMaker/SpurMemoryManager.class.st
@@ -10918,22 +10918,14 @@ SpurMemoryManager >> scavengingGC [
 
 { #category : #'gc - scavenging' }
 SpurMemoryManager >> scavengingGCTenuringIf: tenuringCriterion [
-
 	"Run the scavenger."
-
 	<inline: false>
 	self assert: remapBufferCount = 0.
-	(self asserta: scavenger eden limit - freeStart
-		 > coInterpreter interpreterAllocationReserveBytes) ifFalse: [ 
-		coInterpreter
-			tab;
-			printNum: scavenger eden limit - freeStart;
-			space;
-			printNum: coInterpreter interpreterAllocationReserveBytes;
-			space;
-			printNum: coInterpreter interpreterAllocationReserveBytes
-				- (scavenger eden limit - freeStart);
-			cr ].
+	(self asserta: scavenger eden limit - freeStart > coInterpreter interpreterAllocationReserveBytes) ifFalse:
+		[coInterpreter tab;
+			printNum: scavenger eden limit - freeStart; space;
+			printNum: coInterpreter interpreterAllocationReserveBytes; space;
+			printNum: coInterpreter interpreterAllocationReserveBytes - (scavenger eden limit - freeStart); cr].
 	self checkMemoryMap.
 	self checkFreeSpace: GCModeNewSpace.
 	self runLeakCheckerFor: GCModeNewSpace.
@@ -10942,8 +10934,7 @@ SpurMemoryManager >> scavengingGCTenuringIf: tenuringCriterion [
 		preGCAction: GCModeNewSpace;
 		"would prefer this to be in mapInterpreterOops, but
 		 compatibility with ObjectMemory dictates it goes here."
-		flushMethodCacheFrom: newSpaceStart
-		to: newSpaceLimit.
+		flushMethodCacheFrom: newSpaceStart to: newSpaceLimit.
 	needGCFlag := false.
 
 	gcStartUsecs := coInterpreter ioUTCMicrosecondsNow.
@@ -10952,7 +10943,7 @@ SpurMemoryManager >> scavengingGCTenuringIf: tenuringCriterion [
 
 	statScavenges := statScavenges + 1.
 	statGCEndUsecs := coInterpreter ioUTCMicrosecondsNow.
-	statSGCDeltaUsecs := statGCEndUsecs + gcStartUsecs.
+	statSGCDeltaUsecs := statGCEndUsecs - gcStartUsecs.
 	statScavengeGCUsecs := statScavengeGCUsecs + statSGCDeltaUsecs.
 	statRootTableCount := scavenger rememberedSetSize.