This PR removes the need for old-style blocks in the reflectivity com…

…piler.

fixes #9929

src/Reflectivity/RFASTTranslator.class.st

@@ -35,14 +35,20 @@ RFASTTranslator >> emitMessageNode: aMessageNode [
 ]
 
 { #category : #reflectivity }
-RFASTTranslator >> emitMetaLinkAfter: aNode [
-	aNode hasMetalinkAfter ifFalse: [ ^self ].
-	aNode allAfterAreWeak ifTrue: [ ^self emitMetaLinkAfterNoEnsure: aNode ].
+RFASTTranslator >> emitMetaLinkAfterEnsure: aNode [
+	| ensureBlock compiledBlock |
+
+	"this saves the value from top of stack, executed [operation <here>] ensure: [ afterhook ] "
+	aNode postambles do: [ :each | valueTranslator visitNode: each ].
+	ensureBlock := RBBlockNode body: (RBSequenceNode statements: aNode afterHooks).
 
-	methodBuilder blockReturnTop.
-	methodBuilder jumpAheadTarget: #block.
-	aNode postambles do: [:each | valueTranslator visitNode: each].
-	aNode afterHooks do: [:each | valueTranslator visitNode: each].
+	ensureBlock parent: aNode.
+	ensureBlock scope: (aNode parent scope newBlockScope: 20).
+	(aNode parent scope copiedVars, aNode parent scope tempVars) do: [ :var |
+		ensureBlock scope addCopyingTempToAllScopesUpToDefTemp: var].
+
+	compiledBlock := self compilationContext astTranslatorClass new translateFullBlock: ensureBlock.
+	methodBuilder pushFullClosureCompiledBlock: compiledBlock copiedValues: ensureBlock scope copiedVarNames.
 	methodBuilder send: #ensure:.
 ]
 
@@ -70,21 +76,6 @@ RFASTTranslator >> emitPreamble: aNode [
 	aNode preambles do: [ :pre | valueTranslator visitNode: pre].
 ]
 
-{ #category : #reflectivity }
-RFASTTranslator >> emitPrepareLinkAfter: aNode [
-	"We need to emit the first part of the block for the ensure: wrap here"
-	| copied |
-	copied := #().
-	aNode hasMetalinkAfter ifFalse: [^self].
-	aNode allAfterAreWeak ifTrue: [ ^self ].
-	aNode isMethod ifTrue: [ copied := aNode argumentNames, aNode temporaryNames ].
-	aNode isSequence ifTrue: [ copied := aNode parent argumentNames, aNode parent temporaryNames ].
-	methodBuilder
-		pushClosureCopyCopiedValues: copied
-		args: #()
-		jumpTo: #block
-]
-
 { #category : #'visitor - double dispatching' }
 RFASTTranslator >> visitArrayNode: anArrayNode [ 
 
@@ -124,33 +115,23 @@ RFASTTranslator >> visitAssignmentNode: anAssignmentNode [
 
 { #category : #'visitor - double dispatching' }
 RFASTTranslator >> visitBlockNode: aBlockNode [
+	| compiledBlock |
 	aBlockNode arguments size >15 ifTrue: [self backendError: 'Too many arguments' forNode: aBlockNode ].
-
 	aBlockNode isInlined ifTrue: [^ self visitInlinedBlockNode: aBlockNode ].
-
-	aBlockNode hasMetalinkInstead ifFalse: [  
-	methodBuilder
-			pushClosureCopyCopiedValues: aBlockNode scope inComingCopiedVarNames
-			args: aBlockNode argumentNames
-			jumpTo:  #block.
-
-	aBlockNode scope tempVector ifNotEmpty: [
-		methodBuilder 
-			createTempVectorNamed: aBlockNode scope tempVectorName 
-			withVars: aBlockNode scope tempVectorVarNames.
-	].
-	methodBuilder addTemps: aBlockNode scope tempVarNamesWithoutArguments.
+
 	self emitPreamble: aBlockNode.
 	self emitMetaLinkBefore: aBlockNode.
-	valueTranslator visitNode: aBlockNode body.
-	methodBuilder addBlockReturnTopIfRequired.
-	self flag: 'why dont we just add a blockReturnTop here... it could be removed or ignored in IRTranslator'.
-	methodBuilder jumpAheadTarget: #block.
-	] ifTrue: [ self emitMetaLinkInstead: aBlockNode ].
-	self emitMetaLinkAfterNoEnsure: aBlockNode.
-
 
 
+	aBlockNode hasMetalinkInstead
+				ifTrue: [ self emitMetaLinkInstead: aBlockNode ]
+				ifFalse: [  
+	compiledBlock := self compilationContext astTranslatorClass new translateFullBlock: aBlockNode.	
+	(self compilationContext optionCleanBlockClosure and: [ aBlockNode isClean ])
+		ifTrue: [ methodBuilder pushLiteral: ((CleanBlockClosure new: 0) numArgs: compiledBlock numArgs; compiledBlock: compiledBlock)]
+		ifFalse: [methodBuilder pushFullClosureCompiledBlock: compiledBlock copiedValues: aBlockNode scope inComingCopiedVarNames  ].
+	].
+	self emitMetaLinkAfterNoEnsure: aBlockNode.
 ]
 
 { #category : #'visitor - double dispatching' }
@@ -290,6 +271,20 @@ RFASTTranslator >> visitReturnNode: aReturnNode [
 
 ]
 
+{ #category : #'visitor - double dispatching' }
+RFASTTranslator >> visitSequenceWithAfter: aSequenceNode [
+	| wrappedBlock compiledBlock |
+	wrappedBlock := RBBlockNode body: (RBSequenceNode statements: aSequenceNode statements).
+	wrappedBlock parent: aSequenceNode.
+	wrappedBlock scope: (aSequenceNode parent scope newBlockScope: 20).
+	 (aSequenceNode parent scope copiedVars, aSequenceNode parent scope tempVars) do: [ :var |
+		wrappedBlock scope addCopyingTempToAllScopesUpToDefTemp: var].
+
+	compiledBlock := self compilationContext astTranslatorClass new translateFullBlock: wrappedBlock.
+	methodBuilder pushFullClosureCompiledBlock: compiledBlock copiedValues: wrappedBlock scope copiedVarNames.
+	self emitMetaLinkAfterEnsure: aSequenceNode.
+]
+
 { #category : #reflectivity }
 RFASTTranslator >> visitStoreIntoTempNode: aNode [
 	"we store the TOS into the temp defined by the reification node"

src/Reflectivity/RFASTTranslatorForEffect.class.st

@@ -110,15 +110,16 @@ RFASTTranslatorForEffect >> visitParseErrorNode: anErrorNode [
 
 { #category : #'visitor - double dispatching' }
 RFASTTranslatorForEffect >> visitSequenceNode: aSequenceNode [
+
 	self emitPreamble: aSequenceNode.
 	self emitMetaLinkBefore: aSequenceNode.
-	self emitPrepareLinkAfter: aSequenceNode.
+
+	aSequenceNode hasMetalinkAfter ifTrue: [ ^ self visitSequenceWithAfter: aSequenceNode  ].
 
 	aSequenceNode hasMetalinkInstead
 		ifTrue: [ self emitMetaLinkInstead: aSequenceNode ]
 		ifFalse: [ aSequenceNode statements do: [:each | self visitNode: each]. ].
-	self emitMetaLinkAfter: aSequenceNode.
-	(aSequenceNode hasMetalinkAfter or: [ aSequenceNode hasMetalinkInstead ]) ifTrue: [aSequenceNode parent isMethod 
+	aSequenceNode hasMetalinkInstead ifTrue: [aSequenceNode parent isMethod 
 			ifTrue: [methodBuilder returnTop]
 			ifFalse: [methodBuilder popTop]]
 ]

src/Reflectivity/RFASTTranslatorForValue.class.st

@@ -67,9 +67,11 @@ RFASTTranslatorForValue >> emitWhileTrue: aMessageNode [
 { #category : #'visitor - double dispatching' }
 RFASTTranslatorForValue >> visitSequenceNode: aSequenceNode [ 
 	| statements |
+
 	self emitPreamble: aSequenceNode.
 	self emitMetaLinkBefore: aSequenceNode.
-	self emitPrepareLinkAfter: aSequenceNode.
+
+	aSequenceNode hasMetalinkAfter ifTrue: [ ^ self visitSequenceWithAfter: aSequenceNode  ].
 
 	aSequenceNode hasMetalinkInstead
 		ifTrue: [ self emitMetaLinkInstead: aSequenceNode ]
@@ -80,6 +82,5 @@ RFASTTranslatorForValue >> visitSequenceNode: aSequenceNode [
 			^self].
 		statements allButLastDo: [:each | effectTranslator visitNode: each].
 		self visitNode: statements last.
-	].
-	self emitMetaLinkAfter: aSequenceNode.
+	]
 ]