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

Fix jvm method reading when descriptor and signature do not match

Browse Source 
#KT-38325 fixed
This commit is contained in:
Ilya Chernikov
2021-04-07 18:19:09 +02:00
committed by TeamCityServer
parent c75331bf2a
commit ca352c9556
3 changed files with 87 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution.common.jvm/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Methods.kt
+24 -12
View File
@@ -59,24 +59,36 @@ abstract class BinaryJavaMethodBase(
val isInnerClassConstructor = isConstructor && containingClass.outerClass != null && !containingClass.isStatic
val isEnumConstructor = containingClass.isEnum && isConstructor
val methodInfoFromDescriptor = parseMethodDescription(desc, parentContext, signatureParser).let {
when {
isEnumConstructor ->
// skip ordinal/name parameters for enum constructors
MethodInfo(it.returnType, it.typeParameters, it.valueParameterTypes.drop(2))
isInnerClassConstructor ->
// omit synthetic inner class constructor parameter
MethodInfo(it.returnType, it.typeParameters, it.valueParameterTypes.drop(1))
else -> it
}
}
val info: MethodInfo =
if (signature != null) {
val contextForMethod = parentContext.copyForMember()
parseMethodSignature(signature, signatureParser, contextForMethod).also {
val methodInforFromSignature = parseMethodSignature(signature, signatureParser, contextForMethod).also {
contextForMethod.addTypeParameters(it.typeParameters)
}
} else
parseMethodDescription(desc, parentContext, signatureParser).let {
when {
isEnumConstructor ->
// skip ordinal/name parameters for enum constructors
MethodInfo(it.returnType, it.typeParameters, it.valueParameterTypes.drop(2))
isInnerClassConstructor ->
// omit synthetic inner class constructor parameter
MethodInfo(it.returnType, it.typeParameters, it.valueParameterTypes.drop(1))
else -> it
}
// JVM specs allows disagreements in parameters between signature and descriptor/serialized method. In particular the
// situation was detected on Scala stdlib (see #KT-3825 for some details).
// But in our implementation we are using the parameter infos read here as a "master" so if signature has less params
// than the descriptor, we need get missing parameter infos from somewhere.
// Since the known cases are rare, it was decided to keep it simple for now and only cover this particular case.
if (methodInforFromSignature.valueParameterTypes.count() < methodInfoFromDescriptor.valueParameterTypes.count()) {
methodInfoFromDescriptor
} else {
methodInforFromSignature
}
} else {
methodInfoFromDescriptor
}
val parameterTypes = info.valueParameterTypes
val paramCount = parameterTypes.size