CLI, Ant: add kotlin-reflect.jar to classpath by default, support "-no-reflect"

Note that now "-no-stdlib" implies "-no-reflect".

 #KT-13237 Fixed

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java

@@ -41,6 +41,9 @@ public class K2JVMCompilerArguments extends CommonCompilerArguments {
     @Argument(value = "no-stdlib", description = "Don't include Kotlin runtime into classpath")
     public boolean noStdlib;
 
+    @Argument(value = "no-reflect", description = "Don't include Kotlin reflection implementation into classpath")
+    public boolean noReflect;
+
     @Argument(value = "module", description = "Path to the module file to compile")
     @ValueDescription("<path>")
     public String module;

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt

@@ -301,11 +301,16 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
         private fun getClasspath(paths: KotlinPaths, arguments: K2JVMCompilerArguments): List<File> {
             val classpath = arrayListOf<File>()
             if (arguments.classpath != null) {
-                classpath.addAll(arguments.classpath.split(File.pathSeparatorChar).map { File(it) })
+                classpath.addAll(arguments.classpath.split(File.pathSeparatorChar).map(::File))
             }
             if (!arguments.noStdlib) {
                 classpath.add(paths.runtimePath)
             }
+            // "-no-stdlib" implies "-no-reflect": otherwise we would be able to transitively read stdlib classes through kotlin-reflect,
+            // which is likely not what user wants since s/he manually provided "-no-stdlib"
+            if (!arguments.noReflect && !arguments.noStdlib) {
+                classpath.add(paths.reflectPath)
+            }
             return classpath
         }
 

compiler/testData/cli/jvm/help.out

@@ -6,6 +6,7 @@ where possible options include:
   -jdk-home <path>           Path to JDK home directory to include into classpath, if differs from default JAVA_HOME
   -no-jdk                    Don't include Java runtime into classpath
   -no-stdlib                 Don't include Kotlin runtime into classpath
+  -no-reflect                Don't include Kotlin reflection implementation into classpath
   -module <path>             Path to the module file to compile
   -script                    Evaluate the script file
   -kotlin-home <path>        Path to Kotlin compiler home directory, used for runtime libraries discovery

compiler/testData/cli/jvm/noReflect.args

@@ -0,0 +1,4 @@
+-no-reflect
+$TESTDATA_DIR$/noReflect.kt
+-d
+$TEMP_DIR$

compiler/testData/cli/jvm/noReflect.kt

@@ -0,0 +1,6 @@
+import kotlin.reflect.*
+
+fun foo() {
+    String::class.primaryConstructor
+    listOf(42)
+}

compiler/testData/cli/jvm/noReflect.out

@@ -0,0 +1,4 @@
+compiler/testData/cli/jvm/noReflect.kt:4:19: error: unresolved reference: primaryConstructor
+    String::class.primaryConstructor
+                  ^
+COMPILATION_ERROR

compiler/testData/cli/jvm/noStdlib.args

@@ -0,0 +1,4 @@
+-no-stdlib
+$TESTDATA_DIR$/noStdlib.kt
+-d
+$TEMP_DIR$

compiler/testData/cli/jvm/noStdlib.kt

@@ -0,0 +1,6 @@
+import kotlin.reflect.*
+
+fun foo() {
+    String::class.primaryConstructor
+    listOf(42)
+}

compiler/testData/cli/jvm/noStdlib.out

@@ -0,0 +1,7 @@
+compiler/testData/cli/jvm/noStdlib.kt:4:19: error: unresolved reference: primaryConstructor
+    String::class.primaryConstructor
+                  ^
+compiler/testData/cli/jvm/noStdlib.kt:5:5: error: unresolved reference: listOf
+    listOf(42)
+    ^
+COMPILATION_ERROR

compiler/testData/cli/jvm/wrongArgument.out

@@ -7,6 +7,7 @@ where possible options include:
   -jdk-home <path>           Path to JDK home directory to include into classpath, if differs from default JAVA_HOME
   -no-jdk                    Don't include Java runtime into classpath
   -no-stdlib                 Don't include Kotlin runtime into classpath
+  -no-reflect                Don't include Kotlin reflection implementation into classpath
   -module <path>             Path to the module file to compile
   -script                    Evaluate the script file
   -kotlin-home <path>        Path to Kotlin compiler home directory, used for runtime libraries discovery

compiler/testData/integration/ant/jvm/noReflectForJavac/J.java

@@ -0,0 +1,6 @@
+package test;
+
+import kotlin.reflect.KClassesKt;
+import kotlin.Unit;
+
+public class J {}

compiler/testData/integration/ant/jvm/noReflectForJavac/build.log.expected

@@ -0,0 +1,22 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+    [mkdir] Created dir: [Temp]/classes
+    [javac] Compiling 1 source file to [Temp]/classes
+    [javac] Running javac...
+    [javac] [TestData]/J.java:3: cannot find symbol
+    [javac] symbol  : class KClassesKt
+    [javac] location: package kotlin.reflect
+    [javac] import kotlin.reflect.KClassesKt;
+    [javac]                      ^
+    [javac] 1 error
+
+ERR:
+
+BUILD FAILED
+[TestData]/build.xml:6: Compile failed; see the compiler error output for details.
+
+Total time: [time]
+
+Return code: 1

compiler/testData/integration/ant/jvm/noReflectForJavac/build.xml

@@ -0,0 +1,12 @@
+<project name="Ant Task Test" default="build">
+    <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+
+    <target name="build">
+        <mkdir dir="${temp}/classes"/>
+        <javac srcdir="${test.data}" destdir="${temp}/classes" includeantruntime="false">
+            <withKotlin>
+                <compilerarg value="-no-reflect"/>
+            </withKotlin>
+        </javac>
+    </target>
+</project>

compiler/tests/org/jetbrains/kotlin/cli/CliTestGenerated.java

@@ -169,6 +169,18 @@ public class CliTestGenerated extends AbstractCliTest {
             doJvmTest(fileName);
         }
 
+        @TestMetadata("noReflect.args")
+        public void testNoReflect() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/noReflect.args");
+            doJvmTest(fileName);
+        }
+
+        @TestMetadata("noStdlib.args")
+        public void testNoStdlib() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/noStdlib.args");
+            doJvmTest(fileName);
+        }
+
         @TestMetadata("nonExistingClassPathAndAnnotationsPath.args")
         public void testNonExistingClassPathAndAnnotationsPath() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.args");

compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java

@@ -107,6 +107,12 @@ public class AntTaskTestGenerated extends AbstractAntTaskTest {
         doTest(fileName);
     }
 
+    @TestMetadata("noReflectForJavac")
+    public void testNoReflectForJavac() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/noReflectForJavac/");
+        doTest(fileName);
+    }
+
     @TestMetadata("noStdlibForJavac")
     public void testNoStdlibForJavac() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/noStdlibForJavac/");