Undeprecate VariableDescriptorWithAccessors.isDelegated

Apparently there's quite a few valid usages of this method outside of
the compiler frontend, where manual suppression is annoying.
This commit is contained in:
Alexander Udalov
2020-07-06 21:17:55 +02:00
parent 50b2ea7053
commit 8c71d8f126
22 changed files with 36 additions and 45 deletions
@@ -31,7 +31,6 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.checkers.AdditionalTypeChecker
import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory
import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
import org.jetbrains.kotlin.types.KotlinType
@@ -52,7 +51,6 @@ object JvmArrayVariableInLoopAssignmentChecker : AdditionalTypeChecker {
val resolvedCall = lhsExpression.getResolvedCall(c.trace.bindingContext) ?: return
val variableDescriptor = resolvedCall.resultingDescriptor as? LocalVariableDescriptor ?: return
if (variableDescriptor is SyntheticFieldDescriptor) return
@Suppress("DEPRECATION")
if (variableDescriptor.isDelegated) return
val variableType = variableDescriptor.returnType
@@ -27,7 +27,7 @@ object JvmMultifileClassStateChecker : DeclarationChecker {
if (!JvmFileClassUtil.getFileClassInfoNoResolve(declaration.containingKtFile).withJvmMultifileClass) return
if (@Suppress("DEPRECATION") descriptor.isDelegated ||
if (descriptor.isDelegated ||
context.trace.bindingContext.get(BindingContext.BACKING_FIELD_REQUIRED, descriptor) == true) {
context.trace.report(ErrorsJvm.STATE_IN_MULTIFILE_CLASS.on(declaration))
}