From d30ab505323a30d70b8427ac17363bf4a6e780ea Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <Dmitry.Petrov@jetbrains.com>
Date: Thu, 17 Mar 2016 18:04:21 +0300
Subject: [PATCH] KT-11410: Build stdlib with new part/facade inheritance
 scheme.

---
 build.xml                                                   | 4 ++--
 .../debugger/tinyApp/outs/stepIntoStdlibFacadeClass.out     | 2 +-
 .../kotlin/idea/caches/resolve/CustomModuleInfoTest.kt      | 6 +++---
 libraries/stdlib/pom.xml                                    | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 30362dfac37..3be9fb9d706 100644
--- a/build.xml
+++ b/build.xml
@@ -877,7 +877,7 @@
     </target>
 
     <target name="stdlib">
-        <new-kotlinc output="${output}/classes/stdlib" moduleName="kotlin-stdlib" additionalOptions="-Xdump-declarations-to ${output}/declarations/stdlib-declarations.json">
+        <new-kotlinc output="${output}/classes/stdlib" moduleName="kotlin-stdlib" additionalOptions="-Xmultifile-parts-inherit -Xdump-declarations-to ${output}/declarations/stdlib-declarations.json">
             <src>
                 <include name="libraries/stdlib/src"/>
             </src>
@@ -926,7 +926,7 @@
     </target>
 
     <target name="reflection">
-        <new-kotlinc output="${output}/classes/reflection" moduleName="kotlin-reflection" additionalOptions="-Xdump-declarations-to ${output}/declarations/reflect-declarations.json">
+        <new-kotlinc output="${output}/classes/reflection" moduleName="kotlin-reflection">
             <src>
                 <include name="core/reflection.jvm/src"/>
             </src>
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoStdlibFacadeClass.out b/idea/testData/debugger/tinyApp/outs/stepIntoStdlibFacadeClass.out
index 9ddfd6f5568..dcc2eb4e81f 100644
--- a/idea/testData/debugger/tinyApp/outs/stepIntoStdlibFacadeClass.out
+++ b/idea/testData/debugger/tinyApp/outs/stepIntoStdlibFacadeClass.out
@@ -2,8 +2,8 @@ LineBreakpoint created at stepIntoStdlibFacadeClass.kt:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepIntoStdlibFacadeClass.StepIntoStdlibFacadeClassKt
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 stepIntoStdlibFacadeClass.kt:6
-ArraysKt.!EXT!
 _Arrays.!EXT!
+Iterables.!EXT!
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/CustomModuleInfoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/CustomModuleInfoTest.kt
index ae5856dd243..6b5bf714f46 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/CustomModuleInfoTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/CustomModuleInfoTest.kt
@@ -28,10 +28,10 @@ class CustomModuleInfoTest : KotlinLightCodeInsightFixtureTestCase() {
 
     fun testModuleInfoForMembersOfLightClassForDecompiledFile() {
         //NOTE: any class with methods from stdlib will do
-        val collectionsKtClass = JavaPsiFacade.getInstance(project).findClass("kotlin.collections.CollectionsKt", GlobalSearchScope.allScope(project))!!
-        val classModuleInfo = collectionsKtClass.getModuleInfo()
+        val tuplesKtClass = JavaPsiFacade.getInstance(project).findClass("kotlin.TuplesKt", GlobalSearchScope.allScope(project))!!
+        val classModuleInfo = tuplesKtClass.getModuleInfo()
         Assert.assertTrue(classModuleInfo is LibraryInfo)
-        val methods = collectionsKtClass.methods
+        val methods = tuplesKtClass.methods
         Assert.assertTrue(methods.isNotEmpty())
         methods.forEach {
             Assert.assertEquals("Members of decompiled class should have the same module info", classModuleInfo, it.getModuleInfo())
diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml
index a7a33278a48..9da23b67cd3 100644
--- a/libraries/stdlib/pom.xml
+++ b/libraries/stdlib/pom.xml
@@ -52,6 +52,7 @@
                         </goals>
                         <configuration>
                             <args combine.children="append">
+                                <arg>-Xmultifile-parts-inherit</arg>
                                 <arg>-Xdump-declarations-to</arg>
                                 <arg>${basedir}/target/stdlib-declarations.json</arg>
                             </args>