factor out binding re-lookup and fix as #lookupAndFixBinding: and cal…

…l it at the end of blocks and method on the temp defintion nodes

fixes pharo-project#4641

src/OpalCompiler-Core/OCASTClosureAnalyzer.class.st

@@ -25,6 +25,14 @@ OCASTClosureAnalyzer >> doRemotes [
 
 ]
 
+{ #category : #variables }
+OCASTClosureAnalyzer >> lookupAndFixBinding: aVariableNode [
+	| var |
+	var := scope lookupVar: aVariableNode name.
+	aVariableNode binding: var.
+	^var
+]
+
 { #category : #visiting }
 OCASTClosureAnalyzer >> visitArgumentNode: aVariableNode [
 
@@ -38,6 +46,7 @@ OCASTClosureAnalyzer >> visitBlockNode: aBlockNode [
 	scope := aBlockNode scope.	
 	self doRemotes; doCopying.
 	self visitNode: aBlockNode body.
+	aBlockNode temporaries do: [ :each | self lookupAndFixBinding: each ].
 	scope := scope popScope.
 ]
 
@@ -48,6 +57,7 @@ OCASTClosureAnalyzer >> visitMethodNode: aMethodNode [
 	scope := aMethodNode scope.	
 	self doRemotes; doCopying.
 	self visitNode: aMethodNode body.
+	aMethodNode temporaries do: [ :each | self lookupAndFixBinding: each ]
 ]
 
 { #category : #visiting }
@@ -57,8 +67,7 @@ OCASTClosureAnalyzer >> visitVariableNode: aVariableNode [
 	| var |
 	aVariableNode adaptToSemanticNode.
 	aVariableNode isTemp ifFalse: [^self].
-	var := scope lookupVar: aVariableNode name.
-	aVariableNode binding: var.
+	var := self lookupAndFixBinding: aVariableNode.
 	var isTempVectorTemp ifTrue: [scope addCopyingTempToAllScopesUpToDefVector: var vectorName].
 	var isCopying ifTrue: [scope addCopyingTempToAllScopesUpToDefTemp: var].
 ]