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

Get rid of warnings in inliner code

Browse Source 
Fix problem with "Duplicate IR node" warning
This commit is contained in:
Konstantin Anisimov
2017-04-12 15:23:15 +07:00
committed by KonstantinAnisimov
parent 9830454b58
commit 00a3dfc4b7
2 changed files with 11 additions and 10 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
+1 -1
View File
@@ -392,7 +392,7 @@ internal class DeepCopyIrTreeWithDescriptors(val targetScope: ScopeWithIr,
override fun mapEnumEntryDeclaration (descriptor: ClassDescriptor) = descriptorSubstituteMap.getOrDefault(descriptor, descriptor) as ClassDescriptor override fun mapEnumEntryDeclaration (descriptor: ClassDescriptor) = descriptorSubstituteMap.getOrDefault(descriptor, descriptor) as ClassDescriptor
override fun mapVariableDeclaration (descriptor: VariableDescriptor) = descriptorSubstituteMap.getOrDefault(descriptor, descriptor) as VariableDescriptor override fun mapVariableDeclaration (descriptor: VariableDescriptor) = descriptorSubstituteMap.getOrDefault(descriptor, descriptor) as VariableDescriptor
override fun mapCatchParameterDeclaration (descriptor: VariableDescriptor) = descriptorSubstituteMap.getOrDefault(descriptor, descriptor) as VariableDescriptor override fun mapCatchParameterDeclaration (descriptor: VariableDescriptor) = descriptorSubstituteMap.getOrDefault(descriptor, descriptor) as VariableDescriptor
override fun mapErrorDeclaration (descriptor: DeclarationDescriptor) = descriptorSubstituteMap.getOrDefault(descriptor, descriptor) as DeclarationDescriptor override fun mapErrorDeclaration (descriptor: DeclarationDescriptor) = descriptorSubstituteMap.getOrDefault(descriptor, descriptor)
override fun mapClassReference (descriptor: ClassDescriptor) = descriptorSubstituteMap.getOrDefault(descriptor, descriptor) as ClassDescriptor override fun mapClassReference (descriptor: ClassDescriptor) = descriptorSubstituteMap.getOrDefault(descriptor, descriptor) as ClassDescriptor
override fun mapValueReference (descriptor: ValueDescriptor) = descriptorSubstituteMap.getOrDefault(descriptor, descriptor) as ValueDescriptor override fun mapValueReference (descriptor: ValueDescriptor) = descriptorSubstituteMap.getOrDefault(descriptor, descriptor) as ValueDescriptor
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
+10 -9
View File
@@ -14,6 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
@file:Suppress("FoldInitializerAndIfToElvis")
package org.jetbrains.kotlin.backend.konan.lower package org.jetbrains.kotlin.backend.konan.lower
import org.jetbrains.kotlin.backend.common.DeepCopyIrTreeWithDescriptors import org.jetbrains.kotlin.backend.common.DeepCopyIrTreeWithDescriptors
@@ -166,7 +168,7 @@ private class Inliner(val currentScope: ScopeWithIr, val context: Context) {
if (functionArgument == null) return super.visitCall(expression) // It is not call of argument lambda - nothing to substitute. if (functionArgument == null) return super.visitCall(expression) // It is not call of argument lambda - nothing to substitute.
if (functionArgument !is IrBlock) return super.visitCall(expression) if (functionArgument !is IrBlock) return super.visitCall(expression)
val dispatchDescriptor = dispatchReceiver.descriptor // Check if this functional parameter has "noinline" tag val dispatchDescriptor = dispatchReceiver.descriptor // Check if this functional parameter has "noInline" tag
if (dispatchDescriptor is ValueParameterDescriptor && if (dispatchDescriptor is ValueParameterDescriptor &&
dispatchDescriptor.isNoinline) return super.visitCall(expression) dispatchDescriptor.isNoinline) return super.visitCall(expression)
@@ -287,7 +289,7 @@ private class Inliner(val currentScope: ScopeWithIr, val context: Context) {
) )
} }
parameterDescriptor.varargElementType != null -> { // parameterDescriptor.varargElementType != null -> {
val emptyArray = IrVarargImpl( val emptyArray = IrVarargImpl(
startOffset = irCall.startOffset, startOffset = irCall.startOffset,
endOffset = irCall.endOffset, endOffset = irCall.endOffset,
@@ -328,18 +330,17 @@ private class Inliner(val currentScope: ScopeWithIr, val context: Context) {
return@forEach return@forEach
} }
val currentScope = currentScope!! val newExpression = copyIrElement.copy(argumentExpression, null) as IrExpression
val varName = currentScope.scope.scopeOwner.name.toString() + "_inline" val newVariable = currentScope.scope.createTemporaryVariable( // Create new variable and init it with the parameter expression.
val newVar = currentScope.scope.createTemporaryVariable( // Create new variable and init it with the parameter expression. irExpression = newExpression,
irExpression = argumentExpression, nameHint = functionDeclaration.descriptor.name.toString(),
nameHint = varName,
isMutable = false) isMutable = false)
evaluationStatements.add(newVar) // Add initialization of the new variable in statement list. evaluationStatements.add(newVariable) // Add initialization of the new variable in statement list.
val getVal = IrGetValueImpl( // Create new expression, representing access the new variable. val getVal = IrGetValueImpl( // Create new expression, representing access the new variable.
startOffset = currentScope.irElement.startOffset, startOffset = currentScope.irElement.startOffset,
endOffset = currentScope.irElement.endOffset, endOffset = currentScope.irElement.endOffset,
descriptor = newVar.descriptor descriptor = newVariable.descriptor
) )
parameterToArgumentNew[parameterDescriptor] = getVal // Parameter will be replaced with the new variable. parameterToArgumentNew[parameterDescriptor] = getVal // Parameter will be replaced with the new variable.
} }