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

JVM: Generate LVT entry for this in @JvmOverload methods.

Browse Source 
This change also makes sure that no line numbers are generated
in the wrappers in the JVM_IR backend.

Change-Id: If6c37f8a20894455abddb526039df059e02015a3
This commit is contained in:
Mads Ager
2019-05-08 17:35:57 +02:00
committed by max-kammerer
parent 360e30c133
commit b1e8a7cfce
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt
+3 -1
View File
@@ -244,8 +244,10 @@ class DefaultParameterValueSubstitutor(val state: GenerationState) {
val methodEnd = Label()
mv.visitLabel(methodEnd)
val thisType = functionDescriptor.dispatchReceiverParameter?.type?.asmType(typeMapper)
FunctionCodegen.generateLocalVariablesForParameters(
mv, signature, functionDescriptor, null, methodBegin, methodEnd, remainingParameters, isStatic, state
mv, signature, functionDescriptor, thisType, methodBegin, methodEnd, remainingParameters, isStatic, state
)
FunctionCodegen.endVisit(mv, null, methodElement)
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmOverloadsAnnotationLowering.kt
+2 -2
View File
@@ -115,7 +115,7 @@ private class JvmOverloadsAnnotationLowering(val context: JvmBackendContext) : C
is IrConstructor -> {
val descriptor = WrappedClassConstructorDescriptor(oldFunction.descriptor.annotations)
IrConstructorImpl(
oldFunction.startOffset, oldFunction.endOffset,
UNDEFINED_OFFSET, UNDEFINED_OFFSET,
JvmLoweredDeclarationOrigin.JVM_OVERLOADS_WRAPPER,
IrConstructorSymbolImpl(descriptor),
oldFunction.name,
@@ -131,7 +131,7 @@ private class JvmOverloadsAnnotationLowering(val context: JvmBackendContext) : C
is IrSimpleFunction -> {
val descriptor = WrappedSimpleFunctionDescriptor(oldFunction.descriptor.annotations)
IrFunctionImpl(
oldFunction.startOffset, oldFunction.endOffset,
UNDEFINED_OFFSET, UNDEFINED_OFFSET,
JvmLoweredDeclarationOrigin.JVM_OVERLOADS_WRAPPER,
IrSimpleFunctionSymbolImpl(descriptor),
oldFunction.name,
compiler/testData/checkLocalVariablesTable/jvmOverloads.kt
Vendored
+1 -1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JVM_IR
// WITH_RUNTIME
class C {
@kotlin.jvm.JvmOverloads fun foo(firstParam: Int, secondParam: String = "") {
@@ -6,4 +5,5 @@ class C {
}
// METHOD : C.foo(I)V
// VARIABLE : NAME=this TYPE=LC; INDEX=0
// VARIABLE : NAME=firstParam TYPE=I INDEX=1
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.kt
+3 -1
View File
@@ -102,11 +102,13 @@ abstract class AbstractCheckLocalVariablesTableTest : CodegenTestCase() {
class Visitor : ClassVisitor(Opcodes.API_VERSION) {
var readVariables: MutableList<LocalVariable> = ArrayList()
var methodFound = false
override fun visitMethod(
access: Int, name: String, desc: String, signature: String?, exceptions: Array<String>?
): MethodVisitor? {
return if (methodName == name + desc) {
methodFound = true
object : MethodVisitor(Opcodes.API_VERSION) {
override fun visitLocalVariable(
name: String, desc: String, signature: String?, start: Label, end: Label, index: Int
@@ -124,7 +126,7 @@ abstract class AbstractCheckLocalVariablesTableTest : CodegenTestCase() {
cr.accept(visitor, ClassReader.SKIP_FRAMES)
TestCase.assertFalse("method not found: $methodName", visitor.readVariables.isEmpty())
TestCase.assertTrue("method not found: $methodName", visitor.methodFound)
return visitor.readVariables
}