- move setting the compiledMethod to #parseTree

- remove bcToASTCache
demarey · Jun 25, 2020 · 7aae0e4 · 7aae0e4
1 parent 4c60a3d
commit 7aae0e4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/src/AST-Core/ASTCacheMissStrategy.class.st b/src/AST-Core/ASTCacheMissStrategy.class.st
@@ -6,8 +6,5 @@ Class {
 
 { #category : #accessing }
 ASTCacheMissStrategy >> getASTFor: aCompiledMethod [
-	| ast |
-	ast := aCompiledMethod parseTree doSemanticAnalysisIn: aCompiledMethod methodClass.
-	ast compilationContext compiledMethod: aCompiledMethod.
-	^ast
+	^ aCompiledMethod parseTree doSemanticAnalysisIn: aCompiledMethod methodClass
 ]
diff --git a/src/AST-Core/CompiledMethod.extension.st b/src/AST-Core/CompiledMethod.extension.st
@@ -23,8 +23,11 @@ CompiledMethod >> firstComment [
 { #category : #'*AST-Core' }
 CompiledMethod >> parseTree [
 	"returns an AST for this method, do not cache it. (see #ast for the cached alternative)"
-	^self methodClass compiler 
+	| ast |
+	ast := self methodClass compiler 
 		source: self sourceCode;
 		failBlock: [^ self decompile ];
-		parse
+		parse.
+	ast compilationContext compiledMethod: self.
+	^ast
 ]
diff --git a/src/OpalCompiler-Core/RBMethodNode.extension.st b/src/OpalCompiler-Core/RBMethodNode.extension.st
@@ -64,7 +64,6 @@ RBMethodNode >> generate: trailer [
 { #category : #'*OpalCompiler-Core' }
 RBMethodNode >> generateIR [
 	| ir |
-	bcToASTCache := nil.
 	scope ifNil: [self doSemanticAnalysis].
  	ir := (self compilationContext astTranslatorClass new
 			visitNode: self)

diff --git a/src/Reflectivity/RFReflectivityASTCacheStrategy.class.st b/src/Reflectivity/RFReflectivityASTCacheStrategy.class.st
@@ -6,12 +6,8 @@ Class {
 
 { #category : #accessing }
 RFReflectivityASTCacheStrategy >> getASTFor: aCompiledMethod [
-	| ast |
-	ast := aCompiledMethod reflectiveMethod
+	^ aCompiledMethod reflectiveMethod
 		ifNil: [ aCompiledMethod parseTree
-				doSemanticAnalysisIn: aCompiledMethod methodClass.
-				 ]
-		ifNotNil: [ :rfMethod | rfMethod ast ].
-	ast compilationContext compiledMethod: aCompiledMethod.
-	^ast
+				doSemanticAnalysisIn: aCompiledMethod methodClass ]
+		ifNotNil: [ :rfMethod | rfMethod ast ]
 ]