Refine 1.0-compatibility mode for JDK dependent members

- calls must be prohibited iff they refer to some additonal built in member
- override must be prohibited iff all of the overridden descriptors are additional

Other usages were able to be successfully compiled by 1.0.x

Solution with @Deprecated(level=Error) doesn't work properly, because
deprecation propagates to overridden, thus call 'java.util.ArrayList<String>().stream()'
becomes invalid, while it was correct in 1.0.x

 #KT-15794 Fixed

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/AdditionalBuiltInsMembersChecker.kt

@@ -28,8 +28,21 @@ import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker
+import org.jetbrains.kotlin.resolve.calls.checkers.CallCheckerContext
+import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.checkers.DeclarationChecker
-import org.jetbrains.kotlin.resolve.descriptorUtil.overriddenTreeUniqueAsSequence
+
+object AdditionalBuiltInsMembersCallChecker : CallChecker {
+    override fun check(resolvedCall: ResolvedCall<*>, reportOn: PsiElement, context: CallCheckerContext) {
+        if (context.languageVersionSettings.supportsFeature(LanguageFeature.AdditionalBuiltInsMembers)) return
+        val resultingDescriptor = resolvedCall.resultingDescriptor as? CallableMemberDescriptor ?: return
+
+        if (resultingDescriptor.isAdditionalBuiltInMember()) {
+            context.trace.report(Errors.UNSUPPORTED_FEATURE.on(reportOn, LanguageFeature.AdditionalBuiltInsMembers))
+        }
+    }
+}
 
 object AdditionalBuiltInsMemberOverrideDeclarationChecker : DeclarationChecker {
     override fun check(
@@ -43,19 +56,11 @@ object AdditionalBuiltInsMemberOverrideDeclarationChecker : DeclarationChecker {
         val resultingDescriptor = descriptor as? CallableMemberDescriptor ?: return
         val overrideKeyword = declaration.modifierList?.getModifier(KtTokens.OVERRIDE_KEYWORD) ?: return
 
-        // TODO: allow to omit 'override' on additional built-ins members
+        if (resultingDescriptor.original.overriddenDescriptors.all { it.isAdditionalBuiltInMember() }) {
-        reportErrorIfAdditionalBuiltinDescriptor(resultingDescriptor, diagnosticHolder, overrideKeyword)
+            diagnosticHolder.report(Errors.UNSUPPORTED_FEATURE.on(overrideKeyword, LanguageFeature.AdditionalBuiltInsMembers))
+        }
     }
 }
 
-private fun reportErrorIfAdditionalBuiltinDescriptor(
+private fun CallableMemberDescriptor.isAdditionalBuiltInMember() =
-        descriptor: CallableMemberDescriptor,
+        KotlinBuiltIns.isBuiltIn(this) && this is JavaCallableMemberDescriptor
-        diagnosticHolder: DiagnosticSink,
-        reportOn: PsiElement
-) {
-    val overriddenTree = descriptor.overriddenTreeUniqueAsSequence(useOriginal = true)
-
-    if (overriddenTree.any { KotlinBuiltIns.isBuiltIn(it) && it is JavaCallableMemberDescriptor }) {
-        diagnosticHolder.report(Errors.UNSUPPORTED_FEATURE.on(reportOn, LanguageFeature.AdditionalBuiltInsMembers))
-    }
-}

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt

@@ -22,11 +22,10 @@ import org.jetbrains.kotlin.container.useInstance
 import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
 import org.jetbrains.kotlin.resolve.PlatformConfigurator
 import org.jetbrains.kotlin.resolve.calls.checkers.ReifiedTypeParameterSubstitutionChecker
-import org.jetbrains.kotlin.resolve.checkers.MissingDependencyClassChecker
 import org.jetbrains.kotlin.resolve.checkers.HeaderImplDeclarationChecker
+import org.jetbrains.kotlin.resolve.checkers.MissingDependencyClassChecker
 import org.jetbrains.kotlin.resolve.jvm.*
 import org.jetbrains.kotlin.resolve.jvm.checkers.*
-import org.jetbrains.kotlin.resolve.lazy.DelegationFilter
 import org.jetbrains.kotlin.synthetic.JavaSyntheticConstructorsProvider
 import org.jetbrains.kotlin.synthetic.JavaSyntheticScopes
 import org.jetbrains.kotlin.types.DynamicTypesSettings
@@ -58,7 +57,8 @@ object JvmPlatformConfigurator : PlatformConfigurator(
                 SuperCallWithDefaultArgumentsChecker(),
                 MissingDependencyClassChecker,
                 ProtectedSyntheticExtensionCallChecker,
-                ReifiedTypeParameterSubstitutionChecker()
+                ReifiedTypeParameterSubstitutionChecker(),
+                AdditionalBuiltInsMembersCallChecker
         ),
 
         additionalTypeCheckers = listOf(

compiler/testData/diagnostics/testsWithJava8/targetedBuiltIns/unsupportedFeature.kt

@@ -3,20 +3,24 @@
 // SKIP_TXT
 
 class A : java.util.ArrayList<String>() {
-    <!UNSUPPORTED_FEATURE!>override<!> fun stream(): java.util.stream.Stream<String> = super.<!DEPRECATION_ERROR!>stream<!>()
+    override fun stream(): java.util.stream.Stream<String> = super.stream()
 }
 
 class A1 : java.util.ArrayList<String>() {
-    fun stream(): java.util.stream.Stream<String> = super.<!DEPRECATION_ERROR!>stream<!>()
+    fun stream(): java.util.stream.Stream<String> = super.stream()
 }
 
-class B : <!DEPRECATION_ERROR!>Throwable<!>("", null, false, false)
+interface A2 : List<String> {
+    <!UNSUPPORTED_FEATURE!>override<!> fun stream(): java.util.stream.Stream<String> = null!!
+}
+
+class B : <!UNSUPPORTED_FEATURE!>Throwable<!>("", null, false, false)
 
 fun Throwable.<!EXTENSION_SHADOWED_BY_MEMBER!>fillInStackTrace<!>() = 1
 
 fun foo(x: List<String>, y: Throwable) {
-    x.<!DEPRECATION_ERROR!>stream<!>()
+    x.<!UNSUPPORTED_FEATURE!>stream<!>()
-    java.util.ArrayList<String>().<!DEPRECATION_ERROR!>stream<!>()
+    java.util.ArrayList<String>().stream()
 
     y.fillInStackTrace() checkType { _<Int>() }
 

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsSettings.kt

@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.builtins.JvmBuiltInClassDescriptorFactory
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptorImpl
+import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationsImpl
 import org.jetbrains.kotlin.descriptors.annotations.createDeprecatedAnnotation
 import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl
@@ -81,10 +82,9 @@ open class JvmBuiltInsSettings(
         ).let { AnnotationsImpl(listOf(it)) }
     }
 
-    private val notSupportedDeprecation by storageManager.createLazyValue {
+    private val lowPriorityAnnotation: Annotations by storageManager.createLazyValue {
-        // We use both LowPriorityInOverloadResolution to achieve the following goals:
+        // We use both LowPriorityInOverloadResolution to achieve the following goal:
-        // - If there is something to resolve to beside an additional built-in member, it's *almost* always will win
+        // If there is something to resolve to beside an additional built-in member, it's *almost* always will win
-        // - Otherwise error will be reported because of Deprecated annotation with Error level
         val lowPriorityAnnotation =
                 ClassDescriptorImpl(
                         moduleDescriptor.getPackage(LOW_PRIORITY_IN_OVERLOAD_RESOLUTION_FQ_NAME.parent()), LOW_PRIORITY_IN_OVERLOAD_RESOLUTION_FQ_NAME.shortName(),
@@ -95,12 +95,7 @@ open class JvmBuiltInsSettings(
                     AnnotationDescriptorImpl(defaultType, emptyMap(), SourceElement.NO_SOURCE)
                 }
 
-        val errorDeprecation = moduleDescriptor.builtIns.createDeprecatedAnnotation(
+        AnnotationsImpl(listOf(lowPriorityAnnotation))
-                "This member is not supported by Kotlin compiler on this language level",
-                level = DeprecationLevel.ERROR.name
-        )
-
-        AnnotationsImpl(listOf(lowPriorityAnnotation, errorDeprecation))
     }
 
     private fun StorageManager.createMockJavaIoSerializableType(): KotlinType {
@@ -162,7 +157,7 @@ open class JvmBuiltInsSettings(
 
                     JDKMemberStatus.NOT_CONSIDERED -> {
                         if (!isAdditionalBuiltInsFeatureSupported) {
-                            setAdditionalAnnotations(notSupportedDeprecation)
+                            setAdditionalAnnotations(lowPriorityAnnotation)
                         }
                         else {
                             setAdditionalAnnotations(notConsideredDeprecation)
@@ -173,7 +168,7 @@ open class JvmBuiltInsSettings(
 
                     JDKMemberStatus.WHITE_LIST -> {
                         if (!isAdditionalBuiltInsFeatureSupported) {
-                            setAdditionalAnnotations(notSupportedDeprecation)
+                            setAdditionalAnnotations(lowPriorityAnnotation)
                         }
                     }
                 }
@@ -321,7 +316,7 @@ open class JvmBuiltInsSettings(
                 setSubstitution(substitutor.substitution)
 
                 if (!isAdditionalBuiltInsFeatureSupported) {
-                    setAdditionalAnnotations(notSupportedDeprecation)
+                    setAdditionalAnnotations(lowPriorityAnnotation)
                 }
                 else if (SignatureBuildingComponents.signature(javaAnalogueDescriptor, javaConstructor.computeJvmDescriptor()) !in WHITE_LIST_CONSTRUCTOR_SIGNATURES) {
                     setAdditionalAnnotations(notConsideredDeprecation)