Better support for copying vars in debug info

Author: guillep

src/DebugInfo-Tests/DebugInfoTest.class.st

@@ -958,6 +958,27 @@ DebugInfoTest >> testReadOuterBlockCopiedTemporaryVariableFromClosure [
 	self assert: debugInfo notNil
 ]
 
+{ #category : 'tests - read variables' }
+DebugInfoTest >> testReadOuterBlockCopiedTemporaryVariableFromClosureWithDeadOuter [
+	"This test is tricky.
+	
+	This is a variation of testReadOuterBlockCopiedTemporaryVariableFromClosure where the outer context is dead.
+	The value was copied into the current context so, we should be able to read it!
+	"
+
+	| debugInfo context |
+	context := [ :blockArgument |
+		           | tempInBlock |
+		           tempInBlock := 42.
+		           [ "tempInBlock is candidate to be copied in the block activation"
+			           tempInBlock.
+
+			           thisContext copy ] value ] value: 7.
+
+	debugInfo := self newDebugInfoFor: context method.
+	self assert: (debugInfo readVariableNamed: #tempInBlock fromContext: context) equals: 42
+]
+
 { #category : 'tests - read variables' }
 DebugInfoTest >> testReadOuterBlockTempVectorTemporaryVariableFromClosure [
 	"This test is tricky.

src/DebugInfo/OnlineSourceDebugInfo.class.st

@@ -87,9 +87,10 @@ OnlineSourceDebugInfo >> asOfflineDebugInfo [
 
 	scopes := Dictionary new.
 	astScopes do: [ :astScope |
-			| cachedScope tempDescriptions |
+			| onlineScope cachedScope tempDescriptions |
+			onlineScope := OnlineSourceDebugScope on: astScope.
 			cachedScope := OfflineSourceDebugScope new.
-			tempDescriptions := astScope allTemps collect: [ :temp |
+			tempDescriptions := onlineScope variables collect: [ :temp |
 				                    temp descriptionArrayForScope: astScope ].
 			(astScope isBlockScope and: [ astScope isOptimized ])
 				ifTrue: [

src/DebugInfo/OnlineSourceDebugScope.class.st

@@ -61,5 +61,12 @@ OnlineSourceDebugScope >> variableNames [
 { #category : 'accessing' }
 OnlineSourceDebugScope >> variables [
 
-	^ astScope allTemps
+	"Consider copied vars first.
+	They override variables from the scope"
+	| vars |
+	vars := astScope copiedVars copy.
+	astScope allTemps do: [ :e |
+		vars at: e name ifAbsentPut: e.
+	].
+	^ vars values
 ]