From f09457c5699a1e2d18ce64b6cbaa37d0e5b17a79 Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Thu, 28 Mar 2019 21:57:29 +0300 Subject: [PATCH] Minor. Remove sourceFile from CoroutineTransformerMethodVisitor's parameters --- .../jetbrains/kotlin/codegen/coroutines/CoroutineCodegen.kt | 5 ++--- .../codegen/coroutines/CoroutineTransformerMethodVisitor.kt | 4 ++-- .../codegen/coroutines/SuspendFunctionGenerationStrategy.kt | 5 ++--- .../kotlin/codegen/inline/coroutines/CoroutineTransformer.kt | 4 +--- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineCodegen.kt index e6d7fc22527..802321f4d61 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineCodegen.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * that can be found in the license/LICENSE.txt file. */ @@ -461,8 +461,7 @@ class CoroutineCodegenForLambda private constructor( shouldPreserveClassInitialization = constructorCallNormalizationMode.shouldPreserveClassInitialization, containingClassInternalName = v.thisName, isForNamedFunction = false, - languageVersionSettings = languageVersionSettings, - sourceFile = element.containingFile.name + languageVersionSettings = languageVersionSettings ) } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt index 6f9c3087590..fa0766df5ed 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt @@ -60,7 +60,6 @@ class CoroutineTransformerMethodVisitor( private val isForNamedFunction: Boolean, private val shouldPreserveClassInitialization: Boolean, private val languageVersionSettings: LanguageVersionSettings, - private val sourceFile: String, // These two are needed to report diagnostics about suspension points inside critical section private val element: KtElement, private val diagnostics: DiagnosticSink, @@ -73,7 +72,8 @@ class CoroutineTransformerMethodVisitor( ) : TransformationMethodVisitor(delegate, access, name, desc, signature, exceptions) { private val classBuilderForCoroutineState: ClassBuilder by lazy(obtainClassBuilderForCoroutineState) - private val lineNumber = element?.let { CodegenUtil.getLineNumberForElement(it, false) } ?: 0 + private val lineNumber = CodegenUtil.getLineNumberForElement(element, false) ?: 0 + private val sourceFile = element.containingKtFile.name private var continuationIndex = if (isForNamedFunction) -1 else 0 private var dataIndex = if (isForNamedFunction) -1 else 1 diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/SuspendFunctionGenerationStrategy.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/SuspendFunctionGenerationStrategy.kt index d369b759585..5e94791058f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/SuspendFunctionGenerationStrategy.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/SuspendFunctionGenerationStrategy.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * that can be found in the license/LICENSE.txt file. */ @@ -70,8 +70,7 @@ open class SuspendFunctionGenerationStrategy( shouldPreserveClassInitialization = constructorCallNormalizationMode.shouldPreserveClassInitialization, needDispatchReceiver = originalSuspendDescriptor.dispatchReceiverParameter != null, internalNameForDispatchReceiver = containingClassInternalNameOrNull(), - languageVersionSettings = languageVersionSettings, - sourceFile = declaration.containingFile.name + languageVersionSettings = languageVersionSettings ) } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/coroutines/CoroutineTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/coroutines/CoroutineTransformer.kt index d57caaf9f72..c83a547e461 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/coroutines/CoroutineTransformer.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/coroutines/CoroutineTransformer.kt @@ -110,7 +110,6 @@ class CoroutineTransformer( shouldPreserveClassInitialization = state.constructorCallNormalizationMode.shouldPreserveClassInitialization, containingClassInternalName = classBuilder.thisName, isForNamedFunction = false, - sourceFile = element.containingKtFile.name, isCrossinlineLambda = inliningContext.isContinuation ) } @@ -138,8 +137,7 @@ class CoroutineTransformer( containingClassInternalName = classBuilder.thisName, isForNamedFunction = true, needDispatchReceiver = true, - internalNameForDispatchReceiver = classBuilder.thisName, - sourceFile = element.containingKtFile.name + internalNameForDispatchReceiver = classBuilder.thisName ) } }