From 9c9d2b5ad4ac27a0792d3cf4c62599fb3e09ebbb Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 14 May 2019 11:41:53 +0900 Subject: [PATCH] Minor: Rename constant to match its meaning --- .../codegen/coroutines/CoroutineTransformerMethodVisitor.kt | 4 ++-- .../kotlin/codegen/optimization/common/variableLiveness.kt | 4 ++-- .../kotlin/backend/jvm/lower/AddContinuationLowering.kt | 2 +- .../jetbrains/kotlin/asJava/classes/ultraLightParameters.kt | 4 ++-- .../kotlin/idea/debugger/stackFrame/KotlinStackFrame.kt | 4 ++-- .../kotlin/idea/debugger/evaluate/variables/VariableFinder.kt | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) 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 906eed85bf1..256d083260c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt @@ -47,7 +47,7 @@ private const val COROUTINES_METADATA_METHOD_NAME_JVM_NAME = "m" private const val COROUTINES_METADATA_CLASS_NAME_JVM_NAME = "c" private const val COROUTINES_METADATA_VERSION_JVM_NAME = "v" -const val SUSPEND_FUNCTION_CONTINUATION_PARAMETER = "\$completion" +const val SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME = "\$completion" const val SUSPEND_CALL_RESULT_NAME = "\$result" const val ILLEGAL_STATE_ERROR_MESSAGE = "call to 'resume' before 'invoke' with coroutine" @@ -219,7 +219,7 @@ class CoroutineTransformerMethodVisitor( } methodNode.localVariables.add( LocalVariableNode( - SUSPEND_FUNCTION_CONTINUATION_PARAMETER, + SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME, languageVersionSettings.continuationAsmType().descriptor, null, startLabel, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/variableLiveness.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/variableLiveness.kt index 292076ba75a..27ccd6862d1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/variableLiveness.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/variableLiveness.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.codegen.optimization.common -import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_CONTINUATION_PARAMETER +import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME import org.jetbrains.kotlin.codegen.optimization.transformer.MethodTransformer import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.org.objectweb.asm.Type @@ -98,4 +98,4 @@ private fun useVar( private fun String.isInvisibleDebuggerVariable(): Boolean = startsWith(JvmAbi.LOCAL_VARIABLE_NAME_PREFIX_INLINE_ARGUMENT) || startsWith(JvmAbi.LOCAL_VARIABLE_NAME_PREFIX_INLINE_FUNCTION) || - this == SUSPEND_FUNCTION_CONTINUATION_PARAMETER + this == SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt index 4871df64686..735acaa3edb 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AddContinuationLowering.kt @@ -281,7 +281,7 @@ private class AddContinuationLowering(private val context: JvmBackendContext) : } private fun IrFunction.addCompletionValueParameter(): IrValueParameter = - addValueParameter(SUSPEND_FUNCTION_CONTINUATION_PARAMETER, continuationType()) + addValueParameter(SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME, continuationType()) private fun IrFunction.continuationType(): IrSimpleType = continuation.createType(true, listOf(makeTypeProjection(returnType, Variance.INVARIANT))) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightParameters.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightParameters.kt index 54eb7b7c283..397b2733a04 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightParameters.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightParameters.kt @@ -15,8 +15,8 @@ import org.jetbrains.kotlin.asJava.elements.KtLightSimpleModifierList import org.jetbrains.kotlin.asJava.elements.LightParameter import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.isSuspendFunctionType +import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME import org.jetbrains.kotlin.types.KotlinType -import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_CONTINUATION_PARAMETER import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.load.kotlin.TypeMappingMode import org.jetbrains.kotlin.psi.* @@ -25,7 +25,7 @@ internal class KtUltraLightSuspendContinuationParameter( private val ktFunction: KtFunction, private val support: KtUltraLightSupport, method: KtLightMethod -) : LightParameter(SUSPEND_FUNCTION_CONTINUATION_PARAMETER, PsiType.NULL, method, method.language), +) : LightParameter(SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME, PsiType.NULL, method, method.language), KtUltraLightElementWithNullabilityAnnotation { override val kotlinTypeForNullabilityAnnotation: KotlinType? get() = ktType diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stackFrame/KotlinStackFrame.kt b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stackFrame/KotlinStackFrame.kt index e7c2e531d44..6243dade27e 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stackFrame/KotlinStackFrame.kt +++ b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stackFrame/KotlinStackFrame.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.AsmUtil.THIS import org.jetbrains.kotlin.codegen.DESTRUCTURED_LAMBDA_ARGUMENT_VARIABLE_PREFIX import org.jetbrains.kotlin.codegen.coroutines.CONTINUATION_VARIABLE_NAME -import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_CONTINUATION_PARAMETER +import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME import org.jetbrains.kotlin.codegen.inline.INLINE_FUN_VAR_SUFFIX import org.jetbrains.kotlin.codegen.inline.isFakeLocalVariableForInline import org.jetbrains.kotlin.idea.debugger.* @@ -278,7 +278,7 @@ class KotlinStackFrame(frame: StackFrameProxyImpl) : JavaStackFrame(StackFrameDe || name.startsWith(AsmUtil.LOCAL_FUNCTION_VARIABLE_PREFIX) || getInlineDepth(variable.name()) != inlineDepth || name == CONTINUATION_VARIABLE_NAME - || name == SUSPEND_FUNCTION_CONTINUATION_PARAMETER + || name == SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME } private fun LocalVariableProxyImpl.remapThisVariableIfNeeded(customName: String? = null): LocalVariableProxyImpl { diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/variables/VariableFinder.kt b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/variables/VariableFinder.kt index 08145228264..89434286133 100644 --- a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/variables/VariableFinder.kt +++ b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/variables/VariableFinder.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.AsmUtil.getCapturedFieldName import org.jetbrains.kotlin.codegen.AsmUtil.getLabeledThisName import org.jetbrains.kotlin.codegen.coroutines.CONTINUATION_VARIABLE_NAME -import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_CONTINUATION_PARAMETER +import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME import org.jetbrains.kotlin.codegen.inline.INLINE_FUN_VAR_SUFFIX import org.jetbrains.kotlin.codegen.inline.INLINE_TRANSFORMATION_SUFFIX import org.jetbrains.kotlin.idea.core.util.mergeAttachments @@ -372,7 +372,7 @@ class VariableFinder(val context: ExecutionContext) { } val continuationVariable = frameProxy.safeVisibleVariableByName(CONTINUATION_VARIABLE_NAME) - ?: frameProxy.safeVisibleVariableByName(SUSPEND_FUNCTION_CONTINUATION_PARAMETER) + ?: frameProxy.safeVisibleVariableByName(SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME) ?: return null val continuation = frameProxy.getValue(continuationVariable) as? ObjectReference ?: return null