azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR resolve: add early protection against cyclic property resolve

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-07-15 17:47:38 +03:00
parent 1222449dc8
commit 08f44d4f14
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirBodyResolveTransformer.kt
+3
View File
@@ -1051,6 +1051,9 @@ open class FirBodyResolveTransformer(
override fun transformProperty(property: FirProperty, data: Any?): CompositeTransformResult<FirDeclaration> { override fun transformProperty(property: FirProperty, data: Any?): CompositeTransformResult<FirDeclaration> {
val returnTypeRef = property.returnTypeRef val returnTypeRef = property.returnTypeRef
if (returnTypeRef !is FirImplicitTypeRef && implicitTypeOnly) return property.compose() if (returnTypeRef !is FirImplicitTypeRef && implicitTypeOnly) return property.compose()
if (returnTypeRef is FirImplicitTypeRef) {
property.transformReturnTypeRef(StoreType, FirComputingImplicitTypeRef)
}
return withScopeCleanup(localScopes) { return withScopeCleanup(localScopes) {
localScopes.addIfNotNull(primaryConstructorParametersScope) localScopes.addIfNotNull(primaryConstructorParametersScope)
withContainer(property) { withContainer(property) {