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

Load Java overrides of Kotlin suspend functions as suspend, too

Browse Source 
There's still some blind spots:
- Covariant overrides in Java (KT-25036)
- Current implementation assumes that when language version is 1.3 every suspend function
reference only release-coroutines-package Continuation
(we need to check if it's a correct statement)

 #KT-24848 Fixed
 #KT-25036 Open
This commit is contained in:
Denis Zharkov
2018-06-22 10:42:02 +03:00
parent 0fc9bb3f4a
commit 3b968351bb
24 changed files with 646 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/context.kt
+20 -2
View File
@@ -59,7 +59,8 @@ class JavaResolverComponents(
val reflectionTypes: ReflectionTypes,
val annotationTypeQualifierResolver: AnnotationTypeQualifierResolver,
val signatureEnhancement: SignatureEnhancement,
val javaClassesTracker: JavaClassesTracker
val javaClassesTracker: JavaClassesTracker,
val settings: JavaResolverSettings
) {
fun replace(
javaResolverCache: JavaResolverCache = this.javaResolverCache
@@ -68,10 +69,27 @@ class JavaResolverComponents(
signaturePropagator, errorReporter, javaResolverCache,
javaPropertyInitializerEvaluator, samConversionResolver, sourceElementFactory,
moduleClassResolver, packageMapper, supertypeLoopChecker, lookupTracker, module, reflectionTypes,
annotationTypeQualifierResolver, signatureEnhancement, javaClassesTracker
annotationTypeQualifierResolver, signatureEnhancement, javaClassesTracker,
settings
)
}
interface JavaResolverSettings {
val isReleaseCoroutines: Boolean
object Default : JavaResolverSettings {
override val isReleaseCoroutines: Boolean
get() = false
}
companion object {
fun create(isReleaseCoroutines: Boolean): JavaResolverSettings =
object : JavaResolverSettings {
override val isReleaseCoroutines get() = isReleaseCoroutines
}
}
}
private typealias QualifierByApplicabilityType = EnumMap<AnnotationTypeQualifierResolver.QualifierApplicabilityType, NullabilityQualifierWithMigrationStatus?>
class JavaTypeQualifiersByElementType(
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt
+84 -24
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.load.java.lazy.descriptors
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.isContinuation
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.annotations.Annotations
import org.jetbrains.kotlin.descriptors.impl.ClassConstructorDescriptorImpl
@@ -47,6 +48,7 @@ import org.jetbrains.kotlin.resolve.DescriptorFactory
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.OverridingUtil
import org.jetbrains.kotlin.resolve.descriptorUtil.classId
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.serialization.deserialization.ErrorReporter
import org.jetbrains.kotlin.storage.NotNullLazyValue
@@ -54,6 +56,7 @@ import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
import org.jetbrains.kotlin.utils.SmartSet
import org.jetbrains.kotlin.utils.addIfNotNull
import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
import org.jetbrains.kotlin.utils.ifEmpty
import java.util.*
@@ -108,7 +111,9 @@ class LazyJavaClassMemberScope(
}
}) return false
return !function.doesOverrideRenamedBuiltins() && !function.shouldBeVisibleAsOverrideOfBuiltInWithErasedValueParameters()
return !function.doesOverrideRenamedBuiltins() &&
!function.shouldBeVisibleAsOverrideOfBuiltInWithErasedValueParameters() &&
!function.doesOverrideSuspendFunction()
}
/**
@@ -153,6 +158,29 @@ class LazyJavaClassMemberScope(
}
}
private fun SimpleFunctionDescriptor.doesOverrideSuspendFunction(): Boolean {
val suspendView = this.createSuspendView() ?: return false
return getFunctionsFromSupertypes(name).any { overriddenCandidate ->
overriddenCandidate.isSuspend && suspendView.doesOverride(overriddenCandidate)
}
}
private fun SimpleFunctionDescriptor.createSuspendView(): SimpleFunctionDescriptor? {
val continuationParameter = valueParameters.lastOrNull()?.takeIf {
isContinuation(
it.type.constructor.declarationDescriptor?.fqNameUnsafe?.takeIf { it.isSafe }?.toSafe(),
c.components.settings.isReleaseCoroutines
)
} ?: return null
return newCopyBuilder()
.setIsSuspend(true)
.setValueParameters(valueParameters.dropLast(1))
.setReturnType(continuationParameter.type.arguments[0].type)
.build()
}
private fun SimpleFunctionDescriptor.createRenamedCopy(builtinName: Name): SimpleFunctionDescriptor =
this.newCopyBuilder().apply {
setName(builtinName)
@@ -233,7 +261,9 @@ class LazyJavaClassMemberScope(
override fun computeNonDeclaredFunctions(result: MutableCollection<SimpleFunctionDescriptor>, name: Name) {
val functionsFromSupertypes = getFunctionsFromSupertypes(name)
if (!name.sameAsRenamedInJvmBuiltin && !name.sameAsBuiltinMethodWithErasedValueParameters) {
if (!name.sameAsRenamedInJvmBuiltin && !name.sameAsBuiltinMethodWithErasedValueParameters
&& functionsFromSupertypes.none(FunctionDescriptor::isSuspend)
) {
// Simple fast path in case of name is not suspicious (i.e. name is not one of builtins that have different signature in Java)
addFunctionFromSupertypes(
result, name,
@@ -251,13 +281,13 @@ class LazyJavaClassMemberScope(
)
// add declarations
addOverriddenBuiltinMethods(
addOverriddenSpecialMethods(
name, result, mergedFunctionFromSuperTypes, result,
this::searchMethodsByNameWithoutBuiltinMagic
)
// add from super types
addOverriddenBuiltinMethods(
addOverriddenSpecialMethods(
name, result, mergedFunctionFromSuperTypes, specialBuiltinsFromSuperTypes,
this::searchMethodsInSupertypesWithoutBuiltinMagic
)
@@ -293,7 +323,9 @@ class LazyJavaClassMemberScope(
}
}
private fun addOverriddenBuiltinMethods(
// - Built-in (collections) methods with different signature in JDK
// - Suspend functions
private fun addOverriddenSpecialMethods(
name: Name,
alreadyDeclaredFunctions: Collection<SimpleFunctionDescriptor>,
candidatesForOverride: Collection<SimpleFunctionDescriptor>,
@@ -301,31 +333,59 @@ class LazyJavaClassMemberScope(
functions: (Name) -> Collection<SimpleFunctionDescriptor>
) {
for (descriptor in candidatesForOverride) {
val overriddenBuiltin = descriptor.getOverriddenBuiltinWithDifferentJvmName() ?: continue
result.addIfNotNull(
obtainOverrideForBuiltinWithDifferentJvmName(descriptor, functions, name, alreadyDeclaredFunctions)
)
result.addIfNotNull(
obtainOverrideForBuiltInWithErasedValueParametersInJava(descriptor, functions, alreadyDeclaredFunctions)
)
val nameInJava = getJvmMethodNameIfSpecial(overriddenBuiltin)!!
for (method in functions(Name.identifier(nameInJava))) {
val renamedCopy = method.createRenamedCopy(name)
result.addIfNotNull(obtainOverrideForSuspend(descriptor, functions))
}
}
if (doesOverrideRenamedDescriptor(overriddenBuiltin, renamedCopy)) {
result.add(
renamedCopy.createHiddenCopyIfBuiltinAlreadyAccidentallyOverridden(overriddenBuiltin, alreadyDeclaredFunctions)
)
break
}
private fun obtainOverrideForBuiltInWithErasedValueParametersInJava(
descriptor: SimpleFunctionDescriptor,
functions: (Name) -> Collection<SimpleFunctionDescriptor>,
alreadyDeclaredFunctions: Collection<SimpleFunctionDescriptor>
): SimpleFunctionDescriptor? {
val overriddenBuiltin =
BuiltinMethodsWithSpecialGenericSignature.getOverriddenBuiltinFunctionWithErasedValueParametersInJava(descriptor)
?: return null
return createOverrideForBuiltinFunctionWithErasedParameterIfNeeded(overriddenBuiltin, functions)
?.takeIf(this::isVisibleAsFunctionInCurrentClass)
?.createHiddenCopyIfBuiltinAlreadyAccidentallyOverridden(overriddenBuiltin, alreadyDeclaredFunctions)
}
private fun obtainOverrideForBuiltinWithDifferentJvmName(
descriptor: SimpleFunctionDescriptor,
functions: (Name) -> Collection<SimpleFunctionDescriptor>,
name: Name,
alreadyDeclaredFunctions: Collection<SimpleFunctionDescriptor>
): SimpleFunctionDescriptor? {
val overriddenBuiltin = descriptor.getOverriddenBuiltinWithDifferentJvmName() ?: return null
val nameInJava = getJvmMethodNameIfSpecial(overriddenBuiltin)!!
for (method in functions(Name.identifier(nameInJava))) {
val renamedCopy = method.createRenamedCopy(name)
if (doesOverrideRenamedDescriptor(overriddenBuiltin, renamedCopy)) {
return renamedCopy.createHiddenCopyIfBuiltinAlreadyAccidentallyOverridden(overriddenBuiltin, alreadyDeclaredFunctions)
}
}
for (descriptor in candidatesForOverride) {
val overriddenBuiltin =
BuiltinMethodsWithSpecialGenericSignature.getOverriddenBuiltinFunctionWithErasedValueParametersInJava(descriptor)
?: continue
return null
}
createOverrideForBuiltinFunctionWithErasedParameterIfNeeded(overriddenBuiltin, functions)?.let { override ->
if (isVisibleAsFunctionInCurrentClass(override)) {
result.add(override.createHiddenCopyIfBuiltinAlreadyAccidentallyOverridden(overriddenBuiltin, alreadyDeclaredFunctions))
}
}
private fun obtainOverrideForSuspend(
descriptor: SimpleFunctionDescriptor,
functions: (Name) -> Collection<SimpleFunctionDescriptor>
): SimpleFunctionDescriptor? {
if (!descriptor.isSuspend) return null
return functions(descriptor.name).firstNotNullResult { overrideCandidate ->
overrideCandidate.createSuspendView()?.takeIf { suspendView -> suspendView.doesOverride(descriptor) }
}
}
core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeModuleData.kt
+3 -1
View File
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.load.java.components.JavaResolverCache
import org.jetbrains.kotlin.load.java.components.SamConversionResolver
import org.jetbrains.kotlin.load.java.components.SignaturePropagator
import org.jetbrains.kotlin.load.java.lazy.JavaResolverComponents
import org.jetbrains.kotlin.load.java.lazy.JavaResolverSettings
import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider
import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver
import org.jetbrains.kotlin.load.java.typeEnhancement.SignatureEnhancement
@@ -72,7 +73,8 @@ class RuntimeModuleData private constructor(
ReflectionTypes(module, notFoundClasses),
annotationTypeQualifierResolver,
SignatureEnhancement(annotationTypeQualifierResolver, Jsr305State.DISABLED),
JavaClassesTracker.Default
JavaClassesTracker.Default,
JavaResolverSettings.Default
)
val lazyJavaPackageFragmentProvider = LazyJavaPackageFragmentProvider(globalJavaResolverContext)
core/descriptors/src/org/jetbrains/kotlin/builtins/suspendFunctionTypes.kt
+1 -1
View File
@@ -106,7 +106,7 @@ fun transformRuntimeFunctionTypeToSuspendFunction(funType: KotlinType, isRelease
).makeNullableAsSpecified(funType.isMarkedNullable)
}
private fun isContinuation(name: FqName?, isReleaseCoroutines: Boolean): Boolean {
fun isContinuation(name: FqName?, isReleaseCoroutines: Boolean): Boolean {
return if (isReleaseCoroutines) name == DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_RELEASE
else name == DescriptorUtils.CONTINUATION_INTERFACE_FQ_NAME_EXPERIMENTAL
}
core/descriptors/src/org/jetbrains/kotlin/descriptors/FunctionDescriptor.java
+1 -1
View File
@@ -145,7 +145,7 @@ public interface FunctionDescriptor extends CallableMemberDescriptor {
CopyBuilder<D> setDropOriginalInContainingParts();
@NotNull
CopyBuilder<D> setDropSuspend();
CopyBuilder<D> setIsSuspend(boolean isSuspend);
@NotNull
CopyBuilder<D> setHiddenToOvercomeSignatureClash();
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java
+8 -10
View File
@@ -376,7 +376,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
private Map<UserDataKey<?>, Object> userDataMap = new LinkedHashMap<UserDataKey<?>, Object>();
private Boolean newHasSynthesizedParameterNames = null;
protected boolean justForTypeSubstitution = false;
private boolean dropSuspend = false;
private boolean isSuspend;
public CopyConfiguration(
@NotNull TypeSubstitution substitution,
@@ -387,7 +387,8 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
@NotNull List<ValueParameterDescriptor> newValueParameterDescriptors,
@Nullable KotlinType newExtensionReceiverParameterType,
@NotNull KotlinType newReturnType,
@Nullable Name name
@Nullable Name name,
boolean isSuspend
) {
this.substitution = substitution;
this.newOwner = newOwner;
@@ -398,6 +399,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
this.newExtensionReceiverParameterType = newExtensionReceiverParameterType;
this.newReturnType = newReturnType;
this.name = name;
this.isSuspend = isSuspend;
}
@Override
@@ -507,8 +509,8 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
@Override
@NotNull
public CopyConfiguration setDropSuspend() {
this.dropSuspend = true;
public CopyConfiguration setIsSuspend(boolean isSuspend) {
this.isSuspend = isSuspend;
return this;
}
@@ -586,7 +588,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
return new CopyConfiguration(
substitutor.getSubstitution(),
getContainingDeclaration(), getModality(), getVisibility(), getKind(), getValueParameters(),
getExtensionReceiverParameterType(), getReturnType(), null);
getExtensionReceiverParameterType(), getReturnType(), null, isSuspend);
}
@Nullable
@@ -676,11 +678,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
substitutedDescriptor.setExternal(isExternal);
substitutedDescriptor.setInline(isInline);
substitutedDescriptor.setTailrec(isTailrec);
if (configuration.dropSuspend) {
substitutedDescriptor.setSuspend(false);
} else {
substitutedDescriptor.setSuspend(isSuspend);
}
substitutedDescriptor.setSuspend(configuration.isSuspend);
substitutedDescriptor.setExpect(isExpect);
substitutedDescriptor.setActual(isActual);
substitutedDescriptor.setHasStableParameterNames(hasStableParameterNames);
core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorSimpleFunctionDescriptorImpl.java
+1 -1
View File
@@ -170,7 +170,7 @@ public class ErrorSimpleFunctionDescriptorImpl extends SimpleFunctionDescriptorI
@NotNull
@Override
public CopyBuilder<SimpleFunctionDescriptor> setDropSuspend() {
public CopyBuilder<SimpleFunctionDescriptor> setIsSuspend(boolean isSuspend) {
return this;
}