Reduce memory footprint for basic case of flexible types

The case is when we have a simple type constructor (not array nor collection) and type is not raw: A<T1, >..A<T1>? Actually these types are almost equal besides of nullability, but we create and resolve two different simple types, they have different arguments' lists, etc. The idea is to add NullableSimpleType subclass with delegate to another simple type It should help a lot both with common cases and with corner ones: flexibles types in spark for Function22 having exponential size because of its flexibility #KT-14375 Fixed #KT-14323 Fixed
2017-05-24 15:25:49 +03:00
parent 59f2ba98a6
commit 4385ce8828
4 changed files with 105 additions and 10 deletions
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.jvm.compiler
+
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns
+import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies
+import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.psi2ir.findFirstFunction
+import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
+import org.jetbrains.kotlin.test.ConfigurationKind
+import org.jetbrains.kotlin.test.KotlinTestUtils
+import org.jetbrains.kotlin.test.TestJdkKind
+import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
+import org.jetbrains.kotlin.types.FlexibleType
+import org.jetbrains.kotlin.types.lowerIfFlexible
+import org.jetbrains.kotlin.types.upperIfFlexible
+import org.junit.Test
+
+class MemoryOptimizationsTest : KtUsefulTestCase() {
+    @Test
+    fun testBasicFlexibleTypeCase() {
+        val moduleDescriptor = JvmResolveUtil.analyze(
+                KotlinTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(myTestRootDisposable, ConfigurationKind.ALL, TestJdkKind.FULL_JDK)
+        ).moduleDescriptor
+
+        val appendableClass =
+                moduleDescriptor.findClassAcrossModuleDependencies(ClassId.topLevel(FqName("java.lang.Appendable")))!!
+
+        val append = appendableClass
+                .unsubstitutedMemberScope
+                .findFirstFunction("append") { it.valueParameters.singleOrNull()?.type?.let(KotlinBuiltIns::isChar) == false }
+
+        val parameterType = append.valueParameters.single().type
+
+        assertTrue(parameterType is FlexibleType)
+        val upperBound = parameterType.upperIfFlexible()
+
+        assertTrue(upperBound.javaClass.simpleName == "NullableSimpleType")
+        // NullableSimpleType should store and return the same instance as lower bound of flexible type
+        assertTrue(parameterType.lowerIfFlexible() === upperBound.makeNullableAsSpecified(false))
+    }
+}