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

Replaced symbols comparison with descriptors comparison

Browse Source
This commit is contained in:
Igor Chevdar
2018-06-07 14:10:34 +03:00
parent 9053eb3a63
commit 020dd641de
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DataClassOperatorsLowering.kt
+4 -3
View File
@@ -39,8 +39,9 @@ internal class DataClassOperatorsLowering(val context: Context): FunctionLowerin
override fun visitCall(expression: IrCall): IrExpression { override fun visitCall(expression: IrCall): IrExpression {
expression.transformChildrenVoid(this) expression.transformChildrenVoid(this)
if (expression.symbol != irBuiltins.dataClassArrayMemberToStringSymbol val descriptor = expression.descriptor.original
&& expression.symbol != irBuiltins.dataClassArrayMemberHashCodeSymbol) if (descriptor != irBuiltins.dataClassArrayMemberToString
&& descriptor != irBuiltins.dataClassArrayMemberHashCode)
return expression return expression
val argument = expression.getValueArgument(0)!! val argument = expression.getValueArgument(0)!!
@@ -50,7 +51,7 @@ internal class DataClassOperatorsLowering(val context: Context): FunctionLowerin
argumentType argumentType
else else
(argumentType.constructor.declarationDescriptor as ClassDescriptor).defaultType (argumentType.constructor.declarationDescriptor as ClassDescriptor).defaultType
val isToString = expression.symbol == irBuiltins.dataClassArrayMemberToStringSymbol val isToString = descriptor == irBuiltins.dataClassArrayMemberToString
val newSymbol = if (isToString) val newSymbol = if (isToString)
context.ir.symbols.arrayContentToString[genericType]!! context.ir.symbols.arrayContentToString[genericType]!!
else else