FIR2IR: remove redundant calls of preCacheBuiltinClassMembers
#KT-55421 Fixed
This commit is contained in:
committed by
Space Team
parent
189ef3425f
commit
8580461b5b
@@ -562,7 +562,6 @@ class Fir2IrClassifierStorage(
|
||||
for ((firTypeParameter, irTypeParameter) in mappedTypeParameters) {
|
||||
typeParameterCache[firTypeParameter] = irTypeParameter
|
||||
}
|
||||
declarationStorage.preCacheBuiltinClassMembers(firClass, irClass)
|
||||
return symbol
|
||||
}
|
||||
firClass as FirRegularClass
|
||||
|
||||
@@ -33,12 +33,15 @@ class Fir2IrTypeConverter(
|
||||
) : Fir2IrComponents by components {
|
||||
|
||||
internal val classIdToSymbolMap by lazy {
|
||||
// Note: this map must include all base classes, and they should be before derived classes!
|
||||
mapOf(
|
||||
StandardClassIds.Nothing to irBuiltIns.nothingClass,
|
||||
StandardClassIds.Any to irBuiltIns.anyClass,
|
||||
StandardClassIds.Unit to irBuiltIns.unitClass,
|
||||
StandardClassIds.Boolean to irBuiltIns.booleanClass,
|
||||
StandardClassIds.CharSequence to irBuiltIns.charSequenceClass,
|
||||
StandardClassIds.String to irBuiltIns.stringClass,
|
||||
StandardClassIds.Any to irBuiltIns.anyClass,
|
||||
StandardClassIds.Number to irBuiltIns.numberClass,
|
||||
StandardClassIds.Long to irBuiltIns.longClass,
|
||||
StandardClassIds.Int to irBuiltIns.intClass,
|
||||
StandardClassIds.Short to irBuiltIns.shortClass,
|
||||
|
||||
@@ -49,6 +49,7 @@ object StandardClassIds {
|
||||
val UInt = Int.unsignedId()
|
||||
val ULong = Long.unsignedId()
|
||||
|
||||
val CharSequence = "CharSequence".baseId()
|
||||
val String = "String".baseId()
|
||||
val Throwable = "Throwable".baseId()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user