Wire StorageManager into a ClassTypeConstructorImpl and ClassDescriptorImpl

compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt

@@ -38,6 +38,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.getAllSuperclassesWithoutAny
 import org.jetbrains.kotlin.resolve.descriptorUtil.overriddenTreeUniqueAsSequence
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.CollectionStub
 import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodGenericSignature
+import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import org.jetbrains.kotlin.types.*
 import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
 import org.jetbrains.kotlin.types.checker.KotlinTypeCheckerImpl
@@ -309,8 +310,16 @@ class CollectionStubMethodGenerator(
     }
 
     private fun createSyntheticSubclass(): Pair<MutableClassDescriptor, List<TypeParameterDescriptor>> {
-        val child = MutableClassDescriptor(descriptor.containingDeclaration, ClassKind.CLASS, /* isInner = */ false,
-                /* isExternal */ false, Name.special("<synthetic inheritor of ${descriptor.name}>"), descriptor.source)
+        val child = MutableClassDescriptor(
+            descriptor.containingDeclaration,
+            ClassKind.CLASS,
+            /* isInner = */ false,
+            /* isExternal */ false,
+            Name.special("<synthetic inheritor of ${descriptor.name}>"),
+            descriptor.source,
+            LockBasedStorageManager.NO_LOCKS
+        )
+
         child.modality = Modality.FINAL
         child.visibility = Visibilities.PUBLIC
         val typeParameters = descriptor.typeConstructor.parameters

compiler/backend/src/org/jetbrains/kotlin/codegen/InnerClassConsumer.kt

@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
+import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import java.util.*
 
 interface InnerClassConsumer {
@@ -38,7 +39,7 @@ interface InnerClassConsumer {
                 val classDescriptorImpl = ClassDescriptorImpl(
                         descriptor, Name.identifier(JvmAbi.DEFAULT_IMPLS_CLASS_NAME),
                         Modality.FINAL, ClassKind.CLASS, Collections.emptyList(), SourceElement.NO_SOURCE,
-                        /* isExternal = */ false)
+                        /* isExternal = */ false, LockBasedStorageManager.NO_LOCKS)
 
                 classDescriptorImpl.initialize(MemberScope.Empty, emptySet(), null)
                 return classDescriptorImpl

compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.kt

@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
+import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import org.jetbrains.kotlin.types.KotlinType
 
 class JvmRuntimeTypes(module: ModuleDescriptor, private val languageVersionSettings: LanguageVersionSettings) {
@@ -49,7 +50,7 @@ class JvmRuntimeTypes(module: ModuleDescriptor, private val languageVersionSetti
             classKind: ClassKind = ClassKind.CLASS
     ): ClassDescriptor =
             MutableClassDescriptor(packageFragment, classKind, /* isInner = */ false, /* isExternal = */ false,
-                                   Name.identifier(name), SourceElement.NO_SOURCE).apply {
+                                   Name.identifier(name), SourceElement.NO_SOURCE, LockBasedStorageManager.NO_LOCKS).apply {
                 modality = Modality.FINAL
                 visibility = Visibilities.PUBLIC
                 setTypeParameterDescriptors(emptyList())

compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java

@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
 import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt;
+import org.jetbrains.kotlin.storage.LockBasedStorageManager;
 import org.jetbrains.kotlin.types.KotlinType;
 import org.jetbrains.kotlin.util.OperatorNameConventions;
 import org.jetbrains.org.objectweb.asm.MethodVisitor;
@@ -90,7 +91,8 @@ public class SamWrapperCodegen {
                 ClassKind.CLASS,
                 Collections.singleton(samType.getType()),
                 SourceElement.NO_SOURCE,
-                /* isExternal = */ false
+                /* isExternal = */ false,
+                LockBasedStorageManager.NO_LOCKS
         );
         // e.g. compare(T, T)
         SimpleFunctionDescriptor erasedInterfaceFunction = samType.getOriginalAbstractMethod().copy(

compiler/backend/src/org/jetbrains/kotlin/codegen/SyntheticClassDescriptorForLambda.kt

@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.resolve.source.toSourceElement
+import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import org.jetbrains.kotlin.types.KotlinType
 
 class SyntheticClassDescriptorForLambda(
@@ -32,7 +33,7 @@ class SyntheticClassDescriptorForLambda(
         supertypes: Collection<KotlinType>,
         element: KtElement
 ) : ClassDescriptorImpl(containingDeclaration, name, Modality.FINAL, ClassKind.CLASS, supertypes, element.toSourceElement(),
-                        /* isExternal = */ false) {
+                        /* isExternal = */ false, LockBasedStorageManager.NO_LOCKS) {
     init {
         initialize(MemberScope.Empty, emptySet(), null)
     }

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

@@ -24,21 +24,23 @@ import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import java.util.*
 
 object JvmPlatform : TargetPlatform("JVM") {
-    private val defaultImports = LockBasedStorageManager().createMemoizedFunction<Boolean, List<ImportPath>> { includeKotlinComparisons ->
-        ArrayList<ImportPath>().apply {
-            addAll(Common.getDefaultImports(includeKotlinComparisons))
+    private val defaultImports = LockBasedStorageManager().let { storageManager ->
+        storageManager.createMemoizedFunction<Boolean, List<ImportPath>> { includeKotlinComparisons ->
+            ArrayList<ImportPath>().apply {
+                addAll(Common.getDefaultImports(includeKotlinComparisons))
 
-            add(ImportPath.fromString("java.lang.*"))
-            add(ImportPath.fromString("kotlin.jvm.*"))
+                add(ImportPath.fromString("java.lang.*"))
+                add(ImportPath.fromString("kotlin.jvm.*"))
 
-            fun addAllClassifiersFromScope(scope: MemberScope) {
-                for (descriptor in scope.getContributedDescriptors(DescriptorKindFilter.CLASSIFIERS, MemberScope.ALL_NAME_FILTER)) {
-                    add(ImportPath(DescriptorUtils.getFqNameSafe(descriptor), false))
+                fun addAllClassifiersFromScope(scope: MemberScope) {
+                    for (descriptor in scope.getContributedDescriptors(DescriptorKindFilter.CLASSIFIERS, MemberScope.ALL_NAME_FILTER)) {
+                        add(ImportPath(DescriptorUtils.getFqNameSafe(descriptor), false))
+                    }
                 }
-            }
 
-            for (builtinPackageFragment in JvmBuiltIns(LockBasedStorageManager.NO_LOCKS).builtInsPackageFragmentsImportedByDefault) {
-                addAllClassifiersFromScope(builtinPackageFragment.getMemberScope())
+                for (builtinPackageFragment in JvmBuiltIns(storageManager).builtInsPackageFragmentsImportedByDefault) {
+                    addAllClassifiersFromScope(builtinPackageFragment.getMemberScope())
+                }
             }
         }
 

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/KnownDescriptors.kt

@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
+import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import org.jetbrains.kotlin.types.*
 
 open class KnownPackageFragmentDescriptor(moduleDescriptor: ModuleDescriptor, fqName: FqName) :
@@ -44,7 +45,7 @@ open class KnownClassDescriptor(
     fun initialize(declaredTypeParameters: List<TypeParameterDescriptor>, supertypes: List<KotlinType>) {
         this.declaredTypeParameters = declaredTypeParameters
         this.supertypes = supertypes
-        this.typeConstructor = ClassTypeConstructorImpl(this, declaredTypeParameters, supertypes)
+        this.typeConstructor = ClassTypeConstructorImpl(this, declaredTypeParameters, supertypes, LockBasedStorageManager.NO_LOCKS)
         this.defaultType = TypeUtils.makeUnsubstitutedType(this, unsubstitutedMemberScope)
     }