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

[IR] Made signature nullable (#3860)

Browse Source
This commit is contained in:
LepilkinaElena
2020-10-20 21:13:40 +03:00
committed by GitHub
parent 6a9c72e77c
commit b786cf7559
16 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/symbols/Fir2IrBindableSymbol.kt
-2
View File
@@ -32,8 +32,6 @@ abstract class Fir2IrBindableSymbol<out D : DeclarationDescriptor, B : IrSymbolO
}
}
override val isPublicApi: Boolean = true
override val isBound: Boolean
get() = _owner != null
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/MoveBodilessDeclarationsToSeparatePlace.kt
+2 -5
View File
@@ -59,11 +59,8 @@ private class DescriptorlessIrFileSymbol : IrFileSymbol {
override val isBound get() = _owner != null
override val isPublicApi: Boolean
get() = error("Operation is unsupported")
override val signature: IdSignature
get() = error("Operation is unsupported")
override val signature: IdSignature?
get() = null
}
private fun isBuiltInClass(declaration: IrDeclaration): Boolean =
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrClassifierEqualityChecker.kt
+2 -2
View File
@@ -14,8 +14,8 @@ interface IrClassifierEqualityChecker {
object FqNameEqualityChecker : IrClassifierEqualityChecker {
override fun areEqual(left: IrClassifierSymbol, right: IrClassifierSymbol): Boolean =
left === right ||
left.isPublicApi && right.isPublicApi && left.signature == right.signature
left.signature != null && left.signature == right.signature
override fun getHashCode(symbol: IrClassifierSymbol): Int =
if (symbol.isPublicApi) symbol.signature.hashCode() else symbol.hashCode()
symbol.signature?.hashCode() ?: symbol.hashCode()
}
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrDelegatingSymbol.kt
+1 -3
View File
@@ -18,10 +18,8 @@ abstract class IrDelegatingSymbol<S : IrBindableSymbol<D, B>, B : IrSymbolOwner,
override val descriptor: D get() = delegate.descriptor
override val isBound: Boolean get() = delegate.isBound
override val isPublicApi: Boolean
get() = delegate.isPublicApi
override val signature: IdSignature
override val signature: IdSignature?
get() = delegate.signature
override fun bind(owner: B) = delegate.bind(owner)
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrSymbol.kt
+2 -1
View File
@@ -32,9 +32,10 @@ interface IrSymbol {
val isBound: Boolean
val signature: IdSignature
val signature: IdSignature?
val isPublicApi: Boolean
get() = signature != null
}
interface IrBindableSymbol<out D : DeclarationDescriptor, B : IrSymbolOwner> : IrSymbol {
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/DescriptorlessExternalPackageFragmentSymbol.kt
+1 -1
View File
@@ -22,7 +22,7 @@ class DescriptorlessExternalPackageFragmentSymbol : IrExternalPackageFragmentSym
override val isPublicApi: Boolean
get() = TODO("Not yet implemented")
override val signature: IdSignature
override val signature: IdSignature?
get() = TODO("Not yet implemented")
override val isBound get() = _owner != null
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPrivateSymbolBase.kt
+2 -4
View File
@@ -69,10 +69,8 @@ abstract class IrBindableSymbolBase<out D : DeclarationDescriptor, B : IrSymbolO
}
}
override val isPublicApi: Boolean = false
override val signature: IdSignature
get() = error("IdSignature is allowed only for PublicApi symbols")
override val signature: IdSignature?
get() = null
override val isBound: Boolean
get() = _owner != null
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt
-2
View File
@@ -52,8 +52,6 @@ abstract class IrBindablePublicSymbolBase<out D : DeclarationDescriptor, B : IrS
}
}
override val isPublicApi: Boolean = true
override val isBound: Boolean
get() = _owner != null
}
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeSystemContext.kt
+4 -4
View File
@@ -345,18 +345,18 @@ interface IrTypeSystemContext : TypeSystemContext, TypeSystemCommonSuperTypesCon
}
override fun TypeConstructorMarker.getPrimitiveType(): PrimitiveType? {
if (this !is IrClassSymbol || !isPublicApi) return null
if (this !is IrClassSymbol) return null
val signature = signature.asPublic()
val signature = signature?.asPublic()
if (signature == null || signature.packageFqName != "kotlin") return null
return PrimitiveType.getByShortName(signature.declarationFqName)
}
override fun TypeConstructorMarker.getPrimitiveArrayType(): PrimitiveType? {
if (this !is IrClassSymbol || !isPublicApi) return null
if (this !is IrClassSymbol) return null
val signature = signature.asPublic()
val signature = signature?.asPublic()
if (signature == null || signature.packageFqName != "kotlin") return null
return PrimitiveType.getByShortArrayName(signature.declarationFqName)
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/irTypePredicates.kt
-1
View File
@@ -57,7 +57,6 @@ fun getPublicSignature(packageFqName: FqName, name: String) =
private fun IrType.isClassType(signature: IdSignature.PublicSignature, hasQuestionMark: Boolean? = null): Boolean {
if (this !is IrSimpleType) return false
if (hasQuestionMark != null && this.hasQuestionMark != hasQuestionMark) return false
if (!classifier.isPublicApi || !classifier.signature.isPublic) return false
return signature == classifier.signature
}
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/AdditionalIrUtils.kt
+1 -1
View File
@@ -86,7 +86,7 @@ private val IrConstructorCall.annotationClass
get() = this.symbol.owner.constructedClass
val IrClass.packageFqName: FqName?
get() = if (symbol.isPublicApi) symbol.signature.packageFqName() else parent.getPackageFragment()?.fqName
get() = symbol.signature?.packageFqName() ?: parent.getPackageFragment()?.fqName
fun IrDeclarationWithName.hasEqualFqName(fqName: FqName): Boolean =
name == fqName.shortName() && when (val parent = parent) {
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt
+4 -1
View File
@@ -77,7 +77,10 @@ class DeclarationStubGenerator(
return generateStubBySymbol(symbol, symbol.descriptor)
}
val descriptor = if (symbol.descriptor is WrappedDeclarationDescriptor<*>)
findDescriptorBySignature(symbol.signature)
findDescriptorBySignature(
symbol.signature
?: error("Symbol is not public API. Expected signature for symbol: ${symbol.descriptor}")
)
else
symbol.descriptor
if (descriptor == null) return null
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt
+6 -6
View File
@@ -216,9 +216,9 @@ class SymbolTable(
}
override fun set(d: D, s: S) {
if (s.isPublicApi) {
idSigToSymbol[s.signature] = s
} else {
s.signature?.let {
idSigToSymbol[it] = s
} ?: run {
descriptorToSymbol[d] = s
}
}
@@ -264,10 +264,10 @@ class SymbolTable(
fun getLocal(d: D) = descriptorToSymbol[d]
operator fun set(d: D, s: S) {
if (s.isPublicApi) {
s.signature?.let {
require(d is TypeParameterDescriptor)
idSigToSymbol[s.signature] = s
} else {
idSigToSymbol[it] = s
} ?: run {
descriptorToSymbol[d] = s
}
}
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/DeclarationTable.kt
+1 -1
View File
@@ -36,7 +36,7 @@ abstract class GlobalDeclarationTable(
protected fun loadKnownBuiltins(builtIns: IrBuiltIns) {
builtIns.knownBuiltins.forEach {
val symbol = (it as IrSymbolOwner).symbol
table[it] = symbol.signature.also { id -> clashTracker.commit(it, id) }
table[it] = symbol.signature!!.also { id -> clashTracker.commit(it, id) }
}
}
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IncrementalCompilationSupport.kt
+1 -1
View File
@@ -119,7 +119,7 @@ class CurrentModuleWithICDeserializer(
symbolTable.forEachPublicSymbol {
if (it.descriptor.isDirtyDescriptor()) { // public && non-deserialized should be dirty symbol
if (it !in knownBuiltIns) {
dirtyDeclarations[it.signature] = it
dirtyDeclarations[it.signature!!] = it
}
}
}
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt
+6 -4
View File
@@ -37,9 +37,10 @@ abstract class IrModuleDeserializer(val moduleDescriptor: ModuleDescriptor) {
abstract fun deserializeIrSymbol(idSig: IdSignature, symbolKind: BinarySymbolData.SymbolKind): IrSymbol
open fun declareIrSymbol(symbol: IrSymbol) {
assert(symbol.isPublicApi) { "Symbol is not public API: ${symbol.descriptor}" }
val signature = symbol.signature
require(signature != null) { "Symbol is not public API: ${symbol.descriptor}" }
assert(symbol.descriptor !is WrappedDeclarationDescriptor<*>)
deserializeIrSymbol(symbol.signature, symbol.kind())
deserializeIrSymbol(signature, symbol.kind())
}
open val klib: IrLibrary get() = error("Unsupported operation")
@@ -166,8 +167,9 @@ class IrModuleDeserializerWithBuiltIns(
}
override fun declareIrSymbol(symbol: IrSymbol) {
if (symbol.isPublicApi && checkIsFunctionInterface(symbol.signature))
resolveFunctionalInterface(symbol.signature, symbol.kind())
val signature = symbol.signature
if (signature != null && checkIsFunctionInterface(signature))
resolveFunctionalInterface(signature, symbol.kind())
else delegate.declareIrSymbol(symbol)
}