Remove dangerous readKotlinHeader() in inlineUtil.kt

It was creating a phantom FileBasedKotlinClass which was not based on any file

build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt

@@ -646,12 +646,12 @@ open class IncrementalCacheImpl<Target>(
     }
 
     private inner class InlineFunctionsMap(storageFile: File) : BasicStringMap<Map<String, Long>>(storageFile, StringToLongMapExternalizer) {
-        private fun getInlineFunctionsMap(bytes: ByteArray): Map<String, Long> {
+        private fun getInlineFunctionsMap(header: KotlinClassHeader, bytes: ByteArray): Map<String, Long> {
-            val result = HashMap<String, Long>()
+            val inlineFunctions = inlineFunctionsJvmNames(header)
-
-            val inlineFunctions = inlineFunctionsJvmNames(bytes)
             if (inlineFunctions.isEmpty()) return emptyMap()
 
+            val result = HashMap<String, Long>()
+
             ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) {
                 override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array<out String>?): MethodVisitor? {
                     val dummyClassWriter = ClassWriter(Opcodes.ASM5)
@@ -674,7 +674,7 @@ open class IncrementalCacheImpl<Target>(
         }
 
         fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult {
-            return put(kotlinClass.className, getInlineFunctionsMap(kotlinClass.fileContents), isPackage)
+            return put(kotlinClass.className, getInlineFunctionsMap(kotlinClass.classHeader, kotlinClass.fileContents), isPackage)
         }
 
         private fun put(className: JvmClassName, newMap: Map<String, Long>, isPackage: Boolean): CompilationResult {

compiler/frontend.java/src/org/jetbrains/kotlin/inline/inlineUtil.kt

@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.inline
 
-import org.jetbrains.kotlin.load.kotlin.FileBasedKotlinClass
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
 import org.jetbrains.kotlin.serialization.Flags
 import org.jetbrains.kotlin.serialization.ProtoBuf
@@ -25,24 +24,21 @@ import org.jetbrains.kotlin.serialization.deserialization.TypeTable
 import org.jetbrains.kotlin.serialization.jvm.BitEncoding
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 
-fun inlineFunctionsJvmNames(bytes: ByteArray): Set<String> {
+fun inlineFunctionsJvmNames(header: KotlinClassHeader): Set<String> {
-    val header = readKotlinHeader(bytes)
+    val annotationData = header.data ?: return emptySet()
-    val annotationData = header.data
+    val strings = header.strings ?: return emptySet()
-    val strings = header.strings
-
-    if (annotationData == null || strings == null) return emptySet()
 
     return when (header.kind) {
         KotlinClassHeader.Kind.CLASS -> {
-            val classData = JvmProtoBufUtil.readClassDataFrom(BitEncoding.decodeBytes(annotationData), strings)
+            val (nameResolver, classProto) = JvmProtoBufUtil.readClassDataFrom(BitEncoding.decodeBytes(annotationData), strings)
-            inlineFunctionsJvmNames(classData.classProto.functionList, classData.nameResolver, classData.classProto.typeTable)
+            inlineFunctionsJvmNames(classProto.functionList, nameResolver, classProto.typeTable)
         }
         KotlinClassHeader.Kind.FILE_FACADE,
         KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -> {
-            val packageData = JvmProtoBufUtil.readPackageDataFrom(BitEncoding.decodeBytes(annotationData), strings)
+            val (nameResolver, packageProto) = JvmProtoBufUtil.readPackageDataFrom(BitEncoding.decodeBytes(annotationData), strings)
-            inlineFunctionsJvmNames(packageData.packageProto.functionList, packageData.nameResolver, packageData.packageProto.typeTable)
+            inlineFunctionsJvmNames(packageProto.functionList, nameResolver, packageProto.typeTable)
         }
-        else -> emptySet<String>()
+        else -> emptySet()
     }
 }
 
@@ -54,16 +50,3 @@ private fun inlineFunctionsJvmNames(functions: List<ProtoBuf.Function>, nameReso
     }
     return jvmNames.toSet()
 }
-
-private fun readKotlinHeader(bytes: ByteArray): KotlinClassHeader {
-    var header: KotlinClassHeader? = null
-
-    FileBasedKotlinClass.create(bytes) { className, classHeader, innerClasses ->
-        header = classHeader
-        null
-    }
-
-    if (header == null) throw AssertionError("Could not read kotlin header from byte array")
-
-    return header!!
-}

compiler/tests-common/org/jetbrains/kotlin/codegen/InlineTestUtil.kt

@@ -56,10 +56,8 @@ object InlineTestUtil {
         val binaryClasses = hashMapOf<String, KotlinJvmBinaryClass>()
 
         for (file in files) {
-            val bytes = file.asByteArray()
+            val binaryClass = loadBinaryClass(file)
-            val cr = ClassReader(bytes)
+            val inlineFunctions = inlineFunctionsJvmNames(binaryClass.classHeader)
-
-            val inlineFunctions = inlineFunctionsJvmNames(bytes)
 
             val classVisitor = object : ClassVisitorWithName() {
                 override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array<String>?): MethodVisitor {
@@ -73,8 +71,8 @@ object InlineTestUtil {
                 }
             }
 
-            cr.accept(classVisitor, 0)
+            ClassReader(file.asByteArray()).accept(classVisitor, 0)
-            binaryClasses.put(classVisitor.className, loadBinaryClass(file))
+            binaryClasses.put(classVisitor.className, binaryClass)
         }
 
         return InlineInfo(inlineMethods, binaryClasses)