From 44506413215e27f37dc7964091d216d2ba96a8da Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Tue, 2 Apr 2019 14:39:52 +0200 Subject: [PATCH] Merge inlineCodegenUtils2.kt into inlineCodegenUtils.kt --- .../kotlin/codegen/ClosureCodegen.java | 2 +- .../codegen/ImplementationBodyCodegen.java | 2 +- .../codegen/inline/inlineCodegenUtils.kt | 17 ++++++++ .../codegen/inline/inlineCodegenUtils2.kt | 39 ------------------- 4 files changed, 19 insertions(+), 41 deletions(-) delete mode 100644 compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils2.kt diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index 4869b1c1907..08893f3ab01 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -52,7 +52,7 @@ import java.util.List; import static org.jetbrains.kotlin.codegen.AsmUtil.*; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isConst; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.CLOSURE; -import static org.jetbrains.kotlin.codegen.inline.InlineCodegenUtils2Kt.initDefaultSourceMappingIfNeeded; +import static org.jetbrains.kotlin.codegen.inline.InlineCodegenUtilsKt.initDefaultSourceMappingIfNeeded; import static org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings.METHOD_FOR_FUNCTION; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index f74650e3137..46d62206b4d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -68,7 +68,7 @@ import static org.jetbrains.kotlin.codegen.CodegenUtilKt.isNonGenericToArray; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.*; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.enumEntryNeedSubclass; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.getDelegatedLocalVariableMetadata; -import static org.jetbrains.kotlin.codegen.inline.InlineCodegenUtils2Kt.initDefaultSourceMappingIfNeeded; +import static org.jetbrains.kotlin.codegen.inline.InlineCodegenUtilsKt.initDefaultSourceMappingIfNeeded; import static org.jetbrains.kotlin.load.java.JvmAbi.*; import static org.jetbrains.kotlin.resolve.BindingContext.INDEXED_LVALUE_GET; import static org.jetbrains.kotlin.resolve.BindingContext.INDEXED_LVALUE_SET; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils.kt index fccf3d71787..07da7f8e1b5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.codegen.ASSERTIONS_DISABLED_FIELD_NAME import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.BaseExpressionCodegen +import org.jetbrains.kotlin.codegen.MemberCodegen import org.jetbrains.kotlin.codegen.SamWrapperCodegen.SAM_WRAPPER_SUFFIX import org.jetbrains.kotlin.codegen.`when`.WhenByEnumsMapping import org.jetbrains.kotlin.codegen.binding.CodegenBinding @@ -532,3 +533,19 @@ class InlineOnlySmapSkipper(codegen: BaseExpressionCodegen) { } } } + +fun initDefaultSourceMappingIfNeeded( + context: CodegenContext<*>, codegen: MemberCodegen<*>, state: GenerationState +) { + if (state.isInlineDisabled) return + + var parentContext: CodegenContext<*>? = context.parentContext + while (parentContext != null) { + if (parentContext.isInlineMethodContext) { + //just init default one to one mapping + codegen.orCreateSourceMapper + break + } + parentContext = parentContext.parentContext + } +} diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils2.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils2.kt deleted file mode 100644 index f89a8d7fbdd..00000000000 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils2.kt +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.codegen.inline - -import org.jetbrains.kotlin.codegen.MemberCodegen -import org.jetbrains.kotlin.codegen.context.CodegenContext -import org.jetbrains.kotlin.codegen.state.GenerationState - -//This method was moved to separate class cause of LightClass generation problem: KT-18419 -//Move it back to inlineCodegenUtil after fix -fun initDefaultSourceMappingIfNeeded( - context: CodegenContext<*>, codegen: MemberCodegen<*>, state: GenerationState -) { - if (state.isInlineDisabled) return - - var parentContext: CodegenContext<*>? = context.parentContext - while (parentContext != null) { - if (parentContext.isInlineMethodContext) { - //just init default one to one mapping - codegen.orCreateSourceMapper - break - } - parentContext = parentContext.parentContext - } -}