Code clean

This commit is contained in:
Mikhael Bogdanov
2018-05-03 12:56:55 +02:00
parent 9fafe0473c
commit f1c0db346a
@@ -53,10 +53,8 @@ open class FunctionCodegen(private val irFunction: IrFunction, private val class
private fun doGenerate() { private fun doGenerate() {
val signature = classCodegen.typeMapper.mapSignatureWithGeneric(descriptor, OwnerKind.IMPLEMENTATION) val signature = classCodegen.typeMapper.mapSignatureWithGeneric(descriptor, OwnerKind.IMPLEMENTATION)
val isStatic = irFunction.isStatic
val frameMap = createFrameMapWithReceivers(classCodegen.state, irFunction, signature)
val flags = calculateMethodFlags(isStatic) val flags = calculateMethodFlags(irFunction.isStatic)
val methodVisitor = createMethod(flags, signature) val methodVisitor = createMethod(flags, signature)
FunctionCodegen.generateMethodAnnotations(descriptor, signature.asmMethod, methodVisitor, classCodegen, state.typeMapper) FunctionCodegen.generateMethodAnnotations(descriptor, signature.asmMethod, methodVisitor, classCodegen, state.typeMapper)
@@ -68,6 +66,7 @@ open class FunctionCodegen(private val irFunction: IrFunction, private val class
return return
} }
val frameMap = createFrameMapWithReceivers(classCodegen.state, irFunction, signature)
ExpressionCodegen(irFunction, frameMap, InstructionAdapter(methodVisitor), classCodegen).generate() ExpressionCodegen(irFunction, frameMap, InstructionAdapter(methodVisitor), classCodegen).generate()
} }
@@ -116,7 +115,7 @@ open class FunctionCodegen(private val irFunction: IrFunction, private val class
} }
} }
fun createFrameMapWithReceivers( private fun createFrameMapWithReceivers(
state: GenerationState, state: GenerationState,
irFunction: IrFunction, irFunction: IrFunction,
signature: JvmMethodSignature signature: JvmMethodSignature