Mutant pharo-project#457, Installing [ Replace #ifTrue:ifFalse: recei…

…ver with false ] on method [ popObjStack: ] 14 test cases.
hogoww · Feb 25, 2022 · 0a33fa0 · 0a33fa0
1 parent e4a3c2e
commit 0a33fa0
Showing 1 changed file with 44 additions and 28 deletions.
diff --git a/smalltalksrc/VMMaker/SpurMemoryManager.class.st b/smalltalksrc/VMMaker/SpurMemoryManager.class.st
@@ -9670,38 +9670,54 @@ SpurMemoryManager >> pop: nItems thenPush: oop [
 
 { #category : #'obj stacks' }
 SpurMemoryManager >> popObjStack: objStack [
+
 	| topx top nextPage myx |
-	self eassert: [self isValidObjStack: objStack].
+	self eassert: [ self isValidObjStack: objStack ].
 	topx := self fetchPointer: ObjStackTopx ofObject: objStack.
-	topx = 0 ifTrue:
-		[self assert: (self fetchPointer: ObjStackNextx ofObject: objStack) = 0.
-		 self cCode: [] "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)"
-			inSmalltalk:
-				[(self fetchPointer: ObjStackMyx ofObject: objStack) = MarkStackRootIndex ifTrue:
-					[MarkStackRecord ifNotNil:
-						[MarkStackRecord addLast: {#EMPTY. nil}]]].
-		^nil].
+	topx = 0 ifTrue: [ 
+		self assert:
+			(self fetchPointer: ObjStackNextx ofObject: objStack) = 0.
+		self
+			cCode: [ "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)"
+				 ]
+			inSmalltalk: [ 
+				(self fetchPointer: ObjStackMyx ofObject: objStack)
+				= MarkStackRootIndex ifTrue: [ 
+					MarkStackRecord ifNotNil: [ 
+						MarkStackRecord addLast: { #EMPTY. nil } ] ] ].
+		^ nil ].
 	topx := topx - 1.
-	top := self fetchPointer: topx + ObjStackFixedSlots ofObject: objStack.
-	self cCode: [] "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)"
-		inSmalltalk:
-			[(self fetchPointer: ObjStackMyx ofObject: objStack) = MarkStackRootIndex ifTrue:
-				[MarkStackRecord ifNotNil:
-					[(MarkStackRecord last first = #push and: [MarkStackRecord last last = top])
-						ifTrue: [MarkStackRecord removeLast]
-						ifFalse: [MarkStackRecord addLast: {#pop. top}]]]].
+	top := self
+		       fetchPointer: topx + ObjStackFixedSlots
+		       ofObject: objStack.
+	self
+		cCode: [ "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)"
+			 ]
+		inSmalltalk: [ 
+			(self fetchPointer: ObjStackMyx ofObject: objStack)
+			= MarkStackRootIndex ifTrue: [ 
+				MarkStackRecord ifNotNil: [ 
+					false
+						ifTrue: [ MarkStackRecord removeLast ]
+						ifFalse: [ 
+							MarkStackRecord addLast: { 
+									#pop.
+									top } ] ] ] ].
 	self storePointer: ObjStackTopx ofObjStack: objStack withValue: topx.
-	(topx = 0
-	 and: [(nextPage := self fetchPointer: ObjStackNextx ofObject: objStack) ~= 0])
-		ifTrue:
-			[self storePointer: ObjStackFreex ofObjStack: nextPage withValue: objStack.
-			 self storePointer: ObjStackNextx ofObjStack: objStack withValue: 0.
-			 myx := self fetchPointer: ObjStackMyx ofObject: objStack.
-			 self updateRootOfObjStackAt: myx with: nextPage.
-			 self eassert: [self isValidObjStack: nextPage]]
-		ifFalse:
-			[self eassert: [self isValidObjStack: objStack]].
-	^top
+	(topx = 0 and: [ 
+		 (nextPage := self fetchPointer: ObjStackNextx ofObject: objStack)
+		 ~= 0 ])
+		ifTrue: [ 
+			self
+				storePointer: ObjStackFreex
+				ofObjStack: nextPage
+				withValue: objStack.
+			self storePointer: ObjStackNextx ofObjStack: objStack withValue: 0.
+			myx := self fetchPointer: ObjStackMyx ofObject: objStack.
+			self updateRootOfObjStackAt: myx with: nextPage.
+			self eassert: [ self isValidObjStack: nextPage ] ]
+		ifFalse: [ self eassert: [ self isValidObjStack: objStack ] ].
+	^ top
 ]
 
 { #category : #'interpreter access' }