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

Get rid of deprecated asm remapping api

Browse Source 
#KT-27774 In Progress
This commit is contained in:
Mikhael Bogdanov
2018-02-14 17:26:53 +01:00
parent ad8c58d176
commit 0468a354e0
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AsmTypeRemapper.kt
+3 -3
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.codegen.inline package org.jetbrains.kotlin.codegen.inline
import org.jetbrains.org.objectweb.asm.commons.Remapper import org.jetbrains.org.objectweb.asm.commons.Remapper
import org.jetbrains.org.objectweb.asm.commons.RemappingSignatureAdapter import org.jetbrains.org.objectweb.asm.commons.SignatureRemapper
import org.jetbrains.org.objectweb.asm.signature.SignatureReader import org.jetbrains.org.objectweb.asm.signature.SignatureReader
import org.jetbrains.org.objectweb.asm.signature.SignatureVisitor import org.jetbrains.org.objectweb.asm.signature.SignatureVisitor
@@ -26,8 +26,8 @@ class AsmTypeRemapper(val typeRemapper: TypeRemapper, val result: InlineResult)
return typeRemapper.map(type) return typeRemapper.map(type)
} }
override fun createRemappingSignatureAdapter(v: SignatureVisitor?): SignatureVisitor { override fun createSignatureRemapper(v: SignatureVisitor?): SignatureVisitor {
return object : RemappingSignatureAdapter(v, this) { return object : SignatureRemapper(v, this) {
override fun visitTypeVariable(name: String) { override fun visitTypeVariable(name: String) {
/*TODO try to erase absent type variable*/ /*TODO try to erase absent type variable*/
val mapping = typeRemapper.mapTypeParameter(name) ?: return super.visitTypeVariable(name) val mapping = typeRemapper.mapTypeParameter(name) ?: return super.visitTypeVariable(name)
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt
+9 -4
View File
@@ -36,7 +36,8 @@ import org.jetbrains.org.objectweb.asm.MethodVisitor
import org.jetbrains.org.objectweb.asm.Opcodes import org.jetbrains.org.objectweb.asm.Opcodes
import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.Type
import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
import org.jetbrains.org.objectweb.asm.commons.RemappingMethodAdapter import org.jetbrains.org.objectweb.asm.commons.LocalVariablesSorter
import org.jetbrains.org.objectweb.asm.commons.MethodRemapper
import org.jetbrains.org.objectweb.asm.tree.* import org.jetbrains.org.objectweb.asm.tree.*
import org.jetbrains.org.objectweb.asm.tree.analysis.* import org.jetbrains.org.objectweb.asm.tree.analysis.*
import org.jetbrains.org.objectweb.asm.util.Printer import org.jetbrains.org.objectweb.asm.util.Printer
@@ -147,11 +148,15 @@ class MethodInliner(
val iterator = transformations.iterator() val iterator = transformations.iterator()
val remapper = TypeRemapper.createFrom(currentTypeMapping) val remapper = TypeRemapper.createFrom(currentTypeMapping)
val remappingMethodAdapter = RemappingMethodAdapter(
// MethodRemapper doesn't extends LocalVariablesSorter, but RemappingMethodAdapter does.
// So wrapping with LocalVariablesSorter to keep old behavior
val remappingMethodAdapter = MethodRemapper(
LocalVariablesSorter(
resultNode.access, resultNode.access,
resultNode.desc, resultNode.desc,
resultNode, resultNode
AsmTypeRemapper(remapper, result) ), AsmTypeRemapper(remapper, result)
) )
val markerShift = calcMarkerShift(parameters, node) val markerShift = calcMarkerShift(parameters, node)