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

Minor. Pull user-data related things to CallableDescriptor

Browse Source 
Currently, we assume user data for all non-FunctionDescriptor
declarations is empty
This commit is contained in:
Denis Zharkov
2018-08-30 12:47:42 +03:00
parent c1cc722ac4
commit 9cb8a35275
19 changed files with 52 additions and 25 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
+6 -2
View File
@@ -80,6 +80,8 @@ abstract class WrappedCallableDescriptor<T : IrDeclaration>(
override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
TODO("not implemented")
}
override fun <V : Any?> getUserData(key: CallableDescriptor.UserDataKey<V>?): V? = null
}
open class WrappedValueParameterDescriptor(
@@ -289,7 +291,7 @@ open class WrappedSimpleFunctionDescriptor(
override fun getInitialSignatureDescriptor() = null
override fun <V : Any?> getUserData(key: FunctionDescriptor.UserDataKey<V>?): V? = null
override fun <V : Any?> getUserData(key: CallableDescriptor.UserDataKey<V>?): V? = null
override fun newCopyBuilder(): FunctionDescriptor.CopyBuilder<out SimpleFunctionDescriptor> {
TODO("not implemented")
@@ -378,7 +380,7 @@ open class WrappedClassConstructorDescriptor(
override fun isSuspend() = false
override fun <V : Any?> getUserData(key: FunctionDescriptor.UserDataKey<V>?): V? = null
override fun <V : Any?> getUserData(key: CallableDescriptor.UserDataKey<V>?): V? = null
override fun isExternal() = owner.isExternal
@@ -586,4 +588,6 @@ open class WrappedPropertyDescriptor(
override fun getDelegateField(): FieldDescriptor? {
TODO("not implemented")
}
override fun <V : Any?> getUserData(key: CallableDescriptor.UserDataKey<V>?): V? = null
}
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltinFunctionDescriptor.kt
+2 -2
View File
@@ -47,7 +47,7 @@ abstract class IrBuiltinOperatorDescriptorBase(containingDeclaration: Declaratio
override fun getKind(): CallableMemberDescriptor.Kind = CallableMemberDescriptor.Kind.SYNTHESIZED
override fun getInitialSignatureDescriptor(): FunctionDescriptor? = null
override fun isExternal(): Boolean = false
override fun <V : Any> getUserData(key: FunctionDescriptor.UserDataKey<V>?): V? = null
override fun <V : Any> getUserData(key: CallableDescriptor.UserDataKey<V>?): V? = null
override fun isHiddenForResolutionEverywhereBesideSupercalls(): Boolean = false
override fun isHiddenToOvercomeSignatureClash(): Boolean = false
override fun isInfix(): Boolean = false
@@ -118,4 +118,4 @@ class IrBuiltinValueParameterDescriptorImpl(
override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>, data: D): R {
return visitor.visitValueParameterDescriptor(this, data)
}
}
}