From c8047f838492cf0b388fe668e92cf9607bb6fc92 Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Thu, 23 Sep 2021 23:30:22 -0700 Subject: [PATCH] Unify and use names of synthetic members of data class --- .../kotlin/fir/analysis/checkers/FirHelpers.kt | 5 +---- .../FirMethodOfAnyImplementedInInterfaceChecker.kt | 2 +- .../backend/generators/DataClassMembersGenerator.kt | 6 +++--- .../src/org/jetbrains/kotlin/fir/DefaultNames.kt | 12 ------------ .../org/jetbrains/kotlin/builtins/StandardNames.kt | 4 ++++ 5 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 compiler/fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt index 1123cf5e7ad..afdaff1d4ee 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.fir.analysis.checkers +import org.jetbrains.kotlin.builtins.StandardNames.HASHCODE_NAME import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext @@ -32,12 +32,9 @@ import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.SymbolInternals import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.types.* -import org.jetbrains.kotlin.lexer.KtModifierKeywordToken import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.* -import org.jetbrains.kotlin.psi.KtModifierList import org.jetbrains.kotlin.psi.KtParameter.VAL_VAR_TOKEN_SET -import org.jetbrains.kotlin.psi.psiUtil.visibilityModifierType import org.jetbrains.kotlin.resolve.AnnotationTargetList import org.jetbrains.kotlin.resolve.AnnotationTargetLists import org.jetbrains.kotlin.types.AbstractTypeChecker diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMethodOfAnyImplementedInInterfaceChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMethodOfAnyImplementedInInterfaceChecker.kt index fa21aaf3ebd..327fdf0704b 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMethodOfAnyImplementedInInterfaceChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMethodOfAnyImplementedInInterfaceChecker.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration -import org.jetbrains.kotlin.fir.HASHCODE_NAME +import org.jetbrains.kotlin.builtins.StandardNames.HASHCODE_NAME import org.jetbrains.kotlin.fir.analysis.checkers.FirDeclarationPresenter import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt index f06f206c95b..5f0b481d36f 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.fir.backend.generators +import org.jetbrains.kotlin.builtins.StandardNames.DATA_CLASS_COPY +import org.jetbrains.kotlin.builtins.StandardNames.HASHCODE_NAME import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.fir.COPY_NAME -import org.jetbrains.kotlin.fir.HASHCODE_NAME import org.jetbrains.kotlin.fir.backend.Fir2IrComponents import org.jetbrains.kotlin.fir.backend.FirMetadataSource import org.jetbrains.kotlin.fir.backend.declareThisReceiverParameter @@ -330,7 +330,7 @@ class DataClassMembersGenerator(val components: Fir2IrComponents) { companion object { fun isCopy(irFunction: IrFunction): Boolean = - irFunction.name == COPY_NAME + irFunction.name == DATA_CLASS_COPY fun isComponentN(irFunction: IrFunction): Boolean { if (irFunction.name.isSpecial) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt deleted file mode 100644 index 9e0ac248fa2..00000000000 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.fir - -import org.jetbrains.kotlin.name.Name - -// Data class synthetic members -val COPY_NAME = Name.identifier("copy") -val HASHCODE_NAME = Name.identifier("hashCode") diff --git a/core/compiler.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt b/core/compiler.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt index c9aea5b3e0d..03717df8f1e 100644 --- a/core/compiler.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt +++ b/core/compiler.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt @@ -24,6 +24,10 @@ object StandardNames { @JvmField val ENUM_VALUE_OF = Name.identifier("valueOf") + @JvmField val DATA_CLASS_COPY = Name.identifier("copy") + + @JvmField val HASHCODE_NAME = Name.identifier("hashCode") + @JvmField val CHAR_CODE = Name.identifier("code") @JvmField val COROUTINES_PACKAGE_FQ_NAME = FqName("kotlin.coroutines")