diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/OuterThisInInlineFunctionsSpecialAccessorLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/OuterThisInInlineFunctionsSpecialAccessorLowering.kt index 0a8d0dd6dc7f0..336a5e65f4bbe 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/OuterThisInInlineFunctionsSpecialAccessorLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/OuterThisInInlineFunctionsSpecialAccessorLowering.kt @@ -42,7 +42,7 @@ class OuterThisInInlineFunctionsSpecialAccessorLowering(context: LoweringContext * - To work around this we shall generate public "outer this" accessors if [SyntheticAccessorLowering] * is not enabled. */ - private val generatePublicAccessors: Boolean = context.configuration.getBoolean(KlibConfigurationKeys.NO_DOUBLE_INLINING) + private val generatePublicAccessors: Boolean = false private val accessorGenerator = KlibSyntheticAccessorGenerator(context) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt index b9e3c9567b6c7..cc8924e01d4b6 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt @@ -761,20 +761,20 @@ fun getJsLowerings( sharedVariablesLoweringPhase, outerThisSpecialAccessorInInlineFunctionsPhase, localClassesInInlineLambdasPhase, - localClassesInInlineFunctionsPhase.takeIf { configuration.getBoolean(KlibConfigurationKeys.NO_DOUBLE_INLINING) }, - localClassesExtractionFromInlineFunctionsPhase.takeIf { configuration.getBoolean(KlibConfigurationKeys.NO_DOUBLE_INLINING) }, + localClassesInInlineFunctionsPhase.takeIf { false }, + localClassesExtractionFromInlineFunctionsPhase.takeIf { false }, inlineCallableReferenceToLambdaPhase, arrayConstructorPhase, - legacySyntheticAccessorLoweringPhase.takeIf { configuration.getBoolean(KlibConfigurationKeys.NO_DOUBLE_INLINING) }, + legacySyntheticAccessorLoweringPhase.takeIf { false }, wrapInlineDeclarationsWithReifiedTypeParametersLowering, - inlineOnlyPrivateFunctionsPhase.takeUnless { configuration.getBoolean(KlibConfigurationKeys.NO_DOUBLE_INLINING) }, - syntheticAccessorGenerationPhase.takeUnless { configuration.getBoolean(KlibConfigurationKeys.NO_DOUBLE_INLINING) }, + inlineOnlyPrivateFunctionsPhase.takeUnless { false }, + syntheticAccessorGenerationPhase.takeUnless { false }, // Note: The validation goes after both `inlineOnlyPrivateFunctionsPhase` and `syntheticAccessorGenerationPhase` // just because it goes so in Native. - validateIrAfterInliningOnlyPrivateFunctions.takeUnless { configuration.getBoolean(KlibConfigurationKeys.NO_DOUBLE_INLINING) }, + validateIrAfterInliningOnlyPrivateFunctions.takeUnless { false }, inlineAllFunctionsPhase, dumpSyntheticAccessorsPhase.takeIf { - !configuration.getBoolean(KlibConfigurationKeys.NO_DOUBLE_INLINING) && + !false && configuration[KlibConfigurationKeys.SYNTHETIC_ACCESSORS_DUMP_DIR] != null }, validateIrAfterInliningAllFunctions, diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/NativeLoweringPhases.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/NativeLoweringPhases.kt index 8e2e208b666e0..57c223b40e93b 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/NativeLoweringPhases.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/NativeLoweringPhases.kt @@ -177,7 +177,7 @@ private val outerThisSpecialAccessorInInlineFunctionsPhase = createFileLoweringP private val extractLocalClassesFromInlineBodies = createFileLoweringPhase( { context, irFile -> LocalClassesInInlineLambdasLowering(context).lower(irFile) - if (!context.config.produce.isCache && context.config.configuration.getBoolean(KlibConfigurationKeys.NO_DOUBLE_INLINING)) { + if (!context.config.produce.isCache && false) { LocalClassesInInlineFunctionsLowering(context).lower(irFile) LocalClassesExtractionFromInlineFunctionsLowering(context).lower(irFile) } @@ -561,8 +561,8 @@ internal fun KonanConfig.getLoweringsUpToAndIncludingSyntheticAccessors(): Lower outerThisSpecialAccessorInInlineFunctionsPhase, extractLocalClassesFromInlineBodies, arrayConstructorPhase, - inlineOnlyPrivateFunctionsPhase.takeUnless { this.configuration.getBoolean(KlibConfigurationKeys.NO_DOUBLE_INLINING) }, - syntheticAccessorGenerationPhase.takeUnless { this.configuration.getBoolean(KlibConfigurationKeys.NO_DOUBLE_INLINING) }, + inlineOnlyPrivateFunctionsPhase.takeUnless { false }, + syntheticAccessorGenerationPhase.takeUnless { false }, ) internal fun KonanConfig.getLoweringsAfterInlining(): LoweringList = listOfNotNull( diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/TopLevelPhases.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/TopLevelPhases.kt index 0bff1da2f0223..fec36be3c6c74 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/TopLevelPhases.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/TopLevelPhases.kt @@ -159,7 +159,7 @@ internal fun PhaseEngine.runBackend(backendContext: Contex // To avoid overcomplicating things and to keep running the preceding lowerings with "modify-only-lowered-file" // invariant, we would like to put a synchronization point immediately before "InlineAllFunctions". fragmentWithState.forEach { (fragment, state) -> state.runSpecifiedLowerings(fragment, state.context.config.getLoweringsUpToAndIncludingSyntheticAccessors()) } - if (!context.config.configuration.getBoolean(KlibConfigurationKeys.NO_DOUBLE_INLINING)) { + if (!false) { fragmentWithState.forEach { (fragment, state) -> state.runSpecifiedLowerings(fragment, validateIrAfterInliningOnlyPrivateFunctions) } } fragmentWithState.forEach { (fragment, state) -> state.runSpecifiedLowerings(fragment, listOf(inlineAllFunctionsPhase)) } diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt index c6be624e1955b..2322de0b03e12 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt @@ -39,7 +39,7 @@ internal class NativeInlineFunctionResolver( private fun lower(function: IrFunction) { val body = function.body ?: return - val doubleInliningEnabled = !context.config.configuration.getBoolean(KlibConfigurationKeys.NO_DOUBLE_INLINING) + val doubleInliningEnabled = !false UpgradeCallableReferences(context).lower(function)