From 237f90d2899ca433b6d59bbefb8231b9faf0b392 Mon Sep 17 00:00:00 2001
From: Pavel Kirpichenkov <pavel.kirpichenkov@jetbrains.com>
Date: Mon, 23 Oct 2023 19:15:34 +0300
Subject: [PATCH] [stubs] Move KlibMetaFileType.STUB_VERSION to
 KotlinStubVersions

Track changes in K/N stubs directly instead of using the hack with
KlibMetaFileType.STUB_VERSION + KotlinStubVersions.BUILTIN_STUB_VERSION.
Changes in built-in stubs might or might not affect .knm stubs and
should be tracked independently.

The used offset constant for migration is the sum of the offsets from
KlibMetaFileType and KotlinStubVersions.BUILTIN_STUB_VERSION.

KTIJ-26761
KTIJ-26961
---
 .../decompiler/konan/K2KotlinNativeMetadataDecompiler.kt      | 2 +-
 .../kotlin/analysis/decompiler/konan/KlibMetaFileType.kt      | 1 -
 .../decompiler/konan/KotlinNativeMetadataDecompiler.kt        | 2 +-
 .../src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt  | 4 ++++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KotlinNativeMetadataDecompiler.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KotlinNativeMetadataDecompiler.kt
index cd901eda0dc..4ac21c58289 100644
--- a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KotlinNativeMetadataDecompiler.kt
+++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KotlinNativeMetadataDecompiler.kt
@@ -16,5 +16,5 @@ class K2KotlinNativeMetadataDecompiler : K2KlibMetadataDecompiler<KlibMetadataVe
     DynamicTypeDeserializer,
     { KlibMetadataVersion.INSTANCE },
     { KlibMetadataVersion.INVALID_VERSION },
-    KlibMetaFileType.STUB_VERSION + KotlinStubVersions.BUILTIN_STUB_VERSION
+    KotlinStubVersions.KOTLIN_NATIVE_STUB_VERSION,
 )
diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetaFileType.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetaFileType.kt
index 1ad195dc416..44f82f7729c 100644
--- a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetaFileType.kt
+++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetaFileType.kt
@@ -23,6 +23,5 @@ object KlibMetaFileType : FileType {
     override fun isReadOnly() = true
     override fun getCharset(file: VirtualFile, content: ByteArray): Nothing? = null
 
-    const val STUB_VERSION = 2
     private const val DEFAULT_DESCRIPTION = "Klib Metadata"
 }
\ No newline at end of file
diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KotlinNativeMetadataDecompiler.kt b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KotlinNativeMetadataDecompiler.kt
index a50508317dc..68dcdb028cb 100644
--- a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KotlinNativeMetadataDecompiler.kt
+++ b/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KotlinNativeMetadataDecompiler.kt
@@ -16,7 +16,7 @@ class KotlinNativeMetadataDecompiler : Fe10KlibMetadataDecompiler<KlibMetadataVe
     DynamicTypeDeserializer,
     { KlibMetadataVersion.INSTANCE },
     { KlibMetadataVersion.INVALID_VERSION },
-    KlibMetaFileType.STUB_VERSION + KotlinStubVersions.BUILTIN_STUB_VERSION
+    KotlinStubVersions.KOTLIN_NATIVE_STUB_VERSION,
 ) {
     override fun doReadFile(file: VirtualFile): FileWithMetadata? {
         return FileWithMetadata.forPackageFragment(file)
diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt
index a4013d17ce6..6235d6f1f85 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt
@@ -30,4 +30,8 @@ object KotlinStubVersions {
     // JS stub version should be increased if changes are made to js stub building subsystem (org.jetbrains.kotlin.idea.decompiler.js)
     // Increasing this version will lead to reindexing of js binary files (see KotlinJavaScriptMetaFileType).
     const val JS_STUB_VERSION = BINARY_STUB_VERSION + 4
+
+    // K/N stub version should be increased if changes are made to K/N stub building subsystem.
+    // Increasing this version will lead to reindexing of K/N binary files (see KlibMetaFileType).
+    const val KOTLIN_NATIVE_STUB_VERSION = BINARY_STUB_VERSION + 7
 }