Do not load JvmPackageName-annotated parts on Kotlin < 1.2

compiler/frontend/src/org/jetbrains/kotlin/resolve/CompilerDeserializationConfiguration.kt

@@ -25,4 +25,6 @@ class CompilerDeserializationConfiguration(languageVersionSettings: LanguageVers
     override val typeAliasesAllowed = languageVersionSettings.supportsFeature(LanguageFeature.TypeAliases)
 
     override val skipMetadataVersionCheck = languageVersionSettings.getFlag(AnalysisFlag.skipMetadataVersionCheck)
+
+    override val isJvmPackageNameSupported = languageVersionSettings.supportsFeature(LanguageFeature.JvmPackageName)
 }

compiler/testData/compileKotlinAgainstKotlin/jvmPackageName.kt

@@ -13,6 +13,7 @@ var v: Int = 1
 inline fun i(block: () -> Unit) = block()
 
 // FILE: B.kt
+// LANGUAGE_VERSION: 1.2
 
 import foo.*
 

compiler/testData/compileKotlinAgainstKotlin/jvmPackageNameInRootPackage.kt

@@ -10,6 +10,7 @@ fun f() = "OK"
 var v: Int = 1
 
 // FILE: B.kt
+// LANGUAGE_VERSION: 1.2
 
 fun box(): String {
     v = 2

compiler/testData/compileKotlinAgainstKotlin/jvmPackageNameWithJvmName.kt

@@ -12,6 +12,7 @@ fun f() = "OK"
 var v: Int = 1
 
 // FILE: B.kt
+// LANGUAGE_VERSION: 1.2
 
 import foo.*
 

compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/Foo.kt

@@ -0,0 +1,3 @@
+package foo
+
+fun file1() {}

compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/FooAsJ.kt

@@ -0,0 +1,5 @@
+@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
+@file:JvmPackageName("j")
+package foo
+
+fun file2() {}

compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/jvm-package-table.txt

@@ -0,0 +1,2 @@
+foo
+  foo/FooKt

compiler/tests/org/jetbrains/kotlin/codegen/JvmPackageTableTest.kt

@@ -86,4 +86,9 @@ class JvmPackageTableTest : KtUsefulTestCase() {
         doTest("/jvmPackageTable/jvmPackageNameManyParts",
                compileWith = LanguageVersion.KOTLIN_1_2, loadWith = LanguageVersion.KOTLIN_1_2)
     }
+
+    fun testJvmPackageNameLanguageVersion11() {
+        doTest("/jvmPackageTable/jvmPackageNameLanguageVersion11",
+               compileWith = LanguageVersion.KOTLIN_1_2, loadWith = LanguageVersion.KOTLIN_1_1)
+    }
 }

compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt

@@ -61,6 +61,7 @@ enum class LanguageFeature(
     LateinitLocalVariables(KOTLIN_1_2),
     InnerClassInEnumEntryClass(KOTLIN_1_2),
     CallableReferencesToClassMembersWithEmptyLHS(KOTLIN_1_2),
+    JvmPackageName(KOTLIN_1_2),
 
     RestrictionOfValReassignmentViaBackingField(KOTLIN_1_3),
     NestedClassesInEnumEntryShouldBeInner(KOTLIN_1_3),

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt

@@ -77,12 +77,14 @@ class ModuleMapping private constructor(val packageFqName2Parts: Map<String, Pac
                         packageParts.addPart(internalNameOf(packageFqName, partShortName), facadeInternalName)
                     }
 
-                    for ((index, partShortName) in proto.classWithJvmPackageNameShortNameList.withIndex()) {
+                    if (configuration.isJvmPackageNameSupported) {
-                        val packageId = proto.classWithJvmPackageNamePackageIdList.getOrNull(index)
+                        for ((index, partShortName) in proto.classWithJvmPackageNameShortNameList.withIndex()) {
-                                        ?: proto.classWithJvmPackageNamePackageIdList.lastOrNull()
+                            val packageId = proto.classWithJvmPackageNamePackageIdList.getOrNull(index)
-                                        ?: continue
+                                            ?: proto.classWithJvmPackageNamePackageIdList.lastOrNull()
-                        val jvmPackageName = table.jvmPackageNameList.getOrNull(packageId) ?: continue
+                                            ?: continue
-                        packageParts.addPart(internalNameOf(jvmPackageName, partShortName), null)
+                            val jvmPackageName = table.jvmPackageNameList.getOrNull(packageId) ?: continue
+                            packageParts.addPart(internalNameOf(jvmPackageName, partShortName), null)
+                        }
                     }
                 }
 

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializationConfiguration.kt

@@ -23,5 +23,8 @@ interface DeserializationConfiguration {
     val typeAliasesAllowed: Boolean
         get() = true
 
+    val isJvmPackageNameSupported: Boolean
+        get() = true
+
     object Default : DeserializationConfiguration
 }