From a7ba93c1d132116c03e560cd032e8fef09f1578e Mon Sep 17 00:00:00 2001
From: Michael Nedzelsky <Michael.Nedzelsky@jetbrains.com>
Date: Sat, 7 Mar 2015 18:58:13 +0300
Subject: [PATCH] add flexibleTypeCapabilitiesDeserializer field to
 BuiltinsPackageFragment

---
 .../builtins/BuiltInsSerializerTest.kt        | 25 ++++++++++---------
 .../builtins/BuiltinsPackageFragment.kt       |  3 ++-
 .../kotlin/builtins/KotlinBuiltIns.java       |  2 ++
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt
index 3a424c992e6..a7df56faf48 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt
@@ -16,16 +16,17 @@
 
 package org.jetbrains.kotlin.serialization.builtins
 
-import org.jetbrains.kotlin.test.TestCaseWithTmpdir
-import java.io.File
-import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
-import org.jetbrains.kotlin.test.JetTestUtils
-import org.jetbrains.kotlin.storage.LockBasedStorageManager
-import java.io.FileInputStream
 import org.jetbrains.kotlin.builtins.BuiltinsPackageFragment
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
 import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME
+import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer
+import org.jetbrains.kotlin.storage.LockBasedStorageManager
+import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.test.TestCaseWithTmpdir
+import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator
+import java.io.File
+import java.io.FileInputStream
 
 public class BuiltInsSerializerTest : TestCaseWithTmpdir() {
     private fun doTest(fileName: String) {
@@ -39,11 +40,11 @@ public class BuiltInsSerializerTest : TestCaseWithTmpdir() {
 
         val module = JetTestUtils.createEmptyModule("<module>")
 
-        val packageFragment = BuiltinsPackageFragment(TEST_PACKAGE_FQNAME, LockBasedStorageManager(), module) {
-            path ->
-            val file = File(tmpdir, path)
-            if (file.exists()) FileInputStream(file) else null
-        }
+        val packageFragment =
+            BuiltinsPackageFragment(TEST_PACKAGE_FQNAME, LockBasedStorageManager(), module, FlexibleTypeCapabilitiesDeserializer.ThrowException) {
+                val file = File(tmpdir, it)
+                if (file.exists()) FileInputStream(file) else null
+            }
 
         module.initialize(packageFragment.provider)
         module.addDependencyOnModule(module)
diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt
index 79125dfa7c1..4ff19090d5b 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt
@@ -40,6 +40,7 @@ public class BuiltinsPackageFragment(
         fqName: FqName,
         storageManager: StorageManager,
         module: ModuleDescriptor,
+        flexibleTypeCapabilitiesDeserializer: FlexibleTypeCapabilitiesDeserializer,
         private val loadResource: (path: String) -> InputStream?
 ) : PackageFragmentDescriptorImpl(module, fqName) {
 
@@ -64,7 +65,7 @@ public class BuiltinsPackageFragment(
                 storageManager, module, BuiltInsClassDataFinder(),
                 BuiltInsAnnotationAndConstantLoader(getContainingDeclaration()),
                 provider, localClassResolver,
-                FlexibleTypeCapabilitiesDeserializer.ThrowException
+                flexibleTypeCapabilitiesDeserializer
         )
         localClassResolver.setDeserializationComponents(components)
         DeserializedPackageMemberScope(this, proto, nameResolver, components, { readClassNames(proto) })
diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
index e95c20a3fbf..61a402005a8 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
 import org.jetbrains.kotlin.resolve.ImportPath;
 import org.jetbrains.kotlin.resolve.scopes.JetScope;
+import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer;
 import org.jetbrains.kotlin.storage.LockBasedStorageManager;
 import org.jetbrains.kotlin.types.*;
 import org.jetbrains.kotlin.types.checker.JetTypeChecker;
@@ -110,6 +111,7 @@ public class KotlinBuiltIns {
         );
         builtinsPackageFragment = new BuiltinsPackageFragment(
                 BUILT_INS_PACKAGE_FQ_NAME, new LockBasedStorageManager(), builtInsModule,
+                FlexibleTypeCapabilitiesDeserializer.ThrowException.INSTANCE$,
                 new Function1<String, InputStream>() {
                     @Override
                     public InputStream invoke(String path) {