azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

K2: support -Xskip-metadata-version-check

Browse Source 
#KT-60795
This commit is contained in:
Alexander Udalov
2023-08-11 18:43:19 +02:00
committed by Space Team
parent 7d60b5df43
commit 8f720ad24b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmClassFileBasedSymbolProvider.kt
+7 -2
View File
@@ -5,13 +5,17 @@
package org.jetbrains.kotlin.fir.java.deserialization package org.jetbrains.kotlin.fir.java.deserialization
import org.jetbrains.kotlin.config.AnalysisFlags
import org.jetbrains.kotlin.descriptors.SourceElement import org.jetbrains.kotlin.descriptors.SourceElement
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.ThreadSafeMutableState import org.jetbrains.kotlin.fir.ThreadSafeMutableState
import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
import org.jetbrains.kotlin.fir.declarations.getDeprecationsProvider import org.jetbrains.kotlin.fir.declarations.getDeprecationsProvider
import org.jetbrains.kotlin.fir.deserialization.* import org.jetbrains.kotlin.fir.deserialization.AbstractFirDeserializedSymbolProvider
import org.jetbrains.kotlin.fir.deserialization.FirDeserializationContext
import org.jetbrains.kotlin.fir.deserialization.ModuleDataProvider
import org.jetbrains.kotlin.fir.deserialization.PackagePartsCacheData
import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotation
import org.jetbrains.kotlin.fir.java.FirJavaFacade import org.jetbrains.kotlin.fir.java.FirJavaFacade
import org.jetbrains.kotlin.fir.java.declarations.FirJavaClass import org.jetbrains.kotlin.fir.java.declarations.FirJavaClass
@@ -101,7 +105,8 @@ class JvmClassFileBasedSymbolProvider(
private val KotlinJvmBinaryClass.incompatibility: IncompatibleVersionErrorData<JvmMetadataVersion>? private val KotlinJvmBinaryClass.incompatibility: IncompatibleVersionErrorData<JvmMetadataVersion>?
get() { get() {
// TODO: skipMetadataVersionCheck if (session.languageVersionSettings.getFlag(AnalysisFlags.skipMetadataVersionCheck)) return null
if (classHeader.metadataVersion.isCompatible(ownMetadataVersion)) return null if (classHeader.metadataVersion.isCompatible(ownMetadataVersion)) return null
return IncompatibleVersionErrorData( return IncompatibleVersionErrorData(
actualVersion = classHeader.metadataVersion, actualVersion = classHeader.metadataVersion,
compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstCustomBinariesTest.kt
+1 -2
View File
@@ -306,8 +306,7 @@ abstract class AbstractCompileKotlinAgainstCustomBinariesTest : AbstractKotlinCo
}) })
} }
// KT-60795 K2: missing INCOMPATIBLE_CLASS and corresponding CLI error fun testWrongMetadataVersionSkipVersionCheck() {
fun testWrongMetadataVersionSkipVersionCheck() = muteForK2 {
doTestKotlinLibraryWithWrongMetadataVersion("library", null, "-Xskip-metadata-version-check") doTestKotlinLibraryWithWrongMetadataVersion("library", null, "-Xskip-metadata-version-check")
} }