Drop isLocalClass, do not write KotlinLocalClass

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

@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.inline.inlineFunctionsJvmNames
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames
 import org.jetbrains.kotlin.load.kotlin.FileBasedKotlinClass
+import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
@@ -55,7 +56,7 @@ object InlineTestUtil {
 
     private fun obtainInlineInfo(files: Iterable<OutputFile>): InlineInfo {
         val inlineMethods = HashSet<MethodInfo>()
-        val classHeaders = hashMapOf<String, KotlinClassHeader>()
+        val binaryClasses = hashMapOf<String, KotlinJvmBinaryClass>()
 
         for (file in files) {
             val bytes = file.asByteArray()
@@ -76,10 +77,10 @@ object InlineTestUtil {
             }
 
             cr.accept(classVisitor, 0)
-            classHeaders.put(classVisitor.className, getClassHeader(file))
+            binaryClasses.put(classVisitor.className, loadBinaryClass(file))
         }
 
-        return InlineInfo(inlineMethods, classHeaders)
+        return InlineInfo(inlineMethods, binaryClasses)
     }
 
     private fun checkInlineMethodNotInvoked(files: Iterable<OutputFile>, inlinedMethods: Set<MethodInfo>): List<NotInlinedCall> {
@@ -127,7 +128,7 @@ object InlineTestUtil {
         val inlinedMethods = inlineInfo.inlineMethods
         val notInlinedParameters = ArrayList<NotInlinedParameter>()
         for (file in files) {
-            if (!isClassOrPackagePartKind(getClassHeader(file))) continue
+            if (!isClassOrPackagePartKind(loadBinaryClass(file))) continue
 
             ClassReader(file.asByteArray()).accept(object : ClassVisitorWithName() {
                 override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array<String>?): MethodVisitor? {
@@ -167,15 +168,15 @@ object InlineTestUtil {
         if (classInternalName.startsWith("kotlin/jvm/internal/"))
             return true
 
-        return isClassOrPackagePartKind(inlineInfo.classHeaders[classInternalName]!!)
+        return isClassOrPackagePartKind(inlineInfo.binaryClasses[classInternalName]!!)
     }
 
-    private fun isClassOrPackagePartKind(header: KotlinClassHeader): Boolean {
-        return header.kind == KotlinClassHeader.Kind.CLASS && !header.isLocalClass
+    private fun isClassOrPackagePartKind(klass: KotlinJvmBinaryClass): Boolean {
+        return klass.classHeader.kind == KotlinClassHeader.Kind.CLASS && !klass.classId.isLocal
     }
 
-    private fun getClassHeader(file: OutputFile): KotlinClassHeader {
-        return FileBasedKotlinClass.create(file.asByteArray()) {
+    private fun loadBinaryClass(file: OutputFile): KotlinJvmBinaryClass {
+        val klass = FileBasedKotlinClass.create(file.asByteArray()) {
             className, classHeader, innerClasses ->
             object : FileBasedKotlinClass(className, classHeader, innerClasses) {
                 override fun getLocation(): String = throw UnsupportedOperationException()
@@ -184,10 +185,11 @@ object InlineTestUtil {
                 override fun equals(other: Any?): Boolean = throw UnsupportedOperationException()
                 override fun toString(): String = throw UnsupportedOperationException()
             }
-        }!!.classHeader
+        }!!
+        return klass
     }
 
-    private class InlineInfo(val inlineMethods: Set<MethodInfo>, val classHeaders: Map<String, KotlinClassHeader>)
+    private class InlineInfo(val inlineMethods: Set<MethodInfo>, val binaryClasses: Map<String, KotlinJvmBinaryClass>)
 
     private data class NotInlinedCall(val fromCall: MethodInfo, val inlineMethod: MethodInfo)
 

compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt

@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.jvm.runtime
 
 import com.intellij.openapi.util.io.FileUtil
 import org.jetbrains.kotlin.cli.common.output.outputUtils.writeAllTo
-import org.jetbrains.kotlin.codegen.AsmUtil
 import org.jetbrains.kotlin.codegen.GenerationUtils
 import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
 import org.jetbrains.kotlin.descriptors.*
@@ -26,8 +25,6 @@ import org.jetbrains.kotlin.incremental.components.LookupLocation
 import org.jetbrains.kotlin.jvm.compiler.ExpectedLoadErrorsUtil
 import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil
 import org.jetbrains.kotlin.load.java.ANNOTATIONS_COPIED_TO_TYPES
-import org.jetbrains.kotlin.load.java.JvmAnnotationNames
-import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KOTLIN_LOCAL_CLASS
 import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor
 import org.jetbrains.kotlin.load.java.structure.reflect.classId
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
@@ -51,10 +48,6 @@ import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.Configuratio
 import org.jetbrains.kotlin.types.TypeSubstitutor
 import org.jetbrains.kotlin.utils.Printer
 import org.jetbrains.kotlin.utils.sure
-import org.jetbrains.org.objectweb.asm.AnnotationVisitor
-import org.jetbrains.org.objectweb.asm.ClassReader
-import org.jetbrains.org.objectweb.asm.ClassVisitor
-import org.jetbrains.org.objectweb.asm.Opcodes
 import java.io.File
 import java.net.URLClassLoader
 import java.util.*
@@ -168,7 +161,7 @@ abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() {
                     packageScopes.add(packageView.memberScope)
                 }
             }
-            else if (header == null || (header.kind == KotlinClassHeader.Kind.CLASS && !classFile.isLocalClass())) {
+            else if (header == null || header.kind == KotlinClassHeader.Kind.CLASS) {
                 // Either a normal Kotlin class or a Java class
                 val classId = klass.classId
                 if (!classId.isLocal) {
@@ -185,21 +178,6 @@ abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() {
         return SyntheticPackageViewForTest(module, packageScopes, classes)
     }
 
-    private fun File.isLocalClass(): Boolean {
-        var result = false
-
-        ClassReader(inputStream()).accept(object : ClassVisitor(Opcodes.ASM5) {
-            override fun visitAnnotation(desc: String, visible: Boolean): AnnotationVisitor? {
-                if (desc == AsmUtil.asmDescByFqNameWithoutInnerClasses(KOTLIN_LOCAL_CLASS)) {
-                    result = true
-                }
-                return super.visitAnnotation(desc, visible)
-            }
-        }, ClassReader.SKIP_CODE or ClassReader.SKIP_DEBUG or ClassReader.SKIP_FRAMES)
-
-        return result
-    }
-
     private fun adaptJavaSource(text: String): String {
         val typeAnnotations = arrayOf("NotNull", "Nullable", "ReadOnly", "Mutable")
         return typeAnnotations.fold(text) { text, annotation -> text.replace("@$annotation", "") }.replace(