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

Do not use typeMapper.mapAsmMethod for erased invoke in MethodInliner

Browse Source 
Return type of erased `invoke` is always java/lang/Object anyway
This commit is contained in:
Alexander Udalov
2019-08-30 13:36:22 +02:00
parent 4953f67563
commit 2648fb2ddd
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt
+1 -2
View File
@@ -303,10 +303,9 @@ class MethodInliner(
result.mergeWithNotChangeInfo(lambdaResult) result.mergeWithNotChangeInfo(lambdaResult)
result.reifiedTypeParametersUsages.mergeAll(lambdaResult.reifiedTypeParametersUsages) result.reifiedTypeParametersUsages.mergeAll(lambdaResult.reifiedTypeParametersUsages)
val bridge = typeMapper.mapAsmMethod(erasedInvokeFunction)
StackValue StackValue
.onStack(info.invokeMethod.returnType, info.invokeMethodDescriptor.returnType) .onStack(info.invokeMethod.returnType, info.invokeMethodDescriptor.returnType)
.put(bridge.returnType, erasedInvokeFunction.returnType, this) .put(OBJECT_TYPE, erasedInvokeFunction.returnType, this)
setLambdaInlining(false) setLambdaInlining(false)
addInlineMarker(this, false) addInlineMarker(this, false)
childSourceMapper.endMapping() childSourceMapper.endMapping()