- implement pcRange for context in terms of #sourceNodeExecuted

- remove all not needed code

fixes pharo-project#4735

src/Debugger-Model/DebugSession.class.st

@@ -226,12 +226,6 @@ DebugSession >> isInterruptedContextDoesNotUnderstand [
 	^ self interruptedContext selector == #doesNotUnderstand:
 ]
 
-{ #category : #context }
-DebugSession >> isLatestContext: aContext [
-
-	^ interruptedProcess suspendedContext == aContext
-]
-
 { #category : #testing }
 DebugSession >> isTestMethod: aCompiledMethod of: aTestCase [
 
@@ -270,7 +264,7 @@ DebugSession >> pcRangeForContext: aContext [
 
 	(aContext isNil or: [ aContext isDead ])
 		ifTrue: [ ^ 1 to: 0 ].
-	^ aContext pcRangeContextIsActive: (self isLatestContext: aContext)
+	^ aContext pcRange
 ]
 
 { #category : #'debugging actions' }

src/Debugging-Core/CompiledCode.extension.st

@@ -102,12 +102,6 @@ CompiledCode >> pcPreviousTo: pc [
 	^prevPc
 ]
 
-{ #category : #'*Debugging-Core' }
-CompiledCode >> rangeForPC: aPC [
-	"return which code to hightlight in the debugger"
-	^(self methodNode sourceNodeForPC: aPC) debugHighlightRange
-]
-
 { #category : #'*Debugging-Core' }
 CompiledCode >> symbolicBytecodes [
 	"Answer Collection that contains of all the byte codes in a method as an instance of SymbolicInstruction"

src/Debugging-Core/Context.extension.st

@@ -56,20 +56,9 @@ Context >> namedTempAt: index put: aValue [
 ]
 
 { #category : #'*Debugging-Core' }
-Context >> pcRangeContextIsActive: contextIsActive [
+Context >> pcRange [
 	"return the debug highlight for aPC"
-	| thePC |
-
-	"make sure we have some usable value (can happen for contexts in the ProcessBrowser"
-	thePC := pc ifNil: [self method endPC].
-
-	"When on the top of the stack the pc is pointing to right instruction, but deeper in the stack
-	the pc was already advanced one bytecode, so we need to go back this one bytecode, which
-	can consist of multiple bytes. But on IR, we record the *last* bytecode offset as the offset of
-	the IR instruction, which means we can just go back one"
-	thePC := contextIsActive ifTrue: [thePC] ifFalse: [thePC - 1].
-
-	^self method rangeForPC: thePC
+	^self sourceNodeExecuted debugHighlightRange 
 ]
 
 { #category : #'*Debugging-Core' }

src/OpalCompiler-Core/DebuggerMethodMapOpal.class.st

@@ -45,28 +45,6 @@ DebuggerMethodMapOpal >> namedTempAt: index put: aValue in: aContext [
 	^self tempNamed: (aContext tempNames at: index) in: aContext put: aValue
 ]
 
-{ #category : #public }
-DebuggerMethodMapOpal >> rangeForPC: aPC [
-	"return the debug highlight for aPC"
-
-	^self rangeForPC: aPC contextIsActiveContext: false
-
-]
-
-{ #category : #public }
-DebuggerMethodMapOpal >> rangeForPC: aPC contextIsActiveContext: contextIsActive [
-	"return the debug highlight for aPC"
-	| pc |
-
-	"When on the top of the stack the pc is pointing to right instruction, but deeper in the stack
-	the pc was already advanced one bytecode, so we need to go back this one bytecode, which
-	can consist of multiple bytes. But on IR, we record the *last* bytecode offset as the offset of the
-	IR instruction, which means we can just go back one"
-
-	pc := contextIsActive ifTrue: [aPC] ifFalse: [aPC - 1].
-	^(methodNode sourceNodeForPC: pc) debugHighlightRange
-]
-
 { #category : #public }
 DebuggerMethodMapOpal >> tempNamed: name in: aContext [
 	"Answer the value of the temp with name in aContext"

src/OpalCompiler-Tests/MethodMapTest.class.st

@@ -188,20 +188,6 @@ MethodMapTest >> testPrimitiveMethodSourceNodeAtInitialPC [
 
 	self assert: actual equals: method ast
 
-]
-
-{ #category : #'testing - source mapping' }
-MethodMapTest >> testSimpleSourceMapping [
-	| method range highlight |
-
-	method := Object>>('ha', 'lt') asSymbol.
-
-	range := method rangeForPC: (Smalltalk vm for32bit: 23 for64bit: 43).
-	highlight := method sourceCode copyFrom:  range first to: range last.
-	self assert: highlight equals: 'now'.
-
-
-
 ]
 
 { #category : #'testing - temp access' }

src/Tool-ProcessBrowser/ProcessBrowser.class.st

@@ -809,7 +809,7 @@ ProcessBrowser >> pcRange [
 	the selected context's program counter value."
 	(selectedContext isNil or: [methodText isEmptyOrNil])
 		ifTrue: [^ 1 to: 0].
-	^selectedContext pcRangeContextIsActive: (stackListIndex = 1)
+	^selectedContext pcRange
 ]
 
 { #category : #'process list' }