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

Use consistent descriptors as keys

Browse Source 
This commit fixes exception during IR generation with enabled new inferece,
 but the problem also can affect old inference.

 We were using originalTypeArguments (`resolvedCall.typeArguments`)
 that uses type parameters from *candidate* descriptor and were trying
 to get value by key from `resolvedCall.resultingDescriptor.original`,
 assuming that resolvedCall.resultingDescriptor.original equals to
 resolvedCall.candidateDescriptor, which can be wrong
This commit is contained in:
Mikhail Zarechenskiy
2018-07-24 15:03:09 +03:00
parent f9b19c6286
commit cff066f702
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ArgumentsGenerationUtils.kt
+2 -1
View File
@@ -381,6 +381,7 @@ fun StatementGenerator.pregenerateCallReceivers(resolvedCall: ResolvedCall<*>):
fun unwrapCallableDescriptorAndTypeArguments(resolvedCall: ResolvedCall<*>): CallBuilder { fun unwrapCallableDescriptorAndTypeArguments(resolvedCall: ResolvedCall<*>): CallBuilder {
val originalDescriptor = resolvedCall.resultingDescriptor val originalDescriptor = resolvedCall.resultingDescriptor
val candidateDescriptor = resolvedCall.candidateDescriptor
val unwrappedDescriptor = when (originalDescriptor) { val unwrappedDescriptor = when (originalDescriptor) {
is ImportedFromObjectCallableDescriptor<*> -> originalDescriptor.callableFromObject is ImportedFromObjectCallableDescriptor<*> -> originalDescriptor.callableFromObject
@@ -404,7 +405,7 @@ fun unwrapCallableDescriptorAndTypeArguments(resolvedCall: ResolvedCall<*>): Cal
null null
else else
unsubstitutedUnwrappedTypeParameters.associate { unsubstitutedUnwrappedTypeParameters.associate {
val originalTypeParameter = originalDescriptor.original.typeParameters[it.index] val originalTypeParameter = candidateDescriptor.typeParameters[it.index]
val originalTypeArgument = originalTypeArguments[originalTypeParameter] val originalTypeArgument = originalTypeArguments[originalTypeParameter]
?: throw AssertionError("No type argument for $originalTypeParameter") ?: throw AssertionError("No type argument for $originalTypeParameter")
it to originalTypeArgument it to originalTypeArgument