[K/N] Don't pass -language_version to the second stage of new test system.

^KT-56182
Merge-request: KT-MR-10414
Merged-by: Vladimir Sukharev <Vladimir.Sukharev@jetbrains.com>

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cexport/CAdapterGenerator.kt

@@ -485,19 +485,18 @@ internal class CAdapterGenerator(
             it.module in moduleDescriptors }
         visitChildren(fragments)
 
-        if (configuration.get(USE_FIR) == true) {
+        // K2 does not serialize empty package fragments, thus breaking the scope chain.
-            // K2 does not serialize empty package fragments, thus breaking the scope chain.
+        // The following traverse definitely reaches every subpackage fragment.
-            // The following traverse definitely reaches every subpackage fragment.
+        scopes.push(getPackageScope(FqName.ROOT))
-            scopes.push(getPackageScope(FqName.ROOT))
+        val subfragments = descriptor.module.getSubPackagesOf(FqName.ROOT) { true }
-            val subfragments = descriptor.module.getSubPackagesOf(FqName.ROOT) { true }
+                .flatMap {
-                    .flatMap {
+                    descriptor.module.getPackage(it).fragments.filter {
-                        descriptor.module.getPackage(it).fragments.filter {
+                        it.module in moduleDescriptors
-                            it.module in moduleDescriptors
-                        }
                     }
-            visitChildren(subfragments)
+                }
-            scopes.pop()
+        visitChildren(subfragments)
-        }
+        scopes.pop()
+
         return true
     }
 

kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt

@@ -149,10 +149,10 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec {
         .excludeFlags("-Xcoverage")
         .excludeArguments("-Xcoverage-file", "-Xlibrary-to-cover", "-Xpartial-linkage", "-Xpartial-linkage-loglevel")
 
-    // Don't include the -Xemit-lazy-objc-header flag into
+    // Don't include the -Xemit-lazy-objc-header and -language-version flags into
     // the second stage because this stage have no sources.
     private fun secondStageExtraOpts() = extraOpts
-        .excludeArguments("-Xemit-lazy-objc-header")
+        .excludeArguments("-Xemit-lazy-objc-header", "-language-version")
 
     /** Args passed to the compiler at the first stage of two-stage compilation (klib building). */
     protected fun buildFirstStageArgs(klibPath: String) = mutableListOf<String>().apply {

native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilation.kt

@@ -226,7 +226,7 @@ internal class ObjCFrameworkCompilation(
     sanitizer = settings.get(),
     gcType = settings.get(),
     gcScheduler = settings.get(),
-    pipelineType = settings.get(),
+    pipelineType = settings.getStageDependentPipelineType(),
     freeCompilerArgs = freeCompilerArgs,
     sourceModules = sourceModules,
     dependencies = CategorizedDependencies(dependencies),
@@ -310,7 +310,7 @@ internal class ExecutableCompilation(
     sanitizer = settings.get(),
     gcType = settings.get(),
     gcScheduler = settings.get(),
-    pipelineType = settings.get(),
+    pipelineType = settings.getStageDependentPipelineType(),
     freeCompilerArgs = freeCompilerArgs,
     sourceModules = sourceModules,
     dependencies = CategorizedDependencies(dependencies),
@@ -506,3 +506,9 @@ private object BinaryOptions {
         fun chooseFor(cacheMode: CacheMode) = if (cacheMode.useStaticCacheForDistributionLibraries) forUseWithCache else defaultForTesting
     }
 }
+
+internal fun Settings.getStageDependentPipelineType(): PipelineType =
+    when (get<TestMode>()) {
+        TestMode.ONE_STAGE_MULTI_MODULE -> get<PipelineType>()
+        TestMode.TWO_STAGE_MULTI_MODULE -> PipelineType.K1  // Don't pass "-language_version 2.0" to the second stage
+    }