Minor. Pull user-data related things to CallableDescriptor

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
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.contracts.description
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.serialization.deserialization.ContractProvider
/**
@@ -51,4 +51,4 @@ class LazyContractProvider(private val computation: () -> Any?) : ContractProvid
}
// For storing into UserDataMap of FunctionDescriptor
object ContractProviderKey : FunctionDescriptor.UserDataKey<LazyContractProvider?>
object ContractProviderKey : CallableDescriptor.UserDataKey<LazyContractProvider?>
@@ -76,4 +76,6 @@ open class FakeCallableDescriptorForObject(
override fun getContainingDeclaration() = classDescriptor.getClassObjectReferenceTarget().containingDeclaration
override fun substitute(substitutor: TypeSubstitutor) = this
override fun <V> getUserData(key: CallableDescriptor.UserDataKey<V>?): V? = null
}