Move reflection interfaces to module 'builtins'

They are considered to be built-ins everywhere anyway

.idea/compiler.xml

@@ -3,7 +3,6 @@
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
     <excludeFromCompile>
-      <directory url="file://$PROJECT_DIR$/core/reflection" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/core/reflection.jvm" includeSubdirectories="true" />
     </excludeFromCompile>
     <resourceExtensions />

.idea/modules.xml

@@ -45,7 +45,6 @@
       <module fileurl="file://$PROJECT_DIR$/compiler/light-classes/light-classes.iml" filepath="$PROJECT_DIR$/compiler/light-classes/light-classes.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/compiler/plugin-api/plugin-api.iml" filepath="$PROJECT_DIR$/compiler/plugin-api/plugin-api.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" />
-      <module fileurl="file://$PROJECT_DIR$/core/reflection/reflection.iml" filepath="$PROJECT_DIR$/core/reflection/reflection.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" filepath="$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" filepath="$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/serialization/serialization.iml" filepath="$PROJECT_DIR$/core/serialization/serialization.iml" group="core" />

build.xml

@@ -431,6 +431,7 @@
                 <fileset dir="${output}/builtins">
                     <include name="kotlin/**"/>
                     <exclude name="kotlin/internal/**"/>
+                    <exclude name="kotlin/reflect/**"/>
                 </fileset>
                 <fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/>
                 <fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/>
@@ -772,7 +773,6 @@
             <src>
                 <include name="core/builtins/src"/>
                 <include name="core/runtime.jvm/src"/>
-                <include name="core/reflection/src"/>
             </src>
             <class-path>
                 <!-- Need something to pass to compiler's "-classpath" here -->
@@ -850,7 +850,11 @@
             <jar-content>
                 <fileset dir="${output}/classes/builtins"/>
                 <fileset dir="${output}/classes/stdlib"/>
-                <zipfileset dir="${output}/builtins"/>
+                <zipfileset dir="${output}/builtins">
+                    <include name="kotlin/**"/>
+                    <exclude name="kotlin/internal/**"/>
+                    <exclude name="kotlin/reflect/**"/>
+                </zipfileset>
             </jar-content>
         </pack-runtime-jar>
 
@@ -878,7 +882,6 @@
                 <fileset dir="${basedir}/core/descriptor.loader.java/src" includes="**/*"/>
                 <fileset dir="${basedir}/core/descriptors/src" includes="**/*"/>
                 <fileset dir="${basedir}/core/descriptors.runtime/src" includes="**/*"/>
-                <fileset dir="${basedir}/core/reflection/src" includes="**/*"/>
                 <fileset dir="${basedir}/core/reflection.jvm/src" includes="**/*"/>
                 <fileset dir="${basedir}/core/runtime.jvm/src" includes="**/*"/>
                 <fileset dir="${basedir}/core/serialization/src" includes="**/*"/>
@@ -940,6 +943,7 @@
             <fileset dir="${output}/builtins">
                 <include name="kotlin/**"/>
                 <exclude name="kotlin/internal/**"/>
+                <exclude name="kotlin/reflect/**"/>
             </fileset>
             <fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/>
             <fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/>

core/reflection.jvm/reflection.jvm.iml

@@ -7,7 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="builtins" />
     <orderEntry type="module" module-name="descriptors.runtime" />
-    <orderEntry type="module" module-name="reflection" />
+    <orderEntry type="library" name="kotlin-runtime" level="project" />
   </component>
 </module>

core/reflection/reflection.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="kotlin-runtime" level="project" />
-  </component>
-</module>

core/runtime.jvm/runtime.jvm.iml

@@ -6,7 +6,5 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="builtins" />
-    <orderEntry type="module" module-name="reflection" />
   </component>
-</module>
-
+</module>

generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt

@@ -16,22 +16,23 @@
 
 package org.jetbrains.kotlin.generators.builtins.generateBuiltIns
 
-import org.jetbrains.kotlin.generators.builtins.arrays.*
-import org.jetbrains.kotlin.generators.builtins.arrayIterators.*
-import org.jetbrains.kotlin.generators.builtins.functions.*
-import org.jetbrains.kotlin.generators.builtins.iterators.*
-import org.jetbrains.kotlin.generators.builtins.progressionIterators.*
-import org.jetbrains.kotlin.generators.builtins.progressions.*
-import org.jetbrains.kotlin.generators.builtins.ranges.*
-import java.io.PrintWriter
+import org.jetbrains.kotlin.generators.builtins.arrayIterators.GenerateArrayIterators
+import org.jetbrains.kotlin.generators.builtins.arrays.GenerateArrays
+import org.jetbrains.kotlin.generators.builtins.functions.FunctionKind
+import org.jetbrains.kotlin.generators.builtins.functions.GenerateFunctions
+import org.jetbrains.kotlin.generators.builtins.iterators.GenerateIterators
+import org.jetbrains.kotlin.generators.builtins.progressionIterators.GenerateProgressionIterators
+import org.jetbrains.kotlin.generators.builtins.progressions.GenerateProgressions
+import org.jetbrains.kotlin.generators.builtins.ranges.GeneratePrimitives
+import org.jetbrains.kotlin.generators.builtins.ranges.GenerateRanges
 import java.io.File
+import java.io.PrintWriter
 
 fun assertExists(file: File): Unit =
         if (!file.exists()) error("Output dir does not exist: ${file.getAbsolutePath()}")
 
 val BUILT_INS_NATIVE_DIR = File("core/builtins/native/kotlin/")
 val BUILT_INS_SRC_DIR = File("core/builtins/src/kotlin/")
-val REFLECTION_DIR = File("core/reflection/src/kotlin/")
 val RUNTIME_JVM_DIR = File("core/runtime.jvm/src/kotlin/")
 
 abstract class BuiltInsSourceGenerator(val out: PrintWriter) {
@@ -55,11 +56,10 @@ abstract class BuiltInsSourceGenerator(val out: PrintWriter) {
 fun generateBuiltIns(generate: (File, (PrintWriter) -> BuiltInsSourceGenerator) -> Unit) {
     assertExists(BUILT_INS_NATIVE_DIR)
     assertExists(BUILT_INS_SRC_DIR)
-    assertExists(REFLECTION_DIR)
     assertExists(RUNTIME_JVM_DIR)
 
     for (kind in FunctionKind.values()) {
-        generate(File(if (kind.isReflection()) REFLECTION_DIR else BUILT_INS_SRC_DIR, kind.getFileName())) { GenerateFunctions(it, kind) }
+        generate(File(BUILT_INS_SRC_DIR, kind.getFileName())) { GenerateFunctions(it, kind) }
     }
 
     generate(File(BUILT_INS_NATIVE_DIR, "Arrays.kt")) { GenerateArrays(it) }

jslib_files.xml

@@ -14,8 +14,8 @@
             <include name="**/*.kt" />
         </fileset>
 
-        <fileset dir="${basedir}/core/reflection/src">
-            <include name="kotlin/**/*.kt"/>
+        <fileset dir="${basedir}/core/builtins/src">
+            <include name="kotlin/reflect/**/*.kt"/>
         </fileset>
 
         <fileset dir="${basedir}/libraries/stdlib/src">

libraries/tools/runtime/pom.xml

@@ -34,7 +34,6 @@
                                 <copy todir="${basedir}/target/copied-sources">
                                     <fileset dir="${basedir}/../../../core/builtins/src"/>
                                     <fileset dir="${basedir}/../../../core/runtime.jvm/src"/>
-                                    <fileset dir="${basedir}/../../../core/reflection/src"/>
                                 </copy>
                             </target>
                         </configuration>