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

Minor. Remove sourceFile from CoroutineTransformerMethodVisitor's parameters

Browse Source
This commit is contained in:
Ilmir Usmanov
2019-03-28 21:57:29 +03:00
parent 2c9ed73ba8
commit f09457c569
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineCodegen.kt
+2 -3
View File
@@ -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. * that can be found in the license/LICENSE.txt file.
*/ */
@@ -461,8 +461,7 @@ class CoroutineCodegenForLambda private constructor(
shouldPreserveClassInitialization = constructorCallNormalizationMode.shouldPreserveClassInitialization, shouldPreserveClassInitialization = constructorCallNormalizationMode.shouldPreserveClassInitialization,
containingClassInternalName = v.thisName, containingClassInternalName = v.thisName,
isForNamedFunction = false, isForNamedFunction = false,
languageVersionSettings = languageVersionSettings, languageVersionSettings = languageVersionSettings
sourceFile = element.containingFile.name
) )
} }
compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt
+2 -2
View File
@@ -60,7 +60,6 @@ class CoroutineTransformerMethodVisitor(
private val isForNamedFunction: Boolean, private val isForNamedFunction: Boolean,
private val shouldPreserveClassInitialization: Boolean, private val shouldPreserveClassInitialization: Boolean,
private val languageVersionSettings: LanguageVersionSettings, private val languageVersionSettings: LanguageVersionSettings,
private val sourceFile: String,
// These two are needed to report diagnostics about suspension points inside critical section // These two are needed to report diagnostics about suspension points inside critical section
private val element: KtElement, private val element: KtElement,
private val diagnostics: DiagnosticSink, private val diagnostics: DiagnosticSink,
@@ -73,7 +72,8 @@ class CoroutineTransformerMethodVisitor(
) : TransformationMethodVisitor(delegate, access, name, desc, signature, exceptions) { ) : TransformationMethodVisitor(delegate, access, name, desc, signature, exceptions) {
private val classBuilderForCoroutineState: ClassBuilder by lazy(obtainClassBuilderForCoroutineState) 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 continuationIndex = if (isForNamedFunction) -1 else 0
private var dataIndex = if (isForNamedFunction) -1 else 1 private var dataIndex = if (isForNamedFunction) -1 else 1
compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/SuspendFunctionGenerationStrategy.kt
+2 -3
View File
@@ -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. * that can be found in the license/LICENSE.txt file.
*/ */
@@ -70,8 +70,7 @@ open class SuspendFunctionGenerationStrategy(
shouldPreserveClassInitialization = constructorCallNormalizationMode.shouldPreserveClassInitialization, shouldPreserveClassInitialization = constructorCallNormalizationMode.shouldPreserveClassInitialization,
needDispatchReceiver = originalSuspendDescriptor.dispatchReceiverParameter != null, needDispatchReceiver = originalSuspendDescriptor.dispatchReceiverParameter != null,
internalNameForDispatchReceiver = containingClassInternalNameOrNull(), internalNameForDispatchReceiver = containingClassInternalNameOrNull(),
languageVersionSettings = languageVersionSettings, languageVersionSettings = languageVersionSettings
sourceFile = declaration.containingFile.name
) )
} }
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/coroutines/CoroutineTransformer.kt
+1 -3
View File
@@ -110,7 +110,6 @@ class CoroutineTransformer(
shouldPreserveClassInitialization = state.constructorCallNormalizationMode.shouldPreserveClassInitialization, shouldPreserveClassInitialization = state.constructorCallNormalizationMode.shouldPreserveClassInitialization,
containingClassInternalName = classBuilder.thisName, containingClassInternalName = classBuilder.thisName,
isForNamedFunction = false, isForNamedFunction = false,
sourceFile = element.containingKtFile.name,
isCrossinlineLambda = inliningContext.isContinuation isCrossinlineLambda = inliningContext.isContinuation
) )
} }
@@ -138,8 +137,7 @@ class CoroutineTransformer(
containingClassInternalName = classBuilder.thisName, containingClassInternalName = classBuilder.thisName,
isForNamedFunction = true, isForNamedFunction = true,
needDispatchReceiver = true, needDispatchReceiver = true,
internalNameForDispatchReceiver = classBuilder.thisName, internalNameForDispatchReceiver = classBuilder.thisName
sourceFile = element.containingKtFile.name
) )
} }
} }