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

Typo fixed

Browse Source
This commit is contained in:
Konstantin Anisimov
2017-03-30 22:19:09 +07:00
committed by KonstantinAnisimov
parent 34733d12e6
commit d34e5205ae
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDescriptoros.kt
+23 -8
View File
@@ -81,8 +81,13 @@ internal class DeepCopyIrTreeWithDescriptors(val targetFunction: IrFunction, val
val constructors = oldDescriptor.constructors.map {
descriptorSubstituteMap[it] as ClassConstructorDescriptor
}.toSet()
val oldPrimaryConstructor = oldDescriptor.unsubstitutedPrimaryConstructor!!
val primaryConstructor = descriptorSubstituteMap[oldPrimaryConstructor] as ClassConstructorDescriptor
var primaryConstructor: ClassConstructorDescriptor? = null
val oldPrimaryConstructor = oldDescriptor.unsubstitutedPrimaryConstructor
if (oldPrimaryConstructor != null) {
primaryConstructor = descriptorSubstituteMap[oldPrimaryConstructor] as ClassConstructorDescriptor
}
newDescriptor.initialize(
oldDescriptor.unsubstitutedMemberScope,
constructors,
@@ -145,7 +150,7 @@ internal class DeepCopyIrTreeWithDescriptors(val targetFunction: IrFunction, val
oldDescriptor.source
).apply { isTailrec = oldDescriptor.isTailrec }
val newDispatchReceiverParameter = null
val newDispatchReceiverParameter = null // TODO
val newTypeParameters = oldDescriptor.typeParameters
val newValueParameters = copyValueParameters(oldDescriptor.valueParameters, memberOwner)
@@ -197,7 +202,7 @@ internal class DeepCopyIrTreeWithDescriptors(val targetFunction: IrFunction, val
generateName(oldDescriptor.name),
oldDescriptor.modality,
oldDescriptor.kind,
listOf(context.builtIns.anyType),
listOf(context.builtIns.anyType), // TODO get list of real supertypes
oldDescriptor.source,
oldDescriptor.isExternal
)
@@ -249,11 +254,21 @@ internal class DeepCopyIrTreeWithDescriptors(val targetFunction: IrFunction, val
override fun visitCall(expression: IrCall): IrExpression {
val irCall = super.visitCall(expression) as IrCall
if (irCall !is IrCallImpl) return irCall
if (irCall !is IrCallImpl) return irCall // TODO what other kinds of call can we meet?
val descriptor = descriptorSubstituteMap.getOrDefault(irCall.descriptor, irCall.descriptor) as FunctionDescriptor
return IrCallImpl(irCall.startOffset, irCall.endOffset, irCall.type, descriptor,
irCall.typeArguments, irCall.origin, irCall.superQualifier).apply {
val oldDescriptor = irCall.descriptor
val newDescriptor = descriptorSubstituteMap.getOrDefault(oldDescriptor,
oldDescriptor) as FunctionDescriptor
val oldSuperQualifier = irCall.superQualifier
var newSuperQualifier: ClassDescriptor? = oldSuperQualifier
if (newSuperQualifier != null) {
newSuperQualifier = descriptorSubstituteMap.getOrDefault(newSuperQualifier,
newSuperQualifier) as ClassDescriptor
}
return IrCallImpl(irCall.startOffset, irCall.endOffset, irCall.type, newDescriptor,
irCall.typeArguments, irCall.origin, newSuperQualifier).apply {
irCall.descriptor.valueParameters.forEach {
val valueArgument = irCall.getValueArgument(it)
putValueArgument(it.index, valueArgument)
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
+1 -1
View File
@@ -186,7 +186,7 @@ internal class FunctionInlining(val context: Context): IrElementTransformerVoid(
private fun createInlineFunctionBody(functionDeclaration: IrFunction): IrInlineFunctionBody? {
val originBlockBody = functionDeclaration.body!!
val originBlockBody = functionDeclaration.body
if (originBlockBody == null) return null // TODO workaround
val copyBlockBody = originBlockBody.accept(InlineCopyIr(), null) as IrBlockBody // Create copy of original function body.