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

Fix compilation against bootstrap compiler

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2019-05-27 16:28:11 +03:00
parent c30e045b1b
commit 9f62920556
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt
+1 -1
View File
@@ -508,7 +508,7 @@ class ControlFlowInformationProvider private constructor(
} }
} }
if (descriptor == null) { if (descriptor == null) {
val descriptors = trace.get(BindingContext.AMBIGUOUS_REFERENCE_TARGET, operationReference) ?: emptyList() val descriptors = trace.get(AMBIGUOUS_REFERENCE_TARGET, operationReference) ?: emptyList<DeclarationDescriptor>()
for (referenceDescriptor in descriptors) { for (referenceDescriptor in descriptors) {
if ((referenceDescriptor as? FunctionDescriptor)?.returnType?.let { KotlinBuiltIns.isUnit(it) } == true) { if ((referenceDescriptor as? FunctionDescriptor)?.returnType?.let { KotlinBuiltIns.isUnit(it) } == true) {
hasReassignMethodReturningUnit = true hasReassignMethodReturningUnit = true
nj2k/src/org/jetbrains/kotlin/nj2k/conversions/StaticMemberAccessConversion.kt
+1 -1
View File
@@ -74,7 +74,7 @@ class StaticMemberAccessConversion(private val context: NewJ2kConverterContext)
is JKTreeElement -> is JKTreeElement ->
target.parentOfType<JKClass>()?.let { klass -> target.parentOfType<JKClass>()?.let { klass ->
if (klass.classKind == JKClass.ClassKind.COMPANION) klass.parentOfType() if (klass.classKind == JKClass.ClassKind.COMPANION) klass.parentOfType<JKClass>()
else klass else klass
}?.let { context.symbolProvider.provideUniverseSymbol(it) } }?.let { context.symbolProvider.provideUniverseSymbol(it) }
else -> error("bad isStaticMember") else -> error("bad isStaticMember")