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

IR: Make sure that symbols refer to original descriptors only

Browse Source 
If a descriptor is a WrappedDeclarationDescriptor, it SHOULD NOT be
substituted.
This commit is contained in:
Dmitry Petrov
2019-03-28 14:35:45 +03:00
parent cd6c88fa2c
commit 8be7f7f1f7
14 changed files with 74 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/descriptors/WrappedDescriptors.kt
+17 -19
View File
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations
import org.jetbrains.kotlin.descriptors.impl.ReceiverParameterDescriptorImpl
import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.descriptors.IrBasedDeclarationDescriptor
import org.jetbrains.kotlin.ir.expressions.*
import org.jetbrains.kotlin.ir.types.classifierOrFail
import org.jetbrains.kotlin.ir.types.toKotlinType
@@ -31,9 +32,12 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
import org.jetbrains.kotlin.storage.LockBasedStorageManager
import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.types.*
import java.lang.UnsupportedOperationException
abstract class WrappedDeclarationDescriptor<T : IrDeclaration>(annotations: Annotations) : DeclarationDescriptor {
abstract class WrappedDeclarationDescriptor<T : IrDeclaration>(annotations: Annotations) :
DeclarationDescriptor, IrBasedDeclarationDescriptor {
private val annotations_ = annotations
override val annotations: Annotations
@@ -112,9 +116,8 @@ abstract class WrappedCallableDescriptor<T : IrDeclaration>(
) : CallableDescriptor, WrappedDeclarationDescriptor<T>(annotations) {
override fun getOriginal() = this
override fun substitute(substitutor: TypeSubstitutor): CallableDescriptor {
TODO("not implemented")
}
override fun substitute(substitutor: TypeSubstitutor): CallableDescriptor =
throw UnsupportedOperationException("Wrapped descriptors SHOULD NOT be substituted")
override fun getOverriddenDescriptors(): Collection<CallableDescriptor> {
TODO("not implemented")
@@ -190,9 +193,8 @@ open class WrappedValueParameterDescriptor(
override fun getOriginal() = this
override fun substitute(substitutor: TypeSubstitutor): ValueParameterDescriptor {
TODO("")
}
override fun substitute(substitutor: TypeSubstitutor): ValueParameterDescriptor =
throw UnsupportedOperationException("Wrapped descriptors SHOULD NOT be substituted")
override fun getReturnType(): KotlinType? = owner.type.toKotlinType()
@@ -583,9 +585,8 @@ open class WrappedClassDescriptor(
override fun isExpect() = false
override fun substitute(substitutor: TypeSubstitutor): ClassifierDescriptorWithTypeParameters {
TODO("not implemented")
}
override fun substitute(substitutor: TypeSubstitutor): ClassifierDescriptorWithTypeParameters =
throw UnsupportedOperationException("Wrapped descriptors SHOULD NOT be substituted")
override fun isActual() = false
@@ -696,9 +697,8 @@ open class WrappedEnumEntryDescriptor(
override fun isExpect() = false
override fun substitute(substitutor: TypeSubstitutor): ClassifierDescriptorWithTypeParameters {
TODO("not implemented")
}
override fun substitute(substitutor: TypeSubstitutor): ClassifierDescriptorWithTypeParameters =
throw UnsupportedOperationException("Wrapped descriptors SHOULD NOT be substituted")
override fun isActual() = false
@@ -783,9 +783,8 @@ open class WrappedPropertyDescriptor(
override fun isExpect() = false
override fun substitute(substitutor: TypeSubstitutor): PropertyDescriptor {
TODO("not implemented")
}
override fun substitute(substitutor: TypeSubstitutor): PropertyDescriptor =
throw UnsupportedOperationException("Wrapped descriptors SHOULD NOT be substituted")
override fun isActual() = false
@@ -888,9 +887,8 @@ open class WrappedFieldDescriptor(
override fun isExpect() = false
override fun substitute(substitutor: TypeSubstitutor): PropertyDescriptor {
TODO("not implemented")
}
override fun substitute(substitutor: TypeSubstitutor): PropertyDescriptor =
throw UnsupportedOperationException("Wrapped descriptors SHOULD NOT be substituted")
override fun isActual() = false