Merge pull request #6153 from MarcusDenker/ReflectivityAfterOptimized…

…Blocks ReflectivityAfterOptimizedBlocks
pharo-project · Apr 8, 2020 · 944aa46 · 944aa46
2 parents b890df7 + 25263b0
commit 944aa46
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 4 deletions.
diff --git a/src/Reflectivity-Tests/GlobalForTesting.class.st b/src/Reflectivity-Tests/GlobalForTesting.class.st
@@ -4,5 +4,5 @@ I am used for testing
 Class {
 	#name : #GlobalForTesting,
 	#superclass : #Object,
-	#category : #'Reflectivity-Tests'
+	#category : #'Reflectivity-Tests-Data'
 }
diff --git a/src/Reflectivity-Tests/ReflectivityControlTest.class.st b/src/Reflectivity-Tests/ReflectivityControlTest.class.st
@@ -95,6 +95,24 @@ ReflectivityControlTest >> testAfterBlock [
 	self assert: (ReflectivityExamples >> #exampleBlock) class equals: CompiledMethod
 ]
 
+{ #category : #'tests - after' }
+ReflectivityControlTest >> testAfterBlockOptimizedIfTrue [
+	| blockNode |
+	blockNode := (ReflectivityExamples >> #exampleIfTrueIfFalse) ast blockNodes second.
+	self assert: blockNode isBlock.
+	link := MetaLink new
+		metaObject: self;
+		selector: #tagExec;
+		control: #after.
+	blockNode link: link.
+	self assert: blockNode hasMetalinkAfter.
+	self assert: (ReflectivityExamples >> #exampleIfTrueIfFalse) class equals: ReflectiveMethod.
+	self assert: tag isNil.
+	self assert: ReflectivityExamples new exampleIfTrueIfFalse identicalTo: 5.
+	self assert: tag equals: 'yes'.
+	self assert: (ReflectivityExamples >> #exampleIfTrueIfFalse) class equals: CompiledMethod
+]
+
 { #category : #'tests - after' }
 ReflectivityControlTest >> testAfterBlockSequence [
 	| sequence |

diff --git a/src/Reflectivity-Tests/ReflectivityExamples.class.st b/src/Reflectivity-Tests/ReflectivityExamples.class.st
@@ -12,7 +12,7 @@ Class {
 		'ClassVar',
 		'singleton'
 	],
-	#category : #'Reflectivity-Tests'
+	#category : #'Reflectivity-Tests-Data'
 }
 
 { #category : #options }

diff --git a/src/Reflectivity-Tests/ReflectivityExamples2.class.st b/src/Reflectivity-Tests/ReflectivityExamples2.class.st
@@ -10,7 +10,7 @@ Class {
 	#classVars : [
 		'classVar'
 	],
-	#category : #'Reflectivity-Tests'
+	#category : #'Reflectivity-Tests-Data'
 }
 
 { #category : #example }

diff --git a/src/Reflectivity-Tests/ReflectivityExamples2Subclass.class.st b/src/Reflectivity-Tests/ReflectivityExamples2Subclass.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #ReflectivityExamples2Subclass,
 	#superclass : #ReflectivityExamples2,
-	#category : #'Reflectivity-Tests'
+	#category : #'Reflectivity-Tests-Data'
 }
 
 { #category : #example }

diff --git a/src/Reflectivity/RFASTTranslator.class.st b/src/Reflectivity/RFASTTranslator.class.st
@@ -208,6 +208,7 @@ RFASTTranslator >> visitInlinedBlockNode: anOptimizedBlockNode [
 	self emitPreamble: anOptimizedBlockNode.
 	self emitMetaLinkBefore: anOptimizedBlockNode.
 	self visitNode: anOptimizedBlockNode body.
+	self emitMetaLinkAfterNoEnsure: anOptimizedBlockNode.
 ]
 
 { #category : #'visitor-double dispatching' }