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

Implement equalTo function for descriptors

Browse Source
This commit is contained in:
Ivan Kylchik
2019-11-27 12:46:06 +03:00
parent dd93deddd7
commit 0a76da99cf
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/interpreter/Utils.kt
+6 -2
View File
@@ -117,7 +117,11 @@ fun IrFunctionAccessExpression.getBody(): IrBody? {
return this.symbol.owner.body return this.symbol.owner.body
} }
fun DeclarationDescriptor.isSubtypeOf(other: DeclarationDescriptor): Boolean { fun DeclarationDescriptor.equalTo(other: DeclarationDescriptor): Boolean {
return this.isSubtypeOf(other) || this.hasSameNameAs(other) || this == other
}
private fun DeclarationDescriptor.isSubtypeOf(other: DeclarationDescriptor): Boolean {
if (this !is ReceiverParameterDescriptor || other !is ReceiverParameterDescriptor) return false if (this !is ReceiverParameterDescriptor || other !is ReceiverParameterDescriptor) return false
return when { return when {
this.value is ImplicitClassReceiver && other.value is ImplicitClassReceiver -> this.value.type.isSubtypeOf(other.value.type) this.value is ImplicitClassReceiver && other.value is ImplicitClassReceiver -> this.value.type.isSubtypeOf(other.value.type)
@@ -126,7 +130,7 @@ fun DeclarationDescriptor.isSubtypeOf(other: DeclarationDescriptor): Boolean {
} }
} }
fun DeclarationDescriptor.hasSameNameAs(other: DeclarationDescriptor): Boolean { private fun DeclarationDescriptor.hasSameNameAs(other: DeclarationDescriptor): Boolean {
return this is ValueParameterDescriptor && other is ValueParameterDescriptor && this.name == other.name return this is ValueParameterDescriptor && other is ValueParameterDescriptor && this.name == other.name
} }
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/interpreter/stack/Frame.kt
+3 -5
View File
@@ -5,8 +5,7 @@
package org.jetbrains.kotlin.backend.common.interpreter.stack package org.jetbrains.kotlin.backend.common.interpreter.stack
import org.jetbrains.kotlin.backend.common.interpreter.hasSameNameAs import org.jetbrains.kotlin.backend.common.interpreter.equalTo
import org.jetbrains.kotlin.backend.common.interpreter.isSubtypeOf
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
import java.util.* import java.util.*
@@ -39,9 +38,8 @@ class InterpreterFrame(val pool: MutableList<Variable> = mutableListOf()) : Fram
} }
override fun getVariableState(variableDescriptor: DeclarationDescriptor): State { override fun getVariableState(variableDescriptor: DeclarationDescriptor): State {
return pool.firstOrNull { return pool.firstOrNull { it.descriptor.equalTo(variableDescriptor) }?.state
it.descriptor.isSubtypeOf(variableDescriptor) || it.descriptor.hasSameNameAs(variableDescriptor) || it.descriptor == variableDescriptor ?: throw NoSuchElementException("Frame pool doesn't contains variable with descriptor $variableDescriptor")
}?.state ?: throw NoSuchElementException("Frame pool doesn't contains variable with descriptor $variableDescriptor")
} }
override fun getAll(): List<Variable> { override fun getAll(): List<Variable> {
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/interpreter/stack/State.kt
+2 -5
View File
@@ -5,8 +5,7 @@
package org.jetbrains.kotlin.backend.common.interpreter.stack package org.jetbrains.kotlin.backend.common.interpreter.stack
import org.jetbrains.kotlin.backend.common.interpreter.hasSameNameAs import org.jetbrains.kotlin.backend.common.interpreter.equalTo
import org.jetbrains.kotlin.backend.common.interpreter.isSubtypeOf
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrClass
import org.jetbrains.kotlin.ir.declarations.IrFunction import org.jetbrains.kotlin.ir.declarations.IrFunction
@@ -62,9 +61,7 @@ class Complex(private var classOfObject: IrClass, private val values: MutableLis
} }
override fun getState(descriptor: DeclarationDescriptor): State? { override fun getState(descriptor: DeclarationDescriptor): State? {
return values.firstOrNull { return values.firstOrNull { it.descriptor.equalTo(descriptor) }?.state
it.descriptor.isSubtypeOf(descriptor) || it.descriptor.hasSameNameAs(descriptor) || it.descriptor == descriptor
}?.state
} }
override fun setState(newVar: Variable) { override fun setState(newVar: Variable) {