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

Do not request FirProvider for built-in synthesized classes

Browse Source 
Because currently they don't have FIR and it might fail with an exception
This commit is contained in:
Denis Zharkov
2019-03-18 12:45:10 +03:00
parent 6daf414098
commit 1d16008eab
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypeResolverTransformer.kt
+1 -1
View File
@@ -145,7 +145,6 @@ class FirSupertypeResolverTransformer : FirAbstractTreeTransformer() {
} }
val sessionForSupertype = session.getService(FirSymbolProvider::class).getSessionForClass(superTypeClassId) ?: continue val sessionForSupertype = session.getService(FirSymbolProvider::class).getSessionForClass(superTypeClassId) ?: continue
val provider = sessionForSupertype.getService(FirProvider::class)
val firClassForSupertype = val firClassForSupertype =
sessionForSupertype sessionForSupertype
@@ -155,6 +154,7 @@ class FirSupertypeResolverTransformer : FirAbstractTreeTransformer() {
// TODO: this if is a temporary hack for built-in types (because we can't load file for them) // TODO: this if is a temporary hack for built-in types (because we can't load file for them)
if (firClassForSupertype == null || firClassForSupertype.superTypeRefs.any { it !is FirResolvedTypeRef }) { if (firClassForSupertype == null || firClassForSupertype.superTypeRefs.any { it !is FirResolvedTypeRef }) {
val provider = sessionForSupertype.getService(FirProvider::class)
val firForSuperClassFile = provider.getFirClassifierContainerFile(superTypeClassId) val firForSuperClassFile = provider.getFirClassifierContainerFile(superTypeClassId)
ResolveSuperTypesTask( ResolveSuperTypesTask(