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

Fix prototype JVM BE tests

Browse Source
This commit is contained in:
Dmitry Petrov
2017-04-12 17:16:07 +03:00
parent 2b0d3440ad
commit 40e09a39c1
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalFunctionsLowering.kt
+1 -1
View File
@@ -214,7 +214,7 @@ class LocalFunctionsLowering(val context: BackendContext): DeclarationContainerL
return if (oldCallee.typeParameters.isEmpty()) return if (oldCallee.typeParameters.isEmpty())
null null
else oldCallee.typeParameters.associateBy( else oldCallee.original.typeParameters.associateBy(
{ newCallee.typeParameters[it.index] }, { newCallee.typeParameters[it.index] },
{ oldExpression.getTypeArgument(it)!! } { oldExpression.getTypeArgument(it)!! }
) )
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
+1
View File
@@ -136,6 +136,7 @@ class ClassCodegen private constructor(val irClass: IrClass, val context: JvmBac
} }
fun generateMethod(method: IrFunction) { fun generateMethod(method: IrFunction) {
if (method.descriptor.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) return
FunctionCodegen(method, this).generate() FunctionCodegen(method, this).generate()
} }