Fix sindarin tests

Author: guillep

src/DebugInfo/OnlineSourceDebugInfo.class.st

@@ -180,6 +180,15 @@ OnlineSourceDebugInfo >> isFirstPCOfMessage: aBytecodePC [
 	^ (mappedNode methodOrBlockNode scope outerNotOptimizedScope node firstPcForNode: mappedNode) = aBytecodePC
 ]
 
+{ #category : 'api' }
+OnlineSourceDebugInfo >> isSourceBlockCreation: aBytecodePC [
+	
+	(self privateSourceNodeForPC: aBytecodePC) ifNil: [ ^ false ].
+	"For many reasons we need for now to consider that the block creation is the block creation bytecode, and not the first bytecode mapped to it -- which correctly considers the pushing of copied vars and temp vectors"
+	^ (InstructionStream on: compiledCode pc: aBytecodePC) willCreateBlock
+	"^ (self privateSourceNodeForPC: aBytecodePC) isBlock"
+]
+
 { #category : 'api' }
 OnlineSourceDebugInfo >> isSourceReturn: aBytecodePC [
 
@@ -204,7 +213,10 @@ OnlineSourceDebugInfo >> isSourceSend: aBytecodePC [
 OnlineSourceDebugInfo >> isSourceStore: aBytecodePC [
 
 	(self privateSourceNodeForPC: aBytecodePC) ifNil: [ ^ false ].
-	^ (self privateSourceNodeForPC: aBytecodePC) isAssignment 
+	"For many reasons we need for now to consider that the stores are the store bytecodes.
+	However, this takes into account stores inserted by the compiler and not written by users!"
+	^ (InstructionStream on: compiledCode pc: aBytecodePC) willStore
+	"^ (self privateSourceNodeForPC: aBytecodePC) isAssignment"
 ]
 
 { #category : 'private' }
@@ -239,7 +251,8 @@ OnlineSourceDebugInfo >> shouldStopAt: aBytecodePC [
 
 	^ (self isSourceSend: aBytecodePC) or: [
 			  (self isSourceReturn: aBytecodePC) or: [
-				  self isSourceStore: aBytecodePC ] ]
+				  (self isSourceStore: aBytecodePC)
+						or: [ self isSourceBlockCreation: aBytecodePC ] ] ]
 ]
 
 { #category : 'accessing' }

src/Debugging-Core/Context.extension.st

@@ -258,7 +258,7 @@ Context >> stepToSendOrReturn [
 
 	| stream context |
 	stream := InstructionStream on: method pc: pc.	
-	[ self isDead or: [ stream willSend or: [ stream willReturn or: [ stream willStore ] ] ] ]
+	[ self isDead or: [ stream willSend or: [ stream willReturn or: [ stream willStore or: [ stream willCreateBlock ] ] ] ] ]
 		whileFalse: [
 			context := stream interpretNextInstructionFor: self.
 			context == self ifFalse: [

src/Kernel-CodeModel/Context.class.st

@@ -703,7 +703,7 @@ Context >> executedPC [
 
 	"Return the PC of the previous instruction.
 	Heuristic (maybe wrong) we just go back one byte"
-	^ self currentPC - 1
+	^ self currentPC - 1 max: method initialPC
 ]
 
 { #category : 'system simulation' }

src/Slot-Tests/TemporaryVariableTest.class.st

@@ -28,7 +28,7 @@ TemporaryVariableTest >> testDefiningNode [
 
 { #category : 'tests' }
 TemporaryVariableTest >> testIsReferenced [
-	| method |
+	| method notReferenced |
 	"The temp notReferenced is not used as we test exactly that here"
 	method := self class >> #testIsReferenced.
 	self assert: method temporaryVariables first isReferenced.