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

Inline ABI_EXTENSION_ASM_API_VERSION

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-12-19 16:22:47 +01:00
parent 87d99907f6
commit f900d598c7
5 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/JvmAbiAnalysisHandlerExtension.kt
+1 -3
View File
@@ -21,10 +21,8 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.JVMConfigurationKeys
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.diagnostics.Severity
import org.jetbrains.kotlin.incremental.LocalFileKotlinClass
import org.jetbrains.kotlin.incremental.isClassFile
import org.jetbrains.kotlin.jvm.abi.asm.AbiClassBuilder
import org.jetbrains.kotlin.jvm.abi.asm.ABI_EXTENSION_ASM_API_VERSION
import org.jetbrains.kotlin.jvm.abi.asm.FilterInnerClassesVisitor
import org.jetbrains.kotlin.jvm.abi.asm.InnerClassesCollectingVisitor
import org.jetbrains.kotlin.load.kotlin.FileBasedKotlinClass
@@ -158,7 +156,7 @@ class JvmAbiAnalysisHandlerExtension(
output.delete()
} else {
output.transform { writer ->
FilterInnerClassesVisitor(classesToRemove, ABI_EXTENSION_ASM_API_VERSION, writer)
FilterInnerClassesVisitor(classesToRemove, Opcodes.API_VERSION, writer)
}
}
}
plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/AsmApiVersion.kt
-10
View File
@@ -1,10 +0,0 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.jvm.abi.asm
import org.jetbrains.org.objectweb.asm.Opcodes
internal const val ABI_EXTENSION_ASM_API_VERSION = Opcodes.API_VERSION
plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/InnerClassesCollectingVisitor.kt
+2 -1
View File
@@ -1,8 +1,9 @@
package org.jetbrains.kotlin.jvm.abi.asm
import org.jetbrains.org.objectweb.asm.ClassVisitor
import org.jetbrains.org.objectweb.asm.Opcodes
internal class InnerClassesCollectingVisitor : ClassVisitor(ABI_EXTENSION_ASM_API_VERSION) {
internal class InnerClassesCollectingVisitor : ClassVisitor(Opcodes.API_VERSION) {
lateinit var ownInternalName: String
private set
plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/ReplaceWithEmptyMethodVisitor.kt
+1 -1
View File
@@ -16,7 +16,7 @@ internal class ReplaceWithEmptyMethodVisitor(
desc: String,
signature: String?,
exceptions: Array<out String>?
) : TransformationMethodVisitor(delegate, access, name, desc, signature, exceptions, api = ABI_EXTENSION_ASM_API_VERSION) {
) : TransformationMethodVisitor(delegate, access, name, desc, signature, exceptions, api = Opcodes.API_VERSION) {
override fun performTransformations(methodNode: MethodNode) {
methodNode.instructions.clear()
methodNode.localVariables.clear()
plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractJvmAbiContentTest.kt
+1 -2
View File
@@ -3,7 +3,6 @@ package org.jetbrains.kotlin.jvm.abi
import com.intellij.openapi.util.io.systemIndependentPath
import org.jetbrains.kotlin.codegen.BytecodeListingTextCollectingVisitor
import org.jetbrains.kotlin.incremental.isClassFile
import org.jetbrains.kotlin.jvm.abi.asm.ABI_EXTENSION_ASM_API_VERSION
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
import org.jetbrains.org.objectweb.asm.*
import java.io.File
@@ -22,7 +21,7 @@ abstract class AbstractJvmAbiContentTest : BaseJvmAbiTest() {
val visitor = BytecodeListingTextCollectingVisitor(
filter = BytecodeListingTextCollectingVisitor.Filter.EMPTY,
withSignatures = false,
api = ABI_EXTENSION_ASM_API_VERSION
api = Opcodes.API_VERSION
)
reader.accept(visitor, 0)
classToBytecode[classFile] = visitor.text