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

Moved all things related to fake overrides to a single directory

Browse Source
This commit is contained in:
Alexander Gorshenev
2020-05-30 00:00:50 +03:00
parent 06abbe468b
commit 46e3649bd0
12 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/DeepCopyIrTreeWithSymbolsForFakeOverrides.kt → compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/DeepCopyIrTreeWithSymbolsForFakeOverrides.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.kotlin.backend.common.serialization
package org.jetbrains.kotlin.backend.common.overrides
import org.jetbrains.kotlin.backend.common.DescriptorsToIrRemapper
import org.jetbrains.kotlin.backend.common.WrappedDescriptorPatcher
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/FakeOverrideChecker.kt → compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrideChecker.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.kotlin.backend.common.override
package org.jetbrains.kotlin.backend.common.overrides
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.descriptors.ClassKind
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/FakeOverrideCopier.kt → compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrideCopier.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.kotlin.backend.common.serialization
package org.jetbrains.kotlin.backend.common.overrides
import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
import org.jetbrains.kotlin.ir.declarations.IrFunction
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/FakeOverrides.kt → compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrides.kt
+5 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.kotlin.backend.common.serialization
package org.jetbrains.kotlin.backend.common.overrides
import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureSerializer
import org.jetbrains.kotlin.ir.IrElement
@@ -37,6 +37,10 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
import org.jetbrains.kotlin.ir.visitors.acceptVoid
interface FakeOverrideBuilder {
fun buildFakeOverridesForClass(clazz: IrClass)
}
interface PlatformFakeOverrideClassFilter {
fun constructFakeOverrides(clazz: IrClass): Boolean = true
}
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrOverridingUtil.kt → compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrOverridingUtil.kt
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.kotlin.backend.common.serialization
package org.jetbrains.kotlin.backend.common.overrides
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.descriptors.Modality
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrTypeCheckerUtils.kt → compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrTypeCheckerUtils.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.kotlin.backend.common.serialization
package org.jetbrains.kotlin.backend.common.overrides
import org.jetbrains.kotlin.ir.declarations.IrTypeParameter
import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrVisibilityUtil.kt → compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/IrVisibilityUtil.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.kotlin.backend.common.serialization
package org.jetbrains.kotlin.backend.common.overrides
import org.jetbrains.kotlin.backend.common.lower.parents
import org.jetbrains.kotlin.descriptors.Visibilities
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
+1
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.backend.common.serialization
import org.jetbrains.kotlin.backend.common.LoggingContext
import org.jetbrains.kotlin.backend.common.ir.ir2string
import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideControl
import org.jetbrains.kotlin.backend.common.serialization.encodings.*
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.ir.IrElement
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt
+3 -5
View File
@@ -7,6 +7,8 @@ package org.jetbrains.kotlin.backend.common.serialization
import org.jetbrains.kotlin.backend.common.LoggingContext
import org.jetbrains.kotlin.backend.common.ir.isExpect
import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideBuilderImpl
import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideControl
import org.jetbrains.kotlin.backend.common.serialization.encodings.BinarySymbolData
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.impl.EmptyPackageFragmentDescriptor
@@ -662,8 +664,4 @@ enum class DeserializationStrategy(
EXPLICITLY_EXPORTED(true, true, false, true),
ONLY_DECLARATION_HEADERS(false, false, false, false),
WITH_INLINE_BODIES(false, false, false, true)
}
interface FakeOverrideBuilder {
fun buildFakeOverridesForClass(clazz: IrClass)
}
}
compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt
+1 -1
View File
@@ -14,8 +14,8 @@ import org.jetbrains.kotlin.backend.common.LoggingContext
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContextImpl
import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideChecker
import org.jetbrains.kotlin.backend.common.serialization.DeserializationStrategy
import org.jetbrains.kotlin.backend.common.serialization.FakeOverrideChecker
import org.jetbrains.kotlin.backend.common.serialization.KlibIrVersion
import org.jetbrains.kotlin.backend.common.serialization.knownBuiltins
import org.jetbrains.kotlin.backend.common.serialization.mangle.ManglerChecker
compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt
+1
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir
import org.jetbrains.kotlin.backend.common.LoggingContext
import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideBuilderImpl
import org.jetbrains.kotlin.backend.common.serialization.*
import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureSerializer
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/ir/backend/jvm/serialization/JvmIrLinker.kt
+1
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.ir.backend.jvm.serialization
import org.jetbrains.kotlin.backend.common.LoggingContext
import org.jetbrains.kotlin.backend.common.overrides.FakeOverrideBuilderImpl
import org.jetbrains.kotlin.backend.common.serialization.*
import org.jetbrains.kotlin.backend.common.serialization.encodings.BinarySymbolData
import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureSerializer