Revert "[IR] support storing signatures for non-public symbols"

This reverts commit 33cd7e982c.
This commit is contained in:
Anton Bannykh
2021-12-01 14:42:27 +03:00
committed by TeamCityServer
parent 12ea7a9092
commit cb3538db92
6 changed files with 40 additions and 51 deletions
@@ -48,9 +48,6 @@ abstract class Fir2IrBindableSymbol<out D : DeclarationDescriptor, B : IrDeclara
return "Unbound public symbol for $signature"
}
override val isPublicApi: Boolean
get() = true
companion object {
private const val GETTER_PREFIX = "<get"
private const val SETTER_PREFIX = "<set"
@@ -33,9 +33,6 @@ abstract class IrDelegatingSymbol<S : IrBindableSymbol<D, B>, B : IrSymbolOwner,
if (delegate === other) return true
return false
}
override val isPublicApi: Boolean
get() = delegate.isPublicApi
}
class IrDelegatingClassSymbolImpl(delegate: IrClassSymbol) :
@@ -36,10 +36,11 @@ interface IrSymbol {
val isBound: Boolean
val signature: IdSignature?
val isPublicApi: Boolean
}
val IrSymbol.isPublicApi: Boolean
get() = signature != null
interface IrBindableSymbol<out D : DeclarationDescriptor, B : IrSymbolOwner> : IrSymbol {
override val owner: B
@@ -30,7 +30,4 @@ class DescriptorlessExternalPackageFragmentSymbol : IrExternalPackageFragmentSym
override fun bind(owner: IrExternalPackageFragment) {
_owner = owner
}
override val isPublicApi: Boolean
get() = TODO("Not yet implemented")
}
@@ -33,7 +33,7 @@ abstract class IrSymbolBase<out D : DeclarationDescriptor>(
}
}
abstract class IrBindableSymbolBase<out D : DeclarationDescriptor, B : IrSymbolOwner>(descriptor: D?, override val signature: IdSignature?) :
abstract class IrBindableSymbolBase<out D : DeclarationDescriptor, B : IrSymbolOwner>(descriptor: D?) :
IrBindableSymbol<D, B>, IrSymbolBase<D>(descriptor) {
init {
@@ -65,75 +65,75 @@ abstract class IrBindableSymbolBase<out D : DeclarationDescriptor, B : IrSymbolO
}
}
override val signature: IdSignature?
get() = null
override val isBound: Boolean
get() = _owner != null
override val isPublicApi: Boolean
get() = false
}
class IrFileSymbolImpl(descriptor: PackageFragmentDescriptor? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<PackageFragmentDescriptor, IrFile>(descriptor, signature),
class IrFileSymbolImpl(descriptor: PackageFragmentDescriptor? = null) :
IrBindableSymbolBase<PackageFragmentDescriptor, IrFile>(descriptor),
IrFileSymbol
class IrExternalPackageFragmentSymbolImpl(descriptor: PackageFragmentDescriptor? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<PackageFragmentDescriptor, IrExternalPackageFragment>(descriptor, signature),
class IrExternalPackageFragmentSymbolImpl(descriptor: PackageFragmentDescriptor? = null) :
IrBindableSymbolBase<PackageFragmentDescriptor, IrExternalPackageFragment>(descriptor),
IrExternalPackageFragmentSymbol
@OptIn(ObsoleteDescriptorBasedAPI::class)
class IrAnonymousInitializerSymbolImpl(descriptor: ClassDescriptor? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<ClassDescriptor, IrAnonymousInitializer>(descriptor, signature),
class IrAnonymousInitializerSymbolImpl(descriptor: ClassDescriptor? = null) :
IrBindableSymbolBase<ClassDescriptor, IrAnonymousInitializer>(descriptor),
IrAnonymousInitializerSymbol {
constructor(irClassSymbol: IrClassSymbol, signature: IdSignature? = null) : this(irClassSymbol.descriptor, signature)
constructor(irClassSymbol: IrClassSymbol) : this(irClassSymbol.descriptor)
}
class IrClassSymbolImpl(descriptor: ClassDescriptor? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<ClassDescriptor, IrClass>(descriptor, signature),
class IrClassSymbolImpl(descriptor: ClassDescriptor? = null) :
IrBindableSymbolBase<ClassDescriptor, IrClass>(descriptor),
IrClassSymbol
class IrEnumEntrySymbolImpl(descriptor: ClassDescriptor? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<ClassDescriptor, IrEnumEntry>(descriptor, signature),
class IrEnumEntrySymbolImpl(descriptor: ClassDescriptor? = null) :
IrBindableSymbolBase<ClassDescriptor, IrEnumEntry>(descriptor),
IrEnumEntrySymbol
class IrFieldSymbolImpl(descriptor: PropertyDescriptor? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<PropertyDescriptor, IrField>(descriptor, signature),
class IrFieldSymbolImpl(descriptor: PropertyDescriptor? = null) :
IrBindableSymbolBase<PropertyDescriptor, IrField>(descriptor),
IrFieldSymbol
class IrTypeParameterSymbolImpl(descriptor: TypeParameterDescriptor? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<TypeParameterDescriptor, IrTypeParameter>(descriptor, signature),
class IrTypeParameterSymbolImpl(descriptor: TypeParameterDescriptor? = null) :
IrBindableSymbolBase<TypeParameterDescriptor, IrTypeParameter>(descriptor),
IrTypeParameterSymbol
class IrValueParameterSymbolImpl(descriptor: ParameterDescriptor? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<ParameterDescriptor, IrValueParameter>(descriptor, signature),
class IrValueParameterSymbolImpl(descriptor: ParameterDescriptor? = null) :
IrBindableSymbolBase<ParameterDescriptor, IrValueParameter>(descriptor),
IrValueParameterSymbol
class IrVariableSymbolImpl(descriptor: VariableDescriptor? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<VariableDescriptor, IrVariable>(descriptor, signature),
class IrVariableSymbolImpl(descriptor: VariableDescriptor? = null) :
IrBindableSymbolBase<VariableDescriptor, IrVariable>(descriptor),
IrVariableSymbol
class IrSimpleFunctionSymbolImpl(descriptor: FunctionDescriptor? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<FunctionDescriptor, IrSimpleFunction>(descriptor, signature),
class IrSimpleFunctionSymbolImpl(descriptor: FunctionDescriptor? = null) :
IrBindableSymbolBase<FunctionDescriptor, IrSimpleFunction>(descriptor),
IrSimpleFunctionSymbol
class IrConstructorSymbolImpl(descriptor: ClassConstructorDescriptor? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<ClassConstructorDescriptor, IrConstructor>(descriptor, signature),
class IrConstructorSymbolImpl(descriptor: ClassConstructorDescriptor? = null) :
IrBindableSymbolBase<ClassConstructorDescriptor, IrConstructor>(descriptor),
IrConstructorSymbol
class IrReturnableBlockSymbolImpl(descriptor: FunctionDescriptor? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<FunctionDescriptor, IrReturnableBlock>(descriptor, signature),
class IrReturnableBlockSymbolImpl(descriptor: FunctionDescriptor? = null) :
IrBindableSymbolBase<FunctionDescriptor, IrReturnableBlock>(descriptor),
IrReturnableBlockSymbol
class IrPropertySymbolImpl(descriptor: PropertyDescriptor? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<PropertyDescriptor, IrProperty>(descriptor, signature),
class IrPropertySymbolImpl(descriptor: PropertyDescriptor? = null) :
IrBindableSymbolBase<PropertyDescriptor, IrProperty>(descriptor),
IrPropertySymbol
class IrLocalDelegatedPropertySymbolImpl(descriptor: VariableDescriptorWithAccessors? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<VariableDescriptorWithAccessors, IrLocalDelegatedProperty>(descriptor, signature),
class IrLocalDelegatedPropertySymbolImpl(descriptor: VariableDescriptorWithAccessors? = null) :
IrBindableSymbolBase<VariableDescriptorWithAccessors, IrLocalDelegatedProperty>(descriptor),
IrLocalDelegatedPropertySymbol
class IrTypeAliasSymbolImpl(descriptor: TypeAliasDescriptor? = null, signature: IdSignature? = null) :
IrBindableSymbolBase<TypeAliasDescriptor, IrTypeAlias>(descriptor, signature),
class IrTypeAliasSymbolImpl(descriptor: TypeAliasDescriptor? = null) :
IrBindableSymbolBase<TypeAliasDescriptor, IrTypeAlias>(descriptor),
IrTypeAliasSymbol
class IrScriptSymbolImpl(descriptor: ScriptDescriptor? = null, signature: IdSignature? = null) :
IrScriptSymbol, IrBindableSymbolBase<ScriptDescriptor, IrScript>(descriptor, signature)
class IrScriptSymbolImpl(descriptor: ScriptDescriptor? = null) :
IrScriptSymbol, IrBindableSymbolBase<ScriptDescriptor, IrScript>(descriptor)
@@ -61,9 +61,6 @@ abstract class IrBindablePublicSymbolBase<out D : DeclarationDescriptor, B : IrS
override val isBound: Boolean
get() = _owner != null
override val isPublicApi: Boolean
get() = true
}
class IrClassPublicSymbolImpl(sig: IdSignature, descriptor: ClassDescriptor? = null) :