KT-10752: if (inferred) type for an expression refers to a Java class
non-accessible in the current context, it is a compiler error. Otherwise we might generate a CHECKCAST instruction that causes IAE at run-time. Here we are somewhat less permissive then Java (see inaccessibleType.kt in diagnostics tests).
This commit is contained in:
+94
@@ -0,0 +1,94 @@
|
||||
/*
|
||||
* Copyright 2010-2016 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin.resolve.jvm.checkers
|
||||
|
||||
import com.intellij.util.SmartList
|
||||
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
||||
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
||||
import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
|
||||
import org.jetbrains.kotlin.descriptors.Visibilities
|
||||
import org.jetbrains.kotlin.diagnostics.Errors
|
||||
import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor
|
||||
import org.jetbrains.kotlin.psi.KtExpression
|
||||
import org.jetbrains.kotlin.resolve.calls.checkers.AdditionalTypeChecker
|
||||
import org.jetbrains.kotlin.resolve.calls.context.CallResolutionContext
|
||||
import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext
|
||||
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
|
||||
import org.jetbrains.kotlin.types.KotlinType
|
||||
|
||||
|
||||
class JavaTypeAccessibilityChecker : AdditionalTypeChecker {
|
||||
override fun checkType(
|
||||
expression: KtExpression,
|
||||
expressionType: KotlinType,
|
||||
expressionTypeWithSmartCast: KotlinType,
|
||||
c: ResolutionContext<*>
|
||||
) {
|
||||
// NB in Kotlin class hierarchy leading to "pathological" type inference is impossible
|
||||
// due to EXPOSED_SUPER_CLASS & EXPOSED_SUPER_INTERFACE checks.
|
||||
// To avoid superfluous diagnostics in case of invisible member class and so on,
|
||||
// we consider only Java classes as possibly inaccessible.
|
||||
|
||||
val inaccessibleTypes = findInaccessibleJavaTypes(expressionType, c)
|
||||
if (inaccessibleTypes.isNotEmpty()) {
|
||||
c.trace.report(Errors.INACCESSIBLE_TYPE.on(expression, expressionType, inaccessibleTypes))
|
||||
return
|
||||
}
|
||||
|
||||
if (expressionTypeWithSmartCast != expressionType) {
|
||||
val inaccessibleTypesWithSmartCast = findInaccessibleJavaTypes(expressionTypeWithSmartCast, c)
|
||||
if (inaccessibleTypesWithSmartCast.isNotEmpty()) {
|
||||
c.trace.report(Errors.INACCESSIBLE_TYPE.on(expression, expressionType, inaccessibleTypes))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun checkReceiver(
|
||||
receiverParameter: ReceiverParameterDescriptor,
|
||||
receiverArgument: ReceiverValue,
|
||||
safeAccess: Boolean,
|
||||
c: CallResolutionContext<*>
|
||||
) {}
|
||||
|
||||
private fun findInaccessibleJavaTypes(type: KotlinType, c: ResolutionContext<*>): List<KotlinType> {
|
||||
val scopeOwner = c.scope.ownerDescriptor
|
||||
val inaccessibleTypes = SmartList<KotlinType>()
|
||||
findInaccessibleJavaTypesRec(type, scopeOwner, inaccessibleTypes, hashSetOf())
|
||||
return inaccessibleTypes
|
||||
}
|
||||
|
||||
private fun findInaccessibleJavaTypesRec(
|
||||
type: KotlinType,
|
||||
scopeOwner: DeclarationDescriptor,
|
||||
inaccessibleTypes: SmartList<KotlinType>,
|
||||
visitedTypeConstructors: MutableSet<DeclarationDescriptor>
|
||||
) {
|
||||
val typeConstructor = type.constructor.declarationDescriptor
|
||||
if (typeConstructor is ClassDescriptor) {
|
||||
if (visitedTypeConstructors.contains(typeConstructor)) return
|
||||
visitedTypeConstructors.add(typeConstructor)
|
||||
|
||||
if (typeConstructor is JavaClassDescriptor && !Visibilities.isVisibleWithIrrelevantReceiver(typeConstructor, scopeOwner)) {
|
||||
inaccessibleTypes.add(type)
|
||||
}
|
||||
for (typeProjection in type.arguments) {
|
||||
findInaccessibleJavaTypesRec(typeProjection.type, scopeOwner, inaccessibleTypes, visitedTypeConstructors)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
+2
-1
@@ -57,7 +57,8 @@ object JvmPlatformConfigurator : PlatformConfigurator(
|
||||
additionalTypeCheckers = listOf(
|
||||
JavaNullabilityWarningsChecker(),
|
||||
RuntimeAssertionsTypeChecker,
|
||||
JavaGenericVarianceViolationTypeChecker
|
||||
JavaGenericVarianceViolationTypeChecker,
|
||||
JavaTypeAccessibilityChecker()
|
||||
),
|
||||
|
||||
additionalSymbolUsageValidators = listOf(),
|
||||
|
||||
Reference in New Issue
Block a user