Add MutableMap.remove(K, V) as built-in declaration

Use PlatformDependent annotation to guarantee it's only be available for JDK8
Also adjust type-safe bridges and mutable collection stubs generation

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

@@ -112,6 +112,9 @@ object BuiltinMethodsWithSpecialGenericSignature {
                             .method("containsKey", "Ljava/lang/Object;", JvmPrimitiveType.BOOLEAN.desc)          to DefaultValue.FALSE,
                     javaUtil("Map")
                             .method("containsValue", "Ljava/lang/Object;", JvmPrimitiveType.BOOLEAN.desc)        to DefaultValue.FALSE,
+                    javaUtil("Map")
+                            .method("remove", "Ljava/lang/Object;Ljava/lang/Object;",
+                                    JvmPrimitiveType.BOOLEAN.desc)                                               to DefaultValue.FALSE,
 
                     javaUtil("Map")
                             .method("get", "Ljava/lang/Object;", "Ljava/lang/Object;")                           to DefaultValue.NULL,

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

@@ -39,11 +39,13 @@ class DeserializationComponentsForJava(
 
     init {
         val localClassResolver = LocalClassResolverImpl()
+        val settings = JvmBuiltInsSettings(moduleDescriptor, { moduleDescriptor })
         components = DeserializationComponents(
                 storageManager, moduleDescriptor, classDataFinder, annotationAndConstantLoader, packageFragmentProvider, localClassResolver,
                 errorReporter, lookupTracker, FlexibleJavaClassifierTypeFactory, ClassDescriptorFactory.EMPTY,
                 notFoundClasses, JavaTypeCapabilitiesLoader,
-                additionalClassPartsProvider = JvmBuiltInsAdditionalClassPartsProvider(moduleDescriptor, { moduleDescriptor })
+                additionalClassPartsProvider = settings,
+                platformDependentDeclarationFilter = settings
         )
         localClassResolver.setDeserializationComponents(components)
     }

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

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.load.kotlin
 
-import org.jetbrains.kotlin.builtins.DefaultBuiltIns
+import org.jetbrains.kotlin.builtins.BuiltInsInitializer
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl
@@ -35,7 +35,10 @@ import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.serialization.deserialization.AdditionalClassPartsProvider
+import org.jetbrains.kotlin.serialization.deserialization.PLATFORM_DEPENDENT_ANNOTATION_FQ_NAME
+import org.jetbrains.kotlin.serialization.deserialization.PlatformDependentDeclarationFilter
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
+import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import org.jetbrains.kotlin.types.DelegatingType
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.utils.DFS
@@ -44,10 +47,10 @@ import org.jetbrains.kotlin.utils.addToStdlib.check
 import java.io.Serializable
 import java.util.*
 
-open class JvmBuiltInsAdditionalClassPartsProvider(
+open class JvmBuiltInsSettings(
         private val moduleDescriptor: ModuleDescriptor,
         deferredOwnerModuleDescriptor: () -> ModuleDescriptor
-) : AdditionalClassPartsProvider {
+) : AdditionalClassPartsProvider, PlatformDependentDeclarationFilter {
     private val j2kClassMap = JavaToKotlinClassMap.INSTANCE
 
     private val ownerModuleDescriptor: ModuleDescriptor by lazy(deferredOwnerModuleDescriptor)
@@ -107,7 +110,7 @@ open class JvmBuiltInsAdditionalClassPartsProvider(
     ): Collection<SimpleFunctionDescriptor> {
         val javaAnalogueDescriptor = classDescriptor.getJavaAnalogue() ?: return emptyList()
 
-        val kotlinClassDescriptors = j2kClassMap.mapPlatformClass(javaAnalogueDescriptor.fqNameSafe, DefaultBuiltIns.Instance)
+        val kotlinClassDescriptors = j2kClassMap.mapPlatformClass(javaAnalogueDescriptor.fqNameSafe, FallbackBuiltIns.Instance)
         val kotlinMutableClassIfContainer = kotlinClassDescriptors.lastOrNull() ?: return emptyList()
         val kotlinVersions = SmartSet.create(kotlinClassDescriptors.map { it.fqNameSafe })
 
@@ -181,7 +184,7 @@ open class JvmBuiltInsAdditionalClassPartsProvider(
         val javaAnalogueDescriptor = classDescriptor.getJavaAnalogue() ?: return emptyList()
 
         val defaultKotlinVersion =
-                j2kClassMap.mapJavaToKotlin(javaAnalogueDescriptor.fqNameSafe, DefaultBuiltIns.Instance) ?: return emptyList()
+                j2kClassMap.mapJavaToKotlin(javaAnalogueDescriptor.fqNameSafe, FallbackBuiltIns.Instance) ?: return emptyList()
 
         val substitutor = createMappedTypeParametersSubstitution(defaultKotlinVersion, javaAnalogueDescriptor).buildSubstitutor()
 
@@ -207,6 +210,17 @@ open class JvmBuiltInsAdditionalClassPartsProvider(
         }
     }
 
+    override fun isFunctionAvailable(classDescriptor: DeserializedClassDescriptor, functionDescriptor: SimpleFunctionDescriptor): Boolean {
+        if (!functionDescriptor.annotations.hasAnnotation(PLATFORM_DEPENDENT_ANNOTATION_FQ_NAME)) return true
+        val javaAnalogueClassDescriptor = classDescriptor.getJavaAnalogue() ?: return true
+
+        val jvmDescriptor = functionDescriptor.computeJvmDescriptor()
+        return javaAnalogueClassDescriptor
+                    .unsubstitutedMemberScope
+                    .getContributedFunctions(functionDescriptor.name, NoLookupLocation.FROM_BUILTINS)
+                    .any { it.computeJvmDescriptor() == jvmDescriptor }
+    }
+
     private fun ConstructorDescriptor.isTrivialCopyConstructorFor(classDescriptor: DeserializedClassDescriptor): Boolean
         = valueParameters.size == 1 &&
             valueParameters.single().type.constructor.declarationDescriptor?.fqNameUnsafe == classDescriptor.fqNameUnsafe
@@ -318,3 +332,17 @@ open class JvmBuiltInsAdditionalClassPartsProvider(
 }
 
 private val ClassDescriptor.isAny: Boolean get() = fqNameUnsafe == KotlinBuiltIns.FQ_NAMES.any
+
+private class FallbackBuiltIns private constructor() : KotlinBuiltIns(LockBasedStorageManager()) {
+    companion object {
+        private val initializer = BuiltInsInitializer {
+            FallbackBuiltIns()
+        }
+
+        @JvmStatic
+        val Instance: KotlinBuiltIns
+            get() = initializer.get()
+    }
+
+    override fun getPlatformDependentDeclarationFilter() = PlatformDependentDeclarationFilter.All
+}

core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JvmBuiltIns.kt

@@ -18,8 +18,9 @@ package org.jetbrains.kotlin.platform
 
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.load.kotlin.JvmBuiltInsAdditionalClassPartsProvider
+import org.jetbrains.kotlin.load.kotlin.JvmBuiltInsSettings
 import org.jetbrains.kotlin.serialization.deserialization.AdditionalClassPartsProvider
+import org.jetbrains.kotlin.serialization.deserialization.PlatformDependentDeclarationFilter
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.kotlin.utils.sure
 
@@ -32,9 +33,17 @@ class JvmBuiltIns(storageManager: StorageManager) : KotlinBuiltIns(storageManage
         this.ownerModuleDescriptor = moduleDescriptor
     }
 
-    override fun getAdditionalClassPartsProvider(): AdditionalClassPartsProvider {
-        return JvmBuiltInsAdditionalClassPartsProvider(builtInsModule, {
-            ownerModuleDescriptor.sure { "JvmBuiltins has not been initialized properly" }
-        })
+    private lateinit var settings: JvmBuiltInsSettings
+
+    // Here we know order in which KotlinBuiltIns constructor calls these methods
+    override fun getPlatformDependentDeclarationFilter(): PlatformDependentDeclarationFilter {
+        settings = JvmBuiltInsSettings(
+                builtInsModule,
+                { ownerModuleDescriptor.sure { "JvmBuiltins has not been initialized properly" } }
+        )
+
+        return settings
     }
+
+    override fun getAdditionalClassPartsProvider() = settings
 }