From a90ac2438d2a2242f396acb48a0b70965dc72ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven=20Sch=C3=A4fer?= Date: Wed, 7 Aug 2019 16:35:34 +0200 Subject: [PATCH] Set correct field visibility in psi2ir --- .../backend/jvm/JvmGeneratorExtensions.kt | 13 ++- .../jvm/lower/JvmInlineClassLowering.kt | 5 +- .../psi2ir/generators/GeneratorExtensions.kt | 6 +- .../psi2ir/generators/PropertyGenerator.kt | 17 +++- .../ir/declarations/impl/IrFieldImpl.kt | 5 +- .../ir/declarations/lazy/IrLazyField.kt | 1 - .../jetbrains/kotlin/ir/util/SymbolTable.kt | 3 +- .../ir/backend/js/JsGeneratorExtensions.kt | 25 ++++++ .../jetbrains/kotlin/ir/backend/js/klib.kt | 5 +- .../dynamic/implicitCastFromDynamic.txt | 8 +- .../dynamic/implicitCastToDynamic.txt | 14 ++-- .../ir/irText/classes/annotationClasses.txt | 16 ++-- ...tReorderingInDelegatingConstructorCall.txt | 20 +---- .../ir/irText/classes/classMembers.txt | 14 ++-- .../classes/dataClassWithArrayMembers.txt | 44 +++++----- .../ir/irText/classes/dataClasses.txt | 32 ++++---- .../ir/irText/classes/dataClassesGeneric.txt | 16 ++-- .../classes/delegatedImplementation.txt | 10 +-- ...gConstructorCallToTypeAliasConstructor.txt | 4 +- compiler/testData/ir/irText/classes/enum.txt | 24 +++--- .../ir/irText/classes/enumClassModality.txt | 4 +- .../irText/classes/enumWithSecondaryCtor.txt | 18 ++--- .../testData/ir/irText/classes/initBlock.txt | 4 +- .../testData/ir/irText/classes/initVal.txt | 14 ++-- .../testData/ir/irText/classes/initVar.txt | 36 ++++----- .../ir/irText/classes/inlineClass.txt | 4 +- .../innerClassWithDelegatingConstructor.txt | 4 +- .../lambdaInDataClassDefaultParameter.txt | 8 +- .../classes/objectLiteralExpressions.txt | 8 +- .../irText/classes/objectWithInitializers.txt | 10 +-- .../ir/irText/classes/primaryConstructor.txt | 26 +++--- ...aryConstructorWithSuperConstructorCall.txt | 8 +- .../ir/irText/classes/sealedClasses.txt | 12 +-- ...nstructorWithInitializersFromClassBody.txt | 10 +-- .../testData/ir/irText/classes/superCalls.txt | 4 +- .../annotationsInAnnotationArguments.txt | 12 +-- .../annotationsWithDefaultParameterValues.txt | 8 +- .../annotationsWithVarargParameters.txt | 4 +- .../arrayInAnnotationArguments.txt | 8 +- .../annotations/classLiteralInAnnotation.txt | 4 +- .../annotations/classesWithAnnotations.txt | 4 +- .../constExpressionsInAnnotationArguments.txt | 4 +- .../constructorsWithAnnotations.txt | 4 +- ...egatedPropertyAccessorsWithAnnotations.txt | 10 +-- .../enumEntriesWithAnnotations.txt | 8 +- .../enumsInAnnotationArguments.txt | 4 +- .../annotations/fieldsWithAnnotations.txt | 14 ++-- .../annotations/fileAnnotations.txt | 4 +- .../annotations/functionsWithAnnotations.txt | 4 +- ...ocalDelegatedPropertiesWithAnnotations.txt | 4 +- ...aryConstructorParameterWithAnnotations.txt | 4 +- .../annotations/propertiesWithAnnotations.txt | 8 +- ...ccessorsFromClassHeaderWithAnnotations.txt | 14 ++-- .../propertyAccessorsWithAnnotations.txt | 14 ++-- ...propertySetterParameterWithAnnotations.txt | 12 +-- .../spreadOperatorInAnnotationArguments.txt | 4 +- .../typeAliasesWithAnnotations.txt | 4 +- .../valueParametersWithAnnotations.txt | 8 +- .../varargsInAnnotationArguments.txt | 12 +-- .../annotations/variablesWithAnnotations.txt | 4 +- .../catchParameterInTopLevelProperty.txt | 4 +- .../declarations/classLevelProperties.txt | 26 +++--- .../declarations/delegatedProperties.txt | 4 +- .../ir/irText/declarations/fakeOverrides.txt | 4 +- .../declarations/fileWithAnnotations.fir.txt | 14 ++++ .../declarations/fileWithAnnotations.kt | 1 - .../declarations/fileWithAnnotations.txt | 4 +- .../ir/irText/declarations/kt29833.txt | 4 +- .../declarations/localClassWithOverrides.txt | 10 +-- .../declarations/packageLevelProperties.txt | 26 +++--- .../declarations/parameters/constructor.txt | 28 +++---- .../parameters/dataClassMembers.txt | 8 +- .../parameters/defaultPropertyAccessors.txt | 30 +++---- .../declarations/parameters/lambdas.txt | 16 ++-- .../primaryCtorDefaultArguments.fir.txt | 34 ++++++++ .../primaryCtorDefaultArguments.kt | 2 - .../primaryCtorDefaultArguments.txt | 4 +- .../primaryCtorProperties.fir.txt | 52 ++++++++++++ .../declarations/primaryCtorProperties.kt | 2 - .../declarations/primaryCtorProperties.txt | 10 +-- .../provideDelegate/differentReceivers.txt | 8 +- .../declarations/provideDelegate/local.txt | 8 +- .../localDifferentReceivers.txt | 4 +- .../declarations/provideDelegate/member.txt | 8 +- .../provideDelegate/memberExtension.txt | 8 +- .../declarations/provideDelegate/topLevel.txt | 8 +- .../ir/irText/errors/unresolvedReference.txt | 16 ++-- .../ir/irText/expressions/arrayAccess.txt | 4 +- .../expressions/arrayAugmentedAssignment1.txt | 4 +- .../ir/irText/expressions/assignments.txt | 6 +- .../expressions/augmentedAssignment1.txt | 6 +- .../expressions/augmentedAssignment2.txt | 4 +- .../expressions/boundCallableReferences.txt | 16 ++-- .../callableRefToGenericMember.txt | 12 +-- .../callableReferenceToImportedFromObject.txt | 20 ++--- .../callableReferenceTypeArguments.txt | 12 +-- .../ir/irText/expressions/coercionToUnit.txt | 4 +- .../complexAugmentedAssignment.txt | 24 +++--- .../irText/expressions/contructorCall.fir.txt | 29 +++++++ .../ir/irText/expressions/contructorCall.kt | 2 - .../ir/irText/expressions/contructorCall.txt | 4 +- .../testData/ir/irText/expressions/elvis.txt | 4 +- .../expressions/enumEntryAsReceiver.txt | 8 +- .../enumEntryReferenceFromEnumEntryClass.txt | 14 ++-- .../testData/ir/irText/expressions/field.txt | 14 ++-- .../expressions/forWithImplicitReceivers.txt | 6 +- ...enericConstructorCallWithTypeArguments.txt | 4 +- .../expressions/genericPropertyCall.txt | 4 +- .../irText/expressions/genericPropertyRef.txt | 32 ++++---- .../irText/expressions/incrementDecrement.txt | 10 +-- .../expressions/jvmStaticFieldReference.txt | 4 +- .../ir/irText/expressions/kt16904.txt | 16 ++-- .../ir/irText/expressions/kt28006.txt | 8 +- .../ir/irText/expressions/literals.txt | 68 ++++++++-------- .../expressions/memberTypeArguments.txt | 4 +- .../expressions/membersImportedFromObject.txt | 20 ++--- .../expressions/multipleThisReferences.txt | 15 ++-- .../irText/expressions/objectAsCallable.txt | 8 +- .../ir/irText/expressions/objectReference.txt | 14 ++-- ...ferenceInClosureInSuperConstructorCall.txt | 7 +- .../primitivesImplicitConversions.txt | 28 +++---- .../irText/expressions/propertyReferences.txt | 80 +++++++++---------- .../ir/irText/expressions/references.txt | 8 +- .../irText/expressions/reflectionLiterals.txt | 28 +++---- .../ir/irText/expressions/safeAssignment.txt | 6 +- .../ir/irText/expressions/safeCalls.txt | 6 +- ...mConversionInGenericConstructorCall_NI.txt | 8 +- .../signedToUnsignedConversions_test.txt | 4 +- .../specializedTypeAliasConstructorCall.txt | 4 +- .../ir/irText/expressions/stringTemplates.txt | 40 +++++----- .../temporaryInEnumEntryInitializer.txt | 8 +- .../expressions/temporaryInInitBlock.txt | 6 +- .../expressions/thisOfGenericOuterClass.txt | 12 +-- .../expressions/unsignedIntegerLiterals.txt | 40 +++++----- .../irText/expressions/useImportedMember.txt | 6 +- .../testData/ir/irText/expressions/values.txt | 4 +- .../testData/ir/irText/expressions/vararg.txt | 12 +-- .../ir/irText/lambdas/anonymousFunction.txt | 4 +- .../irText/lambdas/destructuringInLambda.txt | 14 ++-- .../testData/ir/irText/lambdas/justLambda.txt | 8 +- .../irText/regressions/integerCoercionToT.txt | 4 +- .../typeAliasCtorForGenericClass.txt | 4 +- .../ir/irText/stubs/constFromBuiltins.txt | 4 +- .../genericClassInDifferentModule_m1.txt | 4 +- .../genericClassInDifferentModule_m2.txt | 6 +- .../testData/ir/irText/stubs/javaEnum.txt | 4 +- .../ir/irText/stubs/javaInnerClass.txt | 4 +- .../stubs/javaSyntheticProperty.fir.txt | 11 +++ .../ir/irText/stubs/javaSyntheticProperty.kt | 1 - .../ir/irText/stubs/javaSyntheticProperty.txt | 4 +- compiler/testData/ir/irText/stubs/simple.txt | 4 +- .../types/genericPropertyReferenceType.txt | 6 +- .../smartCastOnReceiverOfGenericType.txt | 6 +- .../testData/ir/sourceRanges/comments.txt | 4 +- .../declarations/classProperties.txt | 48 +++++------ .../ir/sourceRanges/declarations/kt29862.txt | 12 +-- .../declarations/primaryConstructors.txt | 16 ++-- .../synthesizedDataClassMembers.txt | 12 +-- .../declarations/topLevelProperties.txt | 48 +++++------ .../writeFlags/lateinit/lateinitProperty.kt | 1 - .../property/classObject/class/internalVar.kt | 1 - .../class/internalVarPrivateSet.kt | 1 - .../class/protectedVarPrivateSet.kt | 1 - .../classObject/class/publicValNonDefault.kt | 1 - .../property/classObject/class/publicVar.kt | 1 - .../classObject/class/publicVarNonDefault.kt | 1 - .../classObject/class/publicVarPrivateSet.kt | 1 - .../class/publicVarProtectedSet.kt | 1 - .../classObject/class/publicVarPublicSet.kt | 1 - .../rename/constructorAndClassObject.kt | 1 - .../rename/delegatedAndProperty.kt | 1 - .../classObject/rename/propertyAndProperty.kt | 1 - .../property/classObject/trait/internalVal.kt | 1 - .../property/classObject/trait/internalVar.kt | 1 - .../trait/internalVarPrivateSet.kt | 1 - .../classObject/trait/protectedVal.kt | 1 - .../trait/protectedVarPrivateSet.kt | 1 - .../property/classObject/trait/publicVal.kt | 1 - .../classObject/trait/publicValNonDefault.kt | 1 - .../property/classObject/trait/publicVar.kt | 1 - .../classObject/trait/publicVarNonDefault.kt | 1 - .../classObject/trait/publicVarPrivateSet.kt | 1 - .../trait/publicVarProtectedSet.kt | 1 - .../classObject/trait/publicVarPublicSet.kt | 1 - .../withGetterJvmName.kt | 1 - .../kotlin/ir/AbstractIrGeneratorTestCase.kt | 3 +- 186 files changed, 1030 insertions(+), 909 deletions(-) create mode 100644 compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/JsGeneratorExtensions.kt create mode 100644 compiler/testData/ir/irText/declarations/fileWithAnnotations.fir.txt create mode 100644 compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.fir.txt create mode 100644 compiler/testData/ir/irText/declarations/primaryCtorProperties.fir.txt create mode 100644 compiler/testData/ir/irText/expressions/contructorCall.fir.txt create mode 100644 compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmGeneratorExtensions.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmGeneratorExtensions.kt index abf80eef031..2363e277144 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmGeneratorExtensions.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmGeneratorExtensions.kt @@ -7,6 +7,8 @@ package org.jetbrains.kotlin.backend.jvm import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor @@ -14,8 +16,11 @@ import org.jetbrains.kotlin.load.java.sam.SamAdapterDescriptor import org.jetbrains.kotlin.load.java.sam.SamConstructorDescriptor import org.jetbrains.kotlin.load.java.sam.SingleAbstractMethodUtils import org.jetbrains.kotlin.psi2ir.generators.GeneratorExtensions +import org.jetbrains.kotlin.resolve.jvm.annotations.hasJvmFieldAnnotation import org.jetbrains.kotlin.synthetic.SamAdapterExtensionFunctionDescriptor -import org.jetbrains.kotlin.types.* +import org.jetbrains.kotlin.types.KotlinType +import org.jetbrains.kotlin.types.TypeSubstitutor +import org.jetbrains.kotlin.types.Variance object JvmGeneratorExtensions : GeneratorExtensions() { override val externalDeclarationOrigin: ((DeclarationDescriptor) -> IrDeclarationOrigin)? = { descriptor -> @@ -54,4 +59,10 @@ object JvmGeneratorExtensions : GeneratorExtensions() { companion object Instance : JvmSamConversion() } + + override fun computeFieldVisibility(descriptor: PropertyDescriptor): Visibility? = + if (descriptor.hasJvmFieldAnnotation() || descriptor is JavaCallableMemberDescriptor) + descriptor.visibility + else + null } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt index eff972737b2..6069df8fb42 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt @@ -73,9 +73,8 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F if (declaration.isInline) { val irConstructor = declaration.primaryConstructor!! - declaration.declarations.removeIf { - (it is IrConstructor && it.isPrimary) || (it is IrFunction && it.isInlineClassFieldGetter) - } + // The field getter is used by reflection and cannot be removed here. + declaration.declarations.remove(irConstructor) buildPrimaryInlineClassConstructor(declaration, irConstructor) buildBoxFunction(declaration) buildUnboxFunction(declaration) diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/GeneratorExtensions.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/GeneratorExtensions.kt index b18a3a93b8e..35c55fc1129 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/GeneratorExtensions.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/GeneratorExtensions.kt @@ -6,11 +6,11 @@ package org.jetbrains.kotlin.psi2ir.generators import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin import org.jetbrains.kotlin.types.KotlinType -import org.jetbrains.kotlin.types.SimpleType open class GeneratorExtensions { open val externalDeclarationOrigin: ((DeclarationDescriptor) -> IrDeclarationOrigin)? @@ -32,4 +32,6 @@ open class GeneratorExtensions { companion object Instance : SamConversion() } + + open fun computeFieldVisibility(descriptor: PropertyDescriptor): Visibility? = null } diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt index 20884a9b5fd..7d815ed1306 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/PropertyGenerator.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.psi2ir.generators import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrExpressionBody import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin @@ -86,7 +87,8 @@ class PropertyGenerator(declarationGenerator: DeclarationGenerator) : Declaratio context.symbolTable.declareField( ktPropertyElement.startOffsetSkippingComments, ktPropertyElement.endOffset, IrDeclarationOrigin.PROPERTY_BACKING_FIELD, - propertyDescriptor, propertyDescriptor.type.toIrType() + propertyDescriptor, propertyDescriptor.type.toIrType(), + propertyDescriptor.fieldVisibility ).also { it.initializer = generateInitializer(it) } @@ -137,7 +139,7 @@ class PropertyGenerator(declarationGenerator: DeclarationGenerator) : Declaratio val endOffset = ktElement.pureEndOffsetOrUndefined val backingField = - if (propertyDescriptor.hasBackingField(context.bindingContext)) + if (propertyDescriptor.hasBackingField(context.bindingContext) && propertyDescriptor.fieldVisibility.admitsFakeOverride) context.symbolTable.declareFieldWithOverrides( startOffset, endOffset, IrDeclarationOrigin.FAKE_OVERRIDE, propertyDescriptor, propertyDescriptor.type.toIrType() @@ -171,5 +173,16 @@ class PropertyGenerator(declarationGenerator: DeclarationGenerator) : Declaratio val variableDescriptor = getOrFail(BindingContext.VARIABLE, ktProperty) return variableDescriptor as? PropertyDescriptor ?: TODO("not a property: $variableDescriptor") } + + private val Visibility.admitsFakeOverride: Boolean + get() = !Visibilities.isPrivate(this) && this != Visibilities.INVISIBLE_FAKE + + private val PropertyDescriptor.fieldVisibility: Visibility + get() = declarationGenerator.context.extensions.computeFieldVisibility(this) + ?: when { + isLateInit -> setter?.visibility ?: visibility + isConst -> visibility + else -> Visibilities.PRIVATE + } } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt index 1e22f9dc956..c4970983d71 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt @@ -52,11 +52,12 @@ class IrFieldImpl( endOffset: Int, origin: IrDeclarationOrigin, symbol: IrFieldSymbol, - type: IrType + type: IrType, + visibility: Visibility = symbol.descriptor.visibility ) : this( startOffset, endOffset, origin, symbol, - symbol.descriptor.name, type, symbol.descriptor.visibility, + symbol.descriptor.name, type, visibility, isFinal = !symbol.descriptor.isVar, isExternal = symbol.descriptor.isEffectivelyExternal(), isStatic = symbol.descriptor.dispatchReceiverParameter == null diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt index bc977f0cd26..1bddb733881 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin import org.jetbrains.kotlin.ir.declarations.IrField import org.jetbrains.kotlin.ir.declarations.IrProperty -import org.jetbrains.kotlin.ir.expressions.IrCall import org.jetbrains.kotlin.ir.expressions.IrConstructorCall import org.jetbrains.kotlin.ir.expressions.IrExpressionBody import org.jetbrains.kotlin.ir.expressions.impl.IrExpressionBodyImpl diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt index 626e8209136..96fa87a42ce 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt @@ -294,8 +294,9 @@ open class SymbolTable : ReferenceSymbolTable { origin: IrDeclarationOrigin, descriptor: PropertyDescriptor, type: IrType, + visibility: Visibility? = null, fieldFactory: (IrFieldSymbol) -> IrField = { - IrFieldImpl(startOffset, endOffset, origin, it, type).apply { + IrFieldImpl(startOffset, endOffset, origin, it, type, visibility ?: it.descriptor.visibility).apply { metadata = MetadataSource.Property(it.descriptor) } } diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/JsGeneratorExtensions.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/JsGeneratorExtensions.kt new file mode 100644 index 00000000000..cfbf2b89420 --- /dev/null +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/JsGeneratorExtensions.kt @@ -0,0 +1,25 @@ +/* + * 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.ir.backend.js + +import org.jetbrains.kotlin.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.psi2ir.generators.GeneratorExtensions + +class JsGeneratorExtensions : GeneratorExtensions() { + override fun computeFieldVisibility(descriptor: PropertyDescriptor): Visibility = + if (descriptor.annotations.hasAnnotation(JS_EXPORT_FQ_NAME)) + descriptor.visibility + else + Visibilities.PRIVATE + + + companion object { + val JS_EXPORT_FQ_NAME = FqName("kotlin.js.JsExport") + } +} diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt index 0a5bb085e61..69576912c9b 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.ir.backend.js import com.intellij.openapi.project.Project import org.jetbrains.kotlin.backend.common.LoggingContext import org.jetbrains.kotlin.backend.common.serialization.DescriptorTable -import org.jetbrains.kotlin.library.impl.buildKoltinLibrary import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.functions.functionInterfacePackageFragmentProvider import org.jetbrains.kotlin.config.CommonConfigurationKeys @@ -32,6 +31,7 @@ import org.jetbrains.kotlin.konan.KonanVersionImpl import org.jetbrains.kotlin.konan.MetaVersion import org.jetbrains.kotlin.konan.properties.propertyList import org.jetbrains.kotlin.library.* +import org.jetbrains.kotlin.library.impl.buildKoltinLibrary import org.jetbrains.kotlin.library.impl.createKotlinLibrary import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus @@ -39,7 +39,6 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator import org.jetbrains.kotlin.psi2ir.generators.GeneratorContext -import org.jetbrains.kotlin.psi2ir.generators.GeneratorExtensions import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.CompilerDeserializationConfiguration import org.jetbrains.kotlin.storage.LockBasedStorageManager @@ -146,7 +145,7 @@ private fun runAnalysisAndPreparePsi2Ir(depsDescriptors: ModulesStructure): Gene analysisResult.bindingContext, depsDescriptors.compilerConfiguration.languageVersionSettings, SymbolTable(), - GeneratorExtensions() + JsGeneratorExtensions() ) } diff --git a/compiler/testData/ir/irJsText/dynamic/implicitCastFromDynamic.txt b/compiler/testData/ir/irJsText/dynamic/implicitCastFromDynamic.txt index 671f62b5d70..c17eacdd40d 100644 --- a/compiler/testData/ir/irJsText/dynamic/implicitCastFromDynamic.txt +++ b/compiler/testData/ir/irJsText/dynamic/implicitCastFromDynamic.txt @@ -1,15 +1,15 @@ FILE fqName: fileName:/implicitCastFromDynamic.kt PROPERTY name:d visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:d type:dynamic visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:d type:dynamic visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:dynamic correspondingProperty: PROPERTY name:d visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): dynamic declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d type:dynamic visibility:public [final,static]' type=dynamic origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d type:dynamic visibility:private [final,static]' type=dynamic origin=null PROPERTY name:p visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY TYPE_OP type=kotlin.Int origin=IMPLICIT_DYNAMIC_CAST typeOperand=kotlin.Int CALL 'public final fun (): dynamic declared in ' type=dynamic origin=GET_PROPERTY @@ -17,7 +17,7 @@ FILE fqName: fileName:/implicitCastFromDynamic.kt correspondingProperty: PROPERTY name:p visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null FUN name:test1 visibility:public modality:FINAL <> (d:dynamic) returnType:kotlin.Int VALUE_PARAMETER name:d index:0 type:dynamic BLOCK_BODY diff --git a/compiler/testData/ir/irJsText/dynamic/implicitCastToDynamic.txt b/compiler/testData/ir/irJsText/dynamic/implicitCastToDynamic.txt index 037d8463ed5..5580ad4f811 100644 --- a/compiler/testData/ir/irJsText/dynamic/implicitCastToDynamic.txt +++ b/compiler/testData/ir/irJsText/dynamic/implicitCastToDynamic.txt @@ -1,36 +1,36 @@ FILE fqName: fileName:/implicitCastToDynamic.kt PROPERTY name:d1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:d1 type:dynamic visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:d1 type:dynamic visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:dynamic correspondingProperty: PROPERTY name:d1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): dynamic declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d1 type:dynamic visibility:public [final,static]' type=dynamic origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d1 type:dynamic visibility:private [final,static]' type=dynamic origin=null PROPERTY name:p visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:p visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:d2 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:d2 type:dynamic visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:d2 type:dynamic visibility:private [static] EXPRESSION_BODY CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:dynamic correspondingProperty: PROPERTY name:d2 visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): dynamic declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d2 type:dynamic visibility:public [static]' type=dynamic origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d2 type:dynamic visibility:private [static]' type=dynamic origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:dynamic) returnType:kotlin.Unit correspondingProperty: PROPERTY name:d2 visibility:public modality:FINAL [var] VALUE_PARAMETER name: index:0 type:dynamic BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d2 type:dynamic visibility:public [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d2 type:dynamic visibility:private [static]' type=kotlin.Unit origin=null value: GET_VAR ': dynamic declared in .' type=dynamic origin=null FUN name:withDynamic visibility:public modality:FINAL <> (d:dynamic) returnType:dynamic VALUE_PARAMETER name:d index:0 type:dynamic diff --git a/compiler/testData/ir/irText/classes/annotationClasses.txt b/compiler/testData/ir/irText/classes/annotationClasses.txt index f818ad1a30e..fa370da52ea 100644 --- a/compiler/testData/ir/irText/classes/annotationClasses.txt +++ b/compiler/testData/ir/irText/classes/annotationClasses.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/annotationClasses.kt CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:.Test1 [primary] VALUE_PARAMETER name:x index:0 type:kotlin.Int PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Test1.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.Int @@ -12,7 +12,7 @@ FILE fqName: fileName:/annotationClasses.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -34,7 +34,7 @@ FILE fqName: fileName:/annotationClasses.kt EXPRESSION_BODY CONST Int type=kotlin.Int value=0 PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Test2.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test2) returnType:kotlin.Int @@ -42,7 +42,7 @@ FILE fqName: fileName:/annotationClasses.kt $this: VALUE_PARAMETER name: type:.Test2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test2 declared in .Test2.' type=.Test2 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -62,7 +62,7 @@ FILE fqName: fileName:/annotationClasses.kt CONSTRUCTOR visibility:public <> (x:.Test1) returnType:.Test3 [primary] VALUE_PARAMETER name:x index:0 type:.Test1 PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:.Test1 visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:.Test1 visibility:private [final] EXPRESSION_BODY GET_VAR 'x: .Test1 declared in .Test3.' type=.Test1 origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test3) returnType:.Test1 @@ -70,7 +70,7 @@ FILE fqName: fileName:/annotationClasses.kt $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): .Test1 declared in .Test3' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:.Test1 visibility:public [final]' type=.Test1 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:.Test1 visibility:private [final]' type=.Test1 origin=null receiver: GET_VAR ': .Test3 declared in .Test3.' type=.Test3 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -90,7 +90,7 @@ FILE fqName: fileName:/annotationClasses.kt CONSTRUCTOR visibility:public <> (xs:kotlin.IntArray) returnType:.Test4 [primary] VALUE_PARAMETER name:xs index:0 type:kotlin.IntArray varargElementType:kotlin.Int [vararg] PROPERTY name:xs visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.IntArray visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.IntArray visibility:private [final] EXPRESSION_BODY GET_VAR 'xs: kotlin.IntArray [vararg] declared in .Test4.' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test4) returnType:kotlin.IntArray @@ -98,7 +98,7 @@ FILE fqName: fileName:/annotationClasses.kt $this: VALUE_PARAMETER name: type:.Test4 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.IntArray declared in .Test4' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.IntArray visibility:public [final]' type=kotlin.IntArray origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.IntArray visibility:private [final]' type=kotlin.IntArray origin=null receiver: GET_VAR ': .Test4 declared in .Test4.' type=.Test4 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt index 2e92d0f924f..01b16a285f5 100644 --- a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt +++ b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/argumentReorderingInDelegatingConstructorCall.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:OPEN visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Base.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Base) returnType:kotlin.Int @@ -16,10 +16,10 @@ FILE fqName: fileName:/argumentReorderingInDelegatingConstructorCall.kt $this: VALUE_PARAMETER name: type:.Base BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Base' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Base declared in .Base.' type=.Base origin=null PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'y: kotlin.Int declared in .Base.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Base) returnType:kotlin.Int @@ -27,7 +27,7 @@ FILE fqName: fileName:/argumentReorderingInDelegatingConstructorCall.kt $this: VALUE_PARAMETER name: type:.Base BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Base' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Base declared in .Base.' type=.Base origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -58,18 +58,12 @@ FILE fqName: fileName:/argumentReorderingInDelegatingConstructorCall.kt y: GET_VAR 'val tmp0_y: kotlin.Int [val] declared in .Test1.' type=kotlin.Int origin=null INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[.Base]' PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] - FIELD FAKE_OVERRIDE name:x type:kotlin.Int visibility:public [final] - overridden: - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.Base) returnType:kotlin.Int correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] overridden: public final fun (): kotlin.Int declared in .Base $this: VALUE_PARAMETER name: type:.Base PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [val] - FIELD FAKE_OVERRIDE name:y type:kotlin.Int visibility:public [final] - overridden: - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.Base) returnType:kotlin.Int correspondingProperty: PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [val] overridden: @@ -117,18 +111,12 @@ FILE fqName: fileName:/argumentReorderingInDelegatingConstructorCall.kt xx: GET_VAR 'val tmp1_xx: kotlin.Int [val] declared in .Test2.' type=kotlin.Int origin=null yy: GET_VAR 'val tmp0_yy: kotlin.Int [val] declared in .Test2.' type=kotlin.Int origin=null PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] - FIELD FAKE_OVERRIDE name:x type:kotlin.Int visibility:public [final] - overridden: - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.Base) returnType:kotlin.Int correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] overridden: public final fun (): kotlin.Int declared in .Base $this: VALUE_PARAMETER name: type:.Base PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [val] - FIELD FAKE_OVERRIDE name:y type:kotlin.Int visibility:public [final] - overridden: - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.Base) returnType:kotlin.Int correspondingProperty: PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [val] overridden: diff --git a/compiler/testData/ir/irText/classes/classMembers.txt b/compiler/testData/ir/irText/classes/classMembers.txt index 11208db519a..00b8ef677ce 100644 --- a/compiler/testData/ir/irText/classes/classMembers.txt +++ b/compiler/testData/ir/irText/classes/classMembers.txt @@ -11,7 +11,7 @@ FILE fqName: fileName:/classMembers.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'y: kotlin.Int declared in .C.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -19,10 +19,10 @@ FILE fqName: fileName:/classMembers.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null PROPERTY name:z visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:private EXPRESSION_BODY GET_VAR 'z: kotlin.Int declared in .C.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -30,14 +30,14 @@ FILE fqName: fileName:/classMembers.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:z visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null value: GET_VAR ': kotlin.Int declared in .C.' type=kotlin.Int origin=null CONSTRUCTOR visibility:public <> () returnType:.C @@ -47,7 +47,7 @@ FILE fqName: fileName:/classMembers.kt y: CONST Int type=kotlin.Int value=0 z: CONST Int type=kotlin.Int value=0 PROPERTY name:property visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:property type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:property type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -55,7 +55,7 @@ FILE fqName: fileName:/classMembers.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:property type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:property type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null PROPERTY name:propertyWithGet visibility:public modality:FINAL [val] FUN name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int diff --git a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.txt b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.txt index 9409f675c26..4bfa7e50be8 100644 --- a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.txt +++ b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.txt @@ -15,7 +15,7 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:stringArray visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:stringArray type:kotlin.Array visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:stringArray type:kotlin.Array visibility:private [final] EXPRESSION_BODY GET_VAR 'stringArray: kotlin.Array declared in .Test1.' type=kotlin.Array origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.Array @@ -23,10 +23,10 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:stringArray type:kotlin.Array visibility:public [final]' type=kotlin.Array origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:stringArray type:kotlin.Array visibility:private [final]' type=kotlin.Array origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null PROPERTY name:charArray visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:charArray type:kotlin.CharArray visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:charArray type:kotlin.CharArray visibility:private [final] EXPRESSION_BODY GET_VAR 'charArray: kotlin.CharArray declared in .Test1.' type=kotlin.CharArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.CharArray @@ -34,10 +34,10 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.CharArray declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:charArray type:kotlin.CharArray visibility:public [final]' type=kotlin.CharArray origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:charArray type:kotlin.CharArray visibility:private [final]' type=kotlin.CharArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null PROPERTY name:booleanArray visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:booleanArray type:kotlin.BooleanArray visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:booleanArray type:kotlin.BooleanArray visibility:private [final] EXPRESSION_BODY GET_VAR 'booleanArray: kotlin.BooleanArray declared in .Test1.' type=kotlin.BooleanArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.BooleanArray @@ -45,10 +45,10 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.BooleanArray declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:booleanArray type:kotlin.BooleanArray visibility:public [final]' type=kotlin.BooleanArray origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:booleanArray type:kotlin.BooleanArray visibility:private [final]' type=kotlin.BooleanArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null PROPERTY name:byteArray visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:byteArray type:kotlin.ByteArray visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:byteArray type:kotlin.ByteArray visibility:private [final] EXPRESSION_BODY GET_VAR 'byteArray: kotlin.ByteArray declared in .Test1.' type=kotlin.ByteArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.ByteArray @@ -56,10 +56,10 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.ByteArray declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:byteArray type:kotlin.ByteArray visibility:public [final]' type=kotlin.ByteArray origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:byteArray type:kotlin.ByteArray visibility:private [final]' type=kotlin.ByteArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null PROPERTY name:shortArray visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:shortArray type:kotlin.ShortArray visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:shortArray type:kotlin.ShortArray visibility:private [final] EXPRESSION_BODY GET_VAR 'shortArray: kotlin.ShortArray declared in .Test1.' type=kotlin.ShortArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.ShortArray @@ -67,10 +67,10 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.ShortArray declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:shortArray type:kotlin.ShortArray visibility:public [final]' type=kotlin.ShortArray origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:shortArray type:kotlin.ShortArray visibility:private [final]' type=kotlin.ShortArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null PROPERTY name:intArray visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:intArray type:kotlin.IntArray visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:intArray type:kotlin.IntArray visibility:private [final] EXPRESSION_BODY GET_VAR 'intArray: kotlin.IntArray declared in .Test1.' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.IntArray @@ -78,10 +78,10 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.IntArray declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:intArray type:kotlin.IntArray visibility:public [final]' type=kotlin.IntArray origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:intArray type:kotlin.IntArray visibility:private [final]' type=kotlin.IntArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null PROPERTY name:longArray visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:longArray type:kotlin.LongArray visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:longArray type:kotlin.LongArray visibility:private [final] EXPRESSION_BODY GET_VAR 'longArray: kotlin.LongArray declared in .Test1.' type=kotlin.LongArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.LongArray @@ -89,10 +89,10 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.LongArray declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:longArray type:kotlin.LongArray visibility:public [final]' type=kotlin.LongArray origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:longArray type:kotlin.LongArray visibility:private [final]' type=kotlin.LongArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null PROPERTY name:floatArray visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:floatArray type:kotlin.FloatArray visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:floatArray type:kotlin.FloatArray visibility:private [final] EXPRESSION_BODY GET_VAR 'floatArray: kotlin.FloatArray declared in .Test1.' type=kotlin.FloatArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.FloatArray @@ -100,10 +100,10 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.FloatArray declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:floatArray type:kotlin.FloatArray visibility:public [final]' type=kotlin.FloatArray origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:floatArray type:kotlin.FloatArray visibility:private [final]' type=kotlin.FloatArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null PROPERTY name:doubleArray visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:doubleArray type:kotlin.DoubleArray visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:doubleArray type:kotlin.DoubleArray visibility:private [final] EXPRESSION_BODY GET_VAR 'doubleArray: kotlin.DoubleArray declared in .Test1.' type=kotlin.DoubleArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.DoubleArray @@ -111,7 +111,7 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.DoubleArray declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:doubleArray type:kotlin.DoubleArray visibility:public [final]' type=kotlin.DoubleArray origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:doubleArray type:kotlin.DoubleArray visibility:private [final]' type=kotlin.DoubleArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.Array $this: VALUE_PARAMETER name: type:.Test1 @@ -470,7 +470,7 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:genericArray visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:genericArray type:kotlin.Array.Test2> visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:genericArray type:kotlin.Array.Test2> visibility:private [final] EXPRESSION_BODY GET_VAR 'genericArray: kotlin.Array.Test2> declared in .Test2.' type=kotlin.Array.Test2> origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test2.Test2>) returnType:kotlin.Array.Test2> @@ -478,7 +478,7 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt $this: VALUE_PARAMETER name: type:.Test2.Test2> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array.Test2> declared in .Test2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:genericArray type:kotlin.Array.Test2> visibility:public [final]' type=kotlin.Array.Test2> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:genericArray type:kotlin.Array.Test2> visibility:private [final]' type=kotlin.Array.Test2> origin=null receiver: GET_VAR ': .Test2.Test2> declared in .Test2.' type=.Test2.Test2> origin=null FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.Test2.Test2>) returnType:kotlin.Array.Test2> $this: VALUE_PARAMETER name: type:.Test2.Test2> @@ -565,7 +565,7 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:anyArrayN visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:anyArrayN type:kotlin.Array? visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:anyArrayN type:kotlin.Array? visibility:private [final] EXPRESSION_BODY GET_VAR 'anyArrayN: kotlin.Array? declared in .Test3.' type=kotlin.Array? origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.Array? @@ -573,7 +573,7 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array? declared in .Test3' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anyArrayN type:kotlin.Array? visibility:public [final]' type=kotlin.Array? origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anyArrayN type:kotlin.Array? visibility:private [final]' type=kotlin.Array? origin=null receiver: GET_VAR ': .Test3 declared in .Test3.' type=.Test3 origin=null FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.Array? $this: VALUE_PARAMETER name: type:.Test3 diff --git a/compiler/testData/ir/irText/classes/dataClasses.txt b/compiler/testData/ir/irText/classes/dataClasses.txt index ecc7fb4c0f4..fcc8f8b95c9 100644 --- a/compiler/testData/ir/irText/classes/dataClasses.txt +++ b/compiler/testData/ir/irText/classes/dataClasses.txt @@ -9,7 +9,7 @@ FILE fqName: fileName:/dataClasses.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Test1.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.Int @@ -17,10 +17,10 @@ FILE fqName: fileName:/dataClasses.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'y: kotlin.String declared in .Test1.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.String @@ -28,10 +28,10 @@ FILE fqName: fileName:/dataClasses.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null PROPERTY name:z visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:private [final] EXPRESSION_BODY GET_VAR 'z: kotlin.Any declared in .Test1.' type=kotlin.Any origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.Any @@ -39,7 +39,7 @@ FILE fqName: fileName:/dataClasses.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:public [final]' type=kotlin.Any origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.Int $this: VALUE_PARAMETER name: type:.Test1 @@ -190,7 +190,7 @@ FILE fqName: fileName:/dataClasses.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Any? declared in .Test2.' type=kotlin.Any? origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test2) returnType:kotlin.Any? @@ -198,7 +198,7 @@ FILE fqName: fileName:/dataClasses.kt $this: VALUE_PARAMETER name: type:.Test2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any? declared in .Test2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:public [final]' type=kotlin.Any? origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final]' type=kotlin.Any? origin=null receiver: GET_VAR ': .Test2 declared in .Test2.' type=.Test2 origin=null FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.Test2) returnType:kotlin.Any? $this: VALUE_PARAMETER name: type:.Test2 @@ -297,7 +297,7 @@ FILE fqName: fileName:/dataClasses.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:d visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:d type:kotlin.Double visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:d type:kotlin.Double visibility:private [final] EXPRESSION_BODY GET_VAR 'd: kotlin.Double declared in .Test3.' type=kotlin.Double origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.Double @@ -305,10 +305,10 @@ FILE fqName: fileName:/dataClasses.kt $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Double declared in .Test3' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d type:kotlin.Double visibility:public [final]' type=kotlin.Double origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d type:kotlin.Double visibility:private [final]' type=kotlin.Double origin=null receiver: GET_VAR ': .Test3 declared in .Test3.' type=.Test3 origin=null PROPERTY name:dn visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:dn type:kotlin.Double? visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:dn type:kotlin.Double? visibility:private [final] EXPRESSION_BODY GET_VAR 'dn: kotlin.Double? declared in .Test3.' type=kotlin.Double? origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.Double? @@ -316,10 +316,10 @@ FILE fqName: fileName:/dataClasses.kt $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Double? declared in .Test3' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:dn type:kotlin.Double? visibility:public [final]' type=kotlin.Double? origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:dn type:kotlin.Double? visibility:private [final]' type=kotlin.Double? origin=null receiver: GET_VAR ': .Test3 declared in .Test3.' type=.Test3 origin=null PROPERTY name:f visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:f type:kotlin.Float visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:f type:kotlin.Float visibility:private [final] EXPRESSION_BODY GET_VAR 'f: kotlin.Float declared in .Test3.' type=kotlin.Float origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.Float @@ -327,10 +327,10 @@ FILE fqName: fileName:/dataClasses.kt $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Float declared in .Test3' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:f type:kotlin.Float visibility:public [final]' type=kotlin.Float origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:f type:kotlin.Float visibility:private [final]' type=kotlin.Float origin=null receiver: GET_VAR ': .Test3 declared in .Test3.' type=.Test3 origin=null PROPERTY name:df visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:df type:kotlin.Float? visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:df type:kotlin.Float? visibility:private [final] EXPRESSION_BODY GET_VAR 'df: kotlin.Float? declared in .Test3.' type=kotlin.Float? origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.Float? @@ -338,7 +338,7 @@ FILE fqName: fileName:/dataClasses.kt $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Float? declared in .Test3' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:df type:kotlin.Float? visibility:public [final]' type=kotlin.Float? origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:df type:kotlin.Float? visibility:private [final]' type=kotlin.Float? origin=null receiver: GET_VAR ': .Test3 declared in .Test3.' type=.Test3 origin=null FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.Double $this: VALUE_PARAMETER name: type:.Test3 diff --git a/compiler/testData/ir/irText/classes/dataClassesGeneric.txt b/compiler/testData/ir/irText/classes/dataClassesGeneric.txt index 7e512297f09..c57622615ea 100644 --- a/compiler/testData/ir/irText/classes/dataClassesGeneric.txt +++ b/compiler/testData/ir/irText/classes/dataClassesGeneric.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test1 visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test1 visibility:private [final] EXPRESSION_BODY GET_VAR 'x: T of .Test1 declared in .Test1.' type=T of .Test1 origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1.Test1>) returnType:T of .Test1 @@ -16,7 +16,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt $this: VALUE_PARAMETER name: type:.Test1.Test1> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of .Test1 declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test1 visibility:public [final]' type=T of .Test1 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test1 visibility:private [final]' type=T of .Test1 origin=null receiver: GET_VAR ': .Test1.Test1> declared in .Test1.' type=.Test1.Test1> origin=null FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.Test1.Test1>) returnType:T of .Test1 $this: VALUE_PARAMETER name: type:.Test1.Test1> @@ -114,7 +114,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test2 visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test2 visibility:private [final] EXPRESSION_BODY GET_VAR 'x: T of .Test2 declared in .Test2.' type=T of .Test2 origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test2.Test2>) returnType:T of .Test2 @@ -122,7 +122,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt $this: VALUE_PARAMETER name: type:.Test2.Test2> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of .Test2 declared in .Test2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test2 visibility:public [final]' type=T of .Test2 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test2 visibility:private [final]' type=T of .Test2 origin=null receiver: GET_VAR ': .Test2.Test2> declared in .Test2.' type=.Test2.Test2> origin=null FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.Test2.Test2>) returnType:T of .Test2 $this: VALUE_PARAMETER name: type:.Test2.Test2> @@ -209,7 +209,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List.Test3> visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List.Test3> visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.collections.List.Test3> declared in .Test3.' type=kotlin.collections.List.Test3> origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test3.Test3>) returnType:kotlin.collections.List.Test3> @@ -217,7 +217,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt $this: VALUE_PARAMETER name: type:.Test3.Test3> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.collections.List.Test3> declared in .Test3' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List.Test3> visibility:public [final]' type=kotlin.collections.List.Test3> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List.Test3> visibility:private [final]' type=kotlin.collections.List.Test3> origin=null receiver: GET_VAR ': .Test3.Test3> declared in .Test3.' type=.Test3.Test3> origin=null FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.Test3.Test3>) returnType:kotlin.collections.List.Test3> $this: VALUE_PARAMETER name: type:.Test3.Test3> @@ -303,7 +303,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test4 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.collections.List declared in .Test4.' type=kotlin.collections.List origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test4) returnType:kotlin.collections.List @@ -311,7 +311,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt $this: VALUE_PARAMETER name: type:.Test4 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.collections.List declared in .Test4' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List visibility:public [final]' type=kotlin.collections.List origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List visibility:private [final]' type=kotlin.collections.List origin=null receiver: GET_VAR ': .Test4 declared in .Test4.' type=.Test4 origin=null FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.Test4) returnType:kotlin.collections.List $this: VALUE_PARAMETER name: type:.Test4 diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.txt index fb4d6c2558b..c5ffa80f9e1 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementation.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementation.txt @@ -117,7 +117,7 @@ FILE fqName: fileName:/delegatedImplementation.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name: modality:FINAL visibility:local superTypes:[.IOther]' PROPERTY name:x visibility:public modality:OPEN [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'x0: kotlin.String declared in .otherImpl' type=kotlin.String origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:.otherImpl.) returnType:kotlin.String @@ -127,10 +127,10 @@ FILE fqName: fileName:/delegatedImplementation.kt $this: VALUE_PARAMETER name: type:.otherImpl. BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun (): kotlin.String declared in .otherImpl.' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .otherImpl. declared in .otherImpl..' type=.otherImpl. origin=null PROPERTY name:y visibility:public modality:OPEN [var] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private EXPRESSION_BODY GET_VAR 'y0: kotlin.Int declared in .otherImpl' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:.otherImpl.) returnType:kotlin.Int @@ -140,7 +140,7 @@ FILE fqName: fileName:/delegatedImplementation.kt $this: VALUE_PARAMETER name: type:.otherImpl. BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun (): kotlin.Int declared in .otherImpl.' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .otherImpl. declared in .otherImpl..' type=.otherImpl. origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:.otherImpl., :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:y visibility:public modality:OPEN [var] @@ -149,7 +149,7 @@ FILE fqName: fileName:/delegatedImplementation.kt $this: VALUE_PARAMETER name: type:.otherImpl. VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .otherImpl. declared in .otherImpl..' type=.otherImpl. origin=null value: GET_VAR ': kotlin.Int declared in .otherImpl..' type=kotlin.Int origin=null PROPERTY name:z1 visibility:public modality:OPEN [val] diff --git a/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt b/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt index 4c9442d41d0..b48f5f1921e 100644 --- a/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt +++ b/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/delegatingConstructorCallToTypeAliasConstructor.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Cell modality:OPEN visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:T of .Cell visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:T of .Cell visibility:private [final] EXPRESSION_BODY GET_VAR 'value: T of .Cell declared in .Cell.' type=T of .Cell origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Cell.Cell>) returnType:T of .Cell @@ -16,7 +16,7 @@ FILE fqName: fileName:/delegatingConstructorCallToTypeAliasConstructor.kt $this: VALUE_PARAMETER name: type:.Cell.Cell> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of .Cell declared in .Cell' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Cell visibility:public [final]' type=T of .Cell origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Cell visibility:private [final]' type=T of .Cell origin=null receiver: GET_VAR ': .Cell.Cell> declared in .Cell.' type=.Cell.Cell> origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/classes/enum.txt b/compiler/testData/ir/irText/classes/enum.txt index 300bf9aa926..388bae9ea66 100644 --- a/compiler/testData/ir/irText/classes/enum.txt +++ b/compiler/testData/ir/irText/classes/enum.txt @@ -66,7 +66,7 @@ FILE fqName: fileName:/enum.kt : .TestEnum2 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestEnum2 modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestEnum2>]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .TestEnum2.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestEnum2) returnType:kotlin.Int @@ -74,7 +74,7 @@ FILE fqName: fileName:/enum.kt $this: VALUE_PARAMETER name: type:.TestEnum2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestEnum2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestEnum2 declared in .TestEnum2.' type=.TestEnum2 origin=null ENUM_ENTRY name:TEST1 init: ENUM_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .TestEnum2' @@ -254,7 +254,7 @@ FILE fqName: fileName:/enum.kt : .TestEnum4 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestEnum4 modality:ABSTRACT visibility:public superTypes:[kotlin.Enum<.TestEnum4>]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .TestEnum4.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestEnum4) returnType:kotlin.Int @@ -262,7 +262,7 @@ FILE fqName: fileName:/enum.kt $this: VALUE_PARAMETER name: type:.TestEnum4 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestEnum4' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestEnum4 declared in .TestEnum4.' type=.TestEnum4 origin=null ENUM_ENTRY name:TEST1 init: ENUM_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestEnum4.TEST1' @@ -319,9 +319,6 @@ FILE fqName: fileName:/enum.kt public final fun (): kotlin.Int declared in .TestEnum4 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum4> PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] - FIELD FAKE_OVERRIDE name:x type:kotlin.Int visibility:public [final] - overridden: - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.TestEnum4) returnType:kotlin.Int correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] overridden: @@ -341,17 +338,17 @@ FILE fqName: fileName:/enum.kt x: CONST Int type=kotlin.Int value=2 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:TEST2 modality:FINAL visibility:public superTypes:[.TestEnum4]' PROPERTY name:z visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:private [final] FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestEnum4.TEST2) returnType:kotlin.Int correspondingProperty: PROPERTY name:z visibility:public modality:FINAL [val] $this: VALUE_PARAMETER name: type:.TestEnum4.TEST2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestEnum4.TEST2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestEnum4.TEST2 declared in .TestEnum4.TEST2.' type=.TestEnum4.TEST2 origin=null ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:public [final]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:private [final]' type=kotlin.Unit origin=null receiver: GET_VAR ': .TestEnum4.TEST2 declared in .TestEnum4.TEST2' type=.TestEnum4.TEST2 origin=null value: CALL 'public final fun (): kotlin.Int declared in .TestEnum4.TEST2' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .TestEnum4.TEST2 declared in .TestEnum4.TEST2' type=.TestEnum4.TEST2 origin=null @@ -401,9 +398,6 @@ FILE fqName: fileName:/enum.kt public final fun (): kotlin.Int declared in .TestEnum4 $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum4> PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] - FIELD FAKE_OVERRIDE name:x type:kotlin.Int visibility:public [final] - overridden: - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.TestEnum4) returnType:kotlin.Int correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] overridden: @@ -473,7 +467,7 @@ FILE fqName: fileName:/enum.kt : .TestEnum5 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestEnum5 modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestEnum5>]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .TestEnum5.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestEnum5) returnType:kotlin.Int @@ -481,7 +475,7 @@ FILE fqName: fileName:/enum.kt $this: VALUE_PARAMETER name: type:.TestEnum5 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestEnum5' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestEnum5 declared in .TestEnum5.' type=.TestEnum5 origin=null ENUM_ENTRY name:TEST1 init: ENUM_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .TestEnum5' diff --git a/compiler/testData/ir/irText/classes/enumClassModality.txt b/compiler/testData/ir/irText/classes/enumClassModality.txt index 73435933c38..7c341907d04 100644 --- a/compiler/testData/ir/irText/classes/enumClassModality.txt +++ b/compiler/testData/ir/irText/classes/enumClassModality.txt @@ -64,7 +64,7 @@ FILE fqName: fileName:/enumClassModality.kt : .TestFinalEnum2 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestFinalEnum2 modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestFinalEnum2>]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .TestFinalEnum2.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestFinalEnum2) returnType:kotlin.Int @@ -72,7 +72,7 @@ FILE fqName: fileName:/enumClassModality.kt $this: VALUE_PARAMETER name: type:.TestFinalEnum2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestFinalEnum2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestFinalEnum2 declared in .TestFinalEnum2.' type=.TestFinalEnum2 origin=null ENUM_ENTRY name:X1 init: ENUM_CONSTRUCTOR_CALL 'private constructor (x: kotlin.Int) [primary] declared in .TestFinalEnum2' diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt index 29bb2b73a5b..ce8cc916a5b 100644 --- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt +++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt : .Test0 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:Test0 modality:FINAL visibility:public superTypes:[kotlin.Enum<.Test0>]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Test0.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test0) returnType:kotlin.Int @@ -16,7 +16,7 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt $this: VALUE_PARAMETER name: type:.Test0 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test0' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test0 declared in .Test0.' type=.Test0 origin=null ENUM_ENTRY name:ZERO init: ENUM_CONSTRUCTOR_CALL 'private constructor () declared in .Test0' @@ -80,7 +80,7 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt : .Test1 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:Test1 modality:FINAL visibility:public superTypes:[kotlin.Enum<.Test1>]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Test1.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.Int @@ -88,7 +88,7 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null ENUM_ENTRY name:ZERO init: ENUM_CONSTRUCTOR_CALL 'private constructor () declared in .Test1' @@ -155,7 +155,7 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt : .Test2 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:Test2 modality:ABSTRACT visibility:public superTypes:[kotlin.Enum<.Test2>]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Test2.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test2) returnType:kotlin.Int @@ -163,7 +163,7 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt $this: VALUE_PARAMETER name: type:.Test2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test2 declared in .Test2.' type=.Test2 origin=null ENUM_ENTRY name:ZERO init: ENUM_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .Test2.ZERO' @@ -219,9 +219,6 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt public final fun (): kotlin.Int declared in .Test2 $this: VALUE_PARAMETER name: type:kotlin.Enum<.Test2> PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] - FIELD FAKE_OVERRIDE name:x type:kotlin.Int visibility:public [final] - overridden: - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.Test2) returnType:kotlin.Int correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] overridden: @@ -286,9 +283,6 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt public final fun (): kotlin.Int declared in .Test2 $this: VALUE_PARAMETER name: type:kotlin.Enum<.Test2> PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] - FIELD FAKE_OVERRIDE name:x type:kotlin.Int visibility:public [final] - overridden: - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.Test2) returnType:kotlin.Int correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] overridden: diff --git a/compiler/testData/ir/irText/classes/initBlock.txt b/compiler/testData/ir/irText/classes/initBlock.txt index 751666af1fa..b9bbea2fcb2 100644 --- a/compiler/testData/ir/irText/classes/initBlock.txt +++ b/compiler/testData/ir/irText/classes/initBlock.txt @@ -29,7 +29,7 @@ FILE fqName: fileName:/initBlock.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Test2.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test2) returnType:kotlin.Int @@ -37,7 +37,7 @@ FILE fqName: fileName:/initBlock.kt $this: VALUE_PARAMETER name: type:.Test2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test2 declared in .Test2.' type=.Test2 origin=null ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY diff --git a/compiler/testData/ir/irText/classes/initVal.txt b/compiler/testData/ir/irText/classes/initVal.txt index b821c5bc136..0d54fbf7c29 100644 --- a/compiler/testData/ir/irText/classes/initVal.txt +++ b/compiler/testData/ir/irText/classes/initVal.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/initVal.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitValFromParameter modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .TestInitValFromParameter.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInitValFromParameter) returnType:kotlin.Int @@ -15,7 +15,7 @@ FILE fqName: fileName:/initVal.kt $this: VALUE_PARAMETER name: type:.TestInitValFromParameter BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestInitValFromParameter' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestInitValFromParameter declared in .TestInitValFromParameter.' type=.TestInitValFromParameter origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -37,7 +37,7 @@ FILE fqName: fileName:/initVal.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitValInClass modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInitValInClass) returnType:kotlin.Int @@ -45,7 +45,7 @@ FILE fqName: fileName:/initVal.kt $this: VALUE_PARAMETER name: type:.TestInitValInClass BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestInitValInClass' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestInitValInClass declared in .TestInitValInClass.' type=.TestInitValInClass origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -67,17 +67,17 @@ FILE fqName: fileName:/initVal.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitValInInitBlock modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInitValInInitBlock) returnType:kotlin.Int correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] $this: VALUE_PARAMETER name: type:.TestInitValInInitBlock BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestInitValInInitBlock' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestInitValInInitBlock declared in .TestInitValInInitBlock.' type=.TestInitValInInitBlock origin=null ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Unit origin=null receiver: GET_VAR ': .TestInitValInInitBlock declared in .TestInitValInInitBlock' type=.TestInitValInInitBlock origin=null value: CONST Int type=kotlin.Int value=0 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/irText/classes/initVar.txt b/compiler/testData/ir/irText/classes/initVar.txt index 7e66a23f66c..7e1f35e9d4a 100644 --- a/compiler/testData/ir/irText/classes/initVar.txt +++ b/compiler/testData/ir/irText/classes/initVar.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/initVar.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitVarFromParameter modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .TestInitVarFromParameter.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInitVarFromParameter) returnType:kotlin.Int @@ -15,14 +15,14 @@ FILE fqName: fileName:/initVar.kt $this: VALUE_PARAMETER name: type:.TestInitVarFromParameter BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestInitVarFromParameter' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .TestInitVarFromParameter declared in .TestInitVarFromParameter.' type=.TestInitVarFromParameter origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInitVarFromParameter, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.TestInitVarFromParameter VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .TestInitVarFromParameter declared in .TestInitVarFromParameter.' type=.TestInitVarFromParameter origin=null value: GET_VAR ': kotlin.Int declared in .TestInitVarFromParameter.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean @@ -45,7 +45,7 @@ FILE fqName: fileName:/initVar.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitVarInClass modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInitVarInClass) returnType:kotlin.Int @@ -53,14 +53,14 @@ FILE fqName: fileName:/initVar.kt $this: VALUE_PARAMETER name: type:.TestInitVarInClass BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestInitVarInClass' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .TestInitVarInClass declared in .TestInitVarInClass.' type=.TestInitVarInClass origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInitVarInClass, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.TestInitVarInClass VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .TestInitVarInClass declared in .TestInitVarInClass.' type=.TestInitVarInClass origin=null value: GET_VAR ': kotlin.Int declared in .TestInitVarInClass.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean @@ -83,20 +83,20 @@ FILE fqName: fileName:/initVar.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitVarInInitBlock modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInitVarInInitBlock) returnType:kotlin.Int correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.TestInitVarInInitBlock BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestInitVarInInitBlock' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .TestInitVarInInitBlock declared in .TestInitVarInInitBlock.' type=.TestInitVarInInitBlock origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInitVarInInitBlock, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.TestInitVarInInitBlock VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .TestInitVarInInitBlock declared in .TestInitVarInInitBlock.' type=.TestInitVarInInitBlock origin=null value: GET_VAR ': kotlin.Int declared in .TestInitVarInInitBlock.' type=kotlin.Int origin=null ANONYMOUS_INITIALIZER isStatic=false @@ -124,7 +124,7 @@ FILE fqName: fileName:/initVar.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInitVarWithCustomSetter modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInitVarWithCustomSetter) returnType:kotlin.Int @@ -132,14 +132,14 @@ FILE fqName: fileName:/initVar.kt $this: VALUE_PARAMETER name: type:.TestInitVarWithCustomSetter BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestInitVarWithCustomSetter' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .TestInitVarWithCustomSetter declared in .TestInitVarWithCustomSetter.' type=.TestInitVarWithCustomSetter origin=null FUN name: visibility:public modality:FINAL <> ($this:.TestInitVarWithCustomSetter, value:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.TestInitVarWithCustomSetter VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=EQ + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=EQ receiver: GET_VAR ': .TestInitVarWithCustomSetter declared in .TestInitVarWithCustomSetter.' type=.TestInitVarWithCustomSetter origin=null value: GET_VAR 'value: kotlin.Int declared in .TestInitVarWithCustomSetter.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean @@ -158,20 +158,20 @@ FILE fqName: fileName:/initVar.kt CLASS CLASS name:TestInitVarWithCustomSetterWithExplicitCtor modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestInitVarWithCustomSetterWithExplicitCtor PROPERTY name:x visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInitVarWithCustomSetterWithExplicitCtor) returnType:kotlin.Int correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.TestInitVarWithCustomSetterWithExplicitCtor BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestInitVarWithCustomSetterWithExplicitCtor' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .TestInitVarWithCustomSetterWithExplicitCtor declared in .TestInitVarWithCustomSetterWithExplicitCtor.' type=.TestInitVarWithCustomSetterWithExplicitCtor origin=null FUN name: visibility:public modality:FINAL <> ($this:.TestInitVarWithCustomSetterWithExplicitCtor, value:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.TestInitVarWithCustomSetterWithExplicitCtor VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=EQ + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=EQ receiver: GET_VAR ': .TestInitVarWithCustomSetterWithExplicitCtor declared in .TestInitVarWithCustomSetterWithExplicitCtor.' type=.TestInitVarWithCustomSetterWithExplicitCtor origin=null value: GET_VAR 'value: kotlin.Int declared in .TestInitVarWithCustomSetterWithExplicitCtor.' type=kotlin.Int origin=null ANONYMOUS_INITIALIZER isStatic=false @@ -199,20 +199,20 @@ FILE fqName: fileName:/initVar.kt CLASS CLASS name:TestInitVarWithCustomSetterInCtor modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestInitVarWithCustomSetterInCtor PROPERTY name:x visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInitVarWithCustomSetterInCtor) returnType:kotlin.Int correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.TestInitVarWithCustomSetterInCtor BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestInitVarWithCustomSetterInCtor' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .TestInitVarWithCustomSetterInCtor declared in .TestInitVarWithCustomSetterInCtor.' type=.TestInitVarWithCustomSetterInCtor origin=null FUN name: visibility:public modality:FINAL <> ($this:.TestInitVarWithCustomSetterInCtor, value:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.TestInitVarWithCustomSetterInCtor VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=EQ + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=EQ receiver: GET_VAR ': .TestInitVarWithCustomSetterInCtor declared in .TestInitVarWithCustomSetterInCtor.' type=.TestInitVarWithCustomSetterInCtor origin=null value: GET_VAR 'value: kotlin.Int declared in .TestInitVarWithCustomSetterInCtor.' type=kotlin.Int origin=null CONSTRUCTOR visibility:public <> () returnType:.TestInitVarWithCustomSetterInCtor diff --git a/compiler/testData/ir/irText/classes/inlineClass.txt b/compiler/testData/ir/irText/classes/inlineClass.txt index de122d48d5b..1537c1da9c4 100644 --- a/compiler/testData/ir/irText/classes/inlineClass.txt +++ b/compiler/testData/ir/irText/classes/inlineClass.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/inlineClass.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test modality:FINAL visibility:public [inline] superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Test.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test) returnType:kotlin.Int @@ -15,7 +15,7 @@ FILE fqName: fileName:/inlineClass.kt $this: VALUE_PARAMETER name: type:.Test BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test declared in .Test.' type=.Test origin=null FUN GENERATED_INLINE_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:.Test) returnType:kotlin.String overridden: diff --git a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt index b2e32b33fa9..bedc7bd5672 100644 --- a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt +++ b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt @@ -14,7 +14,7 @@ FILE fqName: fileName:/innerClassWithDelegatingConstructor.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Inner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Outer.Inner.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Outer.Inner) returnType:kotlin.Int @@ -22,7 +22,7 @@ FILE fqName: fileName:/innerClassWithDelegatingConstructor.kt $this: VALUE_PARAMETER name: type:.Outer.Inner BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Outer.Inner' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Outer.Inner declared in .Outer.Inner.' type=.Outer.Inner origin=null CONSTRUCTOR visibility:public <> ($this:.Outer) returnType:.Outer.Inner $outer: VALUE_PARAMETER name: type:.Outer diff --git a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt index 15a369f58c3..a3e6ce548bb 100644 --- a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt +++ b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.txt @@ -15,7 +15,7 @@ FILE fqName: fileName:/lambdaInDataClassDefaultParameter.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:runA visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<.A, kotlin.String, kotlin.Unit> visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<.A, kotlin.String, kotlin.Unit> visibility:private [final] EXPRESSION_BODY GET_VAR 'runA: @[ExtensionFunctionType] kotlin.Function2<.A, kotlin.String, kotlin.Unit> declared in .A.' type=@[ExtensionFunctionType] kotlin.Function2<.A, kotlin.String, kotlin.Unit> origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:@[ExtensionFunctionType] kotlin.Function2<.A, kotlin.String, kotlin.Unit> @@ -23,7 +23,7 @@ FILE fqName: fileName:/lambdaInDataClassDefaultParameter.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): @[ExtensionFunctionType] kotlin.Function2<.A, kotlin.String, kotlin.Unit> declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<.A, kotlin.String, kotlin.Unit> visibility:public [final]' type=@[ExtensionFunctionType] kotlin.Function2<.A, kotlin.String, kotlin.Unit> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<.A, kotlin.String, kotlin.Unit> origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.A) returnType:@[ExtensionFunctionType] kotlin.Function2<.A, kotlin.String, kotlin.Unit> $this: VALUE_PARAMETER name: type:.A @@ -130,7 +130,7 @@ FILE fqName: fileName:/lambdaInDataClassDefaultParameter.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:B modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Any declared in .B.' type=kotlin.Any origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.B) returnType:kotlin.Any @@ -138,7 +138,7 @@ FILE fqName: fileName:/lambdaInDataClassDefaultParameter.kt $this: VALUE_PARAMETER name: type:.B BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in .B' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:public [final]' type=kotlin.Any origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null receiver: GET_VAR ': .B declared in .B.' type=.B origin=null FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.B) returnType:kotlin.Any $this: VALUE_PARAMETER name: type:.B diff --git a/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt b/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt index 54b8dd33608..de66b29ad14 100644 --- a/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt +++ b/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt @@ -17,7 +17,7 @@ FILE fqName: fileName:/objectLiteralExpressions.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Any visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Any visibility:private [final,static] EXPRESSION_BODY BLOCK type=.test1. origin=OBJECT_LITERAL CLASS CLASS name: modality:FINAL visibility:local superTypes:[kotlin.Any] @@ -44,9 +44,9 @@ FILE fqName: fileName:/objectLiteralExpressions.kt correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Any visibility:public [final,static]' type=kotlin.Any origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Any visibility:private [final,static]' type=kotlin.Any origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:.IFoo visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:.IFoo visibility:private [final,static] EXPRESSION_BODY BLOCK type=.test2. origin=OBJECT_LITERAL CLASS CLASS name: modality:FINAL visibility:local superTypes:[.IFoo] @@ -80,7 +80,7 @@ FILE fqName: fileName:/objectLiteralExpressions.kt correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): .IFoo declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:.IFoo visibility:public [final,static]' type=.IFoo origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:.IFoo visibility:private [final,static]' type=.IFoo origin=null CLASS CLASS name:Outer modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Outer CONSTRUCTOR visibility:public <> () returnType:.Outer [primary] diff --git a/compiler/testData/ir/irText/classes/objectWithInitializers.txt b/compiler/testData/ir/irText/classes/objectWithInitializers.txt index 75d4811a06c..4ae1b2026c0 100644 --- a/compiler/testData/ir/irText/classes/objectWithInitializers.txt +++ b/compiler/testData/ir/irText/classes/objectWithInitializers.txt @@ -25,7 +25,7 @@ FILE fqName: fileName:/objectWithInitializers.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .Base' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Test modality:FINAL visibility:public superTypes:[.Base]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test) returnType:kotlin.Int @@ -33,20 +33,20 @@ FILE fqName: fileName:/objectWithInitializers.kt $this: VALUE_PARAMETER name: type:.Test BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test declared in .Test.' type=.Test origin=null PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final] FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test) returnType:kotlin.Int correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [val] $this: VALUE_PARAMETER name: type:.Test BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test declared in .Test.' type=.Test origin=null ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Unit origin=null receiver: GET_VAR ': .Test declared in .Test' type=.Test origin=null value: CALL 'public final fun (): kotlin.Int declared in .Test' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .Test declared in .Test' type=.Test origin=null diff --git a/compiler/testData/ir/irText/classes/primaryConstructor.txt b/compiler/testData/ir/irText/classes/primaryConstructor.txt index 86a85d6987f..efcbd9d724c 100644 --- a/compiler/testData/ir/irText/classes/primaryConstructor.txt +++ b/compiler/testData/ir/irText/classes/primaryConstructor.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/primaryConstructor.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Test1.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.Int @@ -16,10 +16,10 @@ FILE fqName: fileName:/primaryConstructor.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'y: kotlin.Int declared in .Test1.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.Int @@ -27,7 +27,7 @@ FILE fqName: fileName:/primaryConstructor.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -51,7 +51,7 @@ FILE fqName: fileName:/primaryConstructor.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'y: kotlin.Int declared in .Test2.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test2) returnType:kotlin.Int @@ -59,10 +59,10 @@ FILE fqName: fileName:/primaryConstructor.kt $this: VALUE_PARAMETER name: type:.Test2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test2 declared in .Test2.' type=.Test2 origin=null PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Test2.' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test2) returnType:kotlin.Int @@ -70,7 +70,7 @@ FILE fqName: fileName:/primaryConstructor.kt $this: VALUE_PARAMETER name: type:.Test2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test2 declared in .Test2.' type=.Test2 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -94,7 +94,7 @@ FILE fqName: fileName:/primaryConstructor.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'y: kotlin.Int declared in .Test3.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.Int @@ -102,20 +102,20 @@ FILE fqName: fileName:/primaryConstructor.kt $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test3' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test3 declared in .Test3.' type=.Test3 origin=null PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.Int correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test3' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test3 declared in .Test3.' type=.Test3 origin=null ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Unit origin=null receiver: GET_VAR ': .Test3 declared in .Test3' type=.Test3 origin=null value: GET_VAR 'x: kotlin.Int declared in .Test3.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt index 097e557e183..285bef171c4 100644 --- a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt +++ b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt @@ -65,7 +65,7 @@ FILE fqName: fileName:/primaryConstructorWithSuperConstructorCall.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .Base' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestWithDelegatingConstructor modality:FINAL visibility:public superTypes:[.Base]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .TestWithDelegatingConstructor.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestWithDelegatingConstructor) returnType:kotlin.Int @@ -73,10 +73,10 @@ FILE fqName: fileName:/primaryConstructorWithSuperConstructorCall.kt $this: VALUE_PARAMETER name: type:.TestWithDelegatingConstructor BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestWithDelegatingConstructor' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestWithDelegatingConstructor declared in .TestWithDelegatingConstructor.' type=.TestWithDelegatingConstructor origin=null PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'y: kotlin.Int declared in .TestWithDelegatingConstructor.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestWithDelegatingConstructor) returnType:kotlin.Int @@ -84,7 +84,7 @@ FILE fqName: fileName:/primaryConstructorWithSuperConstructorCall.kt $this: VALUE_PARAMETER name: type:.TestWithDelegatingConstructor BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestWithDelegatingConstructor' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestWithDelegatingConstructor declared in .TestWithDelegatingConstructor.' type=.TestWithDelegatingConstructor origin=null CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:.TestWithDelegatingConstructor VALUE_PARAMETER name:x index:0 type:kotlin.Int diff --git a/compiler/testData/ir/irText/classes/sealedClasses.txt b/compiler/testData/ir/irText/classes/sealedClasses.txt index 2be3439a17b..620098aa6e2 100644 --- a/compiler/testData/ir/irText/classes/sealedClasses.txt +++ b/compiler/testData/ir/irText/classes/sealedClasses.txt @@ -13,7 +13,7 @@ FILE fqName: fileName:/sealedClasses.kt DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .Expr' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Const modality:FINAL visibility:public superTypes:[.Expr]' PROPERTY name:number visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:number type:kotlin.Double visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:number type:kotlin.Double visibility:private [final] EXPRESSION_BODY GET_VAR 'number: kotlin.Double declared in .Expr.Const.' type=kotlin.Double origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Expr.Const) returnType:kotlin.Double @@ -21,7 +21,7 @@ FILE fqName: fileName:/sealedClasses.kt $this: VALUE_PARAMETER name: type:.Expr.Const BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Double declared in .Expr.Const' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:number type:kotlin.Double visibility:public [final]' type=kotlin.Double origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:number type:kotlin.Double visibility:private [final]' type=kotlin.Double origin=null receiver: GET_VAR ': .Expr.Const declared in .Expr.Const.' type=.Expr.Const origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -45,7 +45,7 @@ FILE fqName: fileName:/sealedClasses.kt DELEGATING_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .Expr' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Sum modality:FINAL visibility:public superTypes:[.Expr]' PROPERTY name:e1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:e1 type:.Expr visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:e1 type:.Expr visibility:private [final] EXPRESSION_BODY GET_VAR 'e1: .Expr declared in .Expr.Sum.' type=.Expr origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Expr.Sum) returnType:.Expr @@ -53,10 +53,10 @@ FILE fqName: fileName:/sealedClasses.kt $this: VALUE_PARAMETER name: type:.Expr.Sum BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): .Expr declared in .Expr.Sum' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:e1 type:.Expr visibility:public [final]' type=.Expr origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:e1 type:.Expr visibility:private [final]' type=.Expr origin=null receiver: GET_VAR ': .Expr.Sum declared in .Expr.Sum.' type=.Expr.Sum origin=null PROPERTY name:e2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:e2 type:.Expr visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:e2 type:.Expr visibility:private [final] EXPRESSION_BODY GET_VAR 'e2: .Expr declared in .Expr.Sum.' type=.Expr origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Expr.Sum) returnType:.Expr @@ -64,7 +64,7 @@ FILE fqName: fileName:/sealedClasses.kt $this: VALUE_PARAMETER name: type:.Expr.Sum BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): .Expr declared in .Expr.Sum' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:e2 type:.Expr visibility:public [final]' type=.Expr origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:e2 type:.Expr visibility:private [final]' type=.Expr origin=null receiver: GET_VAR ': .Expr.Sum declared in .Expr.Sum.' type=.Expr.Sum origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt index 3d7b69be7b9..6bb32bdf43f 100644 --- a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt +++ b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt @@ -21,7 +21,7 @@ FILE fqName: fileName:/secondaryConstructorWithInitializersFromClassBody.k CLASS CLASS name:TestProperty modality:FINAL visibility:public superTypes:[.Base] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestProperty PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestProperty) returnType:kotlin.Int @@ -29,7 +29,7 @@ FILE fqName: fileName:/secondaryConstructorWithInitializersFromClassBody.k $this: VALUE_PARAMETER name: type:.TestProperty BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestProperty' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestProperty declared in .TestProperty.' type=.TestProperty origin=null CONSTRUCTOR visibility:public <> () returnType:.TestProperty BLOCK_BODY @@ -51,17 +51,17 @@ FILE fqName: fileName:/secondaryConstructorWithInitializersFromClassBody.k CLASS CLASS name:TestInitBlock modality:FINAL visibility:public superTypes:[.Base] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestInitBlock PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInitBlock) returnType:kotlin.Int correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] $this: VALUE_PARAMETER name: type:.TestInitBlock BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestInitBlock' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestInitBlock declared in .TestInitBlock.' type=.TestInitBlock origin=null ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Unit origin=null receiver: GET_VAR ': .TestInitBlock declared in .TestInitBlock' type=.TestInitBlock origin=null value: CONST Int type=kotlin.Int value=0 CONSTRUCTOR visibility:public <> () returnType:.TestInitBlock diff --git a/compiler/testData/ir/irText/classes/superCalls.txt b/compiler/testData/ir/irText/classes/superCalls.txt index b83fd33142a..e9c46bb82e1 100644 --- a/compiler/testData/ir/irText/classes/superCalls.txt +++ b/compiler/testData/ir/irText/classes/superCalls.txt @@ -9,7 +9,7 @@ FILE fqName: fileName:/superCalls.kt $this: VALUE_PARAMETER name: type:.Base BLOCK_BODY PROPERTY name:bar visibility:public modality:OPEN [val] - FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.String visibility:private [final] EXPRESSION_BODY CONST String type=kotlin.String value="" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:.Base) returnType:kotlin.String @@ -17,7 +17,7 @@ FILE fqName: fileName:/superCalls.kt $this: VALUE_PARAMETER name: type:.Base BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun (): kotlin.String declared in .Base' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .Base declared in .Base.' type=.Base origin=null FUN name:hashCode visibility:public modality:OPEN <> ($this:.Base) returnType:kotlin.Int overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.txt index d4f0d07d4e0..c048984d907 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/annotationsInAnnotationArguments.kt CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:.A1 [primary] VALUE_PARAMETER name:x index:0 type:kotlin.Int PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .A1.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A1) returnType:kotlin.Int @@ -12,7 +12,7 @@ FILE fqName: fileName:/annotationsInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:.A1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .A1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .A1 declared in .A1.' type=.A1 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -32,7 +32,7 @@ FILE fqName: fileName:/annotationsInAnnotationArguments.kt CONSTRUCTOR visibility:public <> (a:.A1) returnType:.A2 [primary] VALUE_PARAMETER name:a index:0 type:.A1 PROPERTY name:a visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:a type:.A1 visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:a type:.A1 visibility:private [final] EXPRESSION_BODY GET_VAR 'a: .A1 declared in .A2.' type=.A1 origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A2) returnType:.A1 @@ -40,7 +40,7 @@ FILE fqName: fileName:/annotationsInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:.A2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): .A1 declared in .A2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:a type:.A1 visibility:public [final]' type=.A1 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:a type:.A1 visibility:private [final]' type=.A1 origin=null receiver: GET_VAR ': .A2 declared in .A2.' type=.A2 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -60,7 +60,7 @@ FILE fqName: fileName:/annotationsInAnnotationArguments.kt CONSTRUCTOR visibility:public <> (xs:kotlin.Array<.A1>) returnType:.AA [primary] VALUE_PARAMETER name:xs index:0 type:kotlin.Array<.A1> PROPERTY name:xs visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array<.A1> visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array<.A1> visibility:private [final] EXPRESSION_BODY GET_VAR 'xs: kotlin.Array<.A1> declared in .AA.' type=kotlin.Array<.A1> origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.AA) returnType:kotlin.Array<.A1> @@ -68,7 +68,7 @@ FILE fqName: fileName:/annotationsInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:.AA BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array<.A1> declared in .AA' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array<.A1> visibility:public [final]' type=kotlin.Array<.A1> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array<.A1> visibility:private [final]' type=kotlin.Array<.A1> origin=null receiver: GET_VAR ': .AA declared in .AA.' type=.AA origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.txt index 35a3120ad94..c0bedb533ef 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.txt @@ -9,7 +9,7 @@ FILE fqName: fileName:/annotationsWithDefaultParameterValues.kt EXPRESSION_BODY CONST Int type=kotlin.Int value=42 PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.String declared in .A.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.String @@ -17,10 +17,10 @@ FILE fqName: fileName:/annotationsWithDefaultParameterValues.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'y: kotlin.Int declared in .A.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Int @@ -28,7 +28,7 @@ FILE fqName: fileName:/annotationsWithDefaultParameterValues.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.txt index 96be97f355c..c49b82a3381 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/annotationsWithVarargParameters.kt CONSTRUCTOR visibility:public <> (xs:kotlin.Array) returnType:.A [primary] VALUE_PARAMETER name:xs index:0 type:kotlin.Array varargElementType:kotlin.String [vararg] PROPERTY name:xs visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array visibility:private [final] EXPRESSION_BODY GET_VAR 'xs: kotlin.Array [vararg] declared in .A.' type=kotlin.Array origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Array @@ -12,7 +12,7 @@ FILE fqName: fileName:/annotationsWithVarargParameters.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array visibility:public [final]' type=kotlin.Array origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array visibility:private [final]' type=kotlin.Array origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.txt b/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.txt index caf98a26f38..9c10419c3da 100644 --- a/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.txt +++ b/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/arrayInAnnotationArguments.kt CONSTRUCTOR visibility:public <> (x:kotlin.IntArray) returnType:.TestAnnWithIntArray [primary] VALUE_PARAMETER name:x index:0 type:kotlin.IntArray PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.IntArray visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.IntArray visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.IntArray declared in .TestAnnWithIntArray.' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestAnnWithIntArray) returnType:kotlin.IntArray @@ -12,7 +12,7 @@ FILE fqName: fileName:/arrayInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:.TestAnnWithIntArray BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.IntArray declared in .TestAnnWithIntArray' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.IntArray visibility:public [final]' type=kotlin.IntArray origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.IntArray visibility:private [final]' type=kotlin.IntArray origin=null receiver: GET_VAR ': .TestAnnWithIntArray declared in .TestAnnWithIntArray.' type=.TestAnnWithIntArray origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -32,7 +32,7 @@ FILE fqName: fileName:/arrayInAnnotationArguments.kt CONSTRUCTOR visibility:public <> (x:kotlin.Array) returnType:.TestAnnWithStringArray [primary] VALUE_PARAMETER name:x index:0 type:kotlin.Array PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Array visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Array visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Array declared in .TestAnnWithStringArray.' type=kotlin.Array origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestAnnWithStringArray) returnType:kotlin.Array @@ -40,7 +40,7 @@ FILE fqName: fileName:/arrayInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:.TestAnnWithStringArray BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array declared in .TestAnnWithStringArray' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Array visibility:public [final]' type=kotlin.Array origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Array visibility:private [final]' type=kotlin.Array origin=null receiver: GET_VAR ': .TestAnnWithStringArray declared in .TestAnnWithStringArray.' type=.TestAnnWithStringArray origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.txt b/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.txt index 85f566f6485..90651957617 100644 --- a/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.txt +++ b/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/classLiteralInAnnotation.kt CONSTRUCTOR visibility:public <> (klass:kotlin.reflect.KClass<*>) returnType:.A [primary] VALUE_PARAMETER name:klass index:0 type:kotlin.reflect.KClass<*> PROPERTY name:klass visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:klass type:kotlin.reflect.KClass<*> visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:klass type:kotlin.reflect.KClass<*> visibility:private [final] EXPRESSION_BODY GET_VAR 'klass: kotlin.reflect.KClass<*> declared in .A.' type=kotlin.reflect.KClass<*> origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.reflect.KClass<*> @@ -12,7 +12,7 @@ FILE fqName: fileName:/classLiteralInAnnotation.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KClass<*> declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:klass type:kotlin.reflect.KClass<*> visibility:public [final]' type=kotlin.reflect.KClass<*> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:klass type:kotlin.reflect.KClass<*> visibility:private [final]' type=kotlin.reflect.KClass<*> origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.txt index ccc7769f7a8..a1c51887f22 100644 --- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/classesWithAnnotations.kt CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:.TestAnn [primary] VALUE_PARAMETER name:x index:0 type:kotlin.String PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.String declared in .TestAnn.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestAnn) returnType:kotlin.String @@ -12,7 +12,7 @@ FILE fqName: fileName:/classesWithAnnotations.kt $this: VALUE_PARAMETER name: type:.TestAnn BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .TestAnn' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .TestAnn declared in .TestAnn.' type=.TestAnn origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.txt b/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.txt index 2c8ecbaf860..0f15d8fbb5f 100644 --- a/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.txt +++ b/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.txt @@ -13,7 +13,7 @@ FILE fqName: fileName:/constExpressionsInAnnotationArguments.kt CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:.A [primary] VALUE_PARAMETER name:x index:0 type:kotlin.Int PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .A.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Int @@ -21,7 +21,7 @@ FILE fqName: fileName:/constExpressionsInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.txt index 0d7d8906d00..c4a23c4f0e2 100644 --- a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/constructorsWithAnnotations.kt CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:.TestAnn [primary] VALUE_PARAMETER name:x index:0 type:kotlin.Int PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .TestAnn.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestAnn) returnType:kotlin.Int @@ -12,7 +12,7 @@ FILE fqName: fileName:/constructorsWithAnnotations.kt $this: VALUE_PARAMETER name: type:.TestAnn BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestAnn' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestAnn declared in .TestAnn.' type=.TestAnn origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt index 6bb76389afd..9037151b967 100644 --- a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/delegatedPropertyAccessorsWithAnnotations.kt CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:.A [primary] VALUE_PARAMETER name:x index:0 type:kotlin.String PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.String declared in .A.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.String @@ -12,7 +12,7 @@ FILE fqName: fileName:/delegatedPropertyAccessorsWithAnnotations.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -35,7 +35,7 @@ FILE fqName: fileName:/delegatedPropertyAccessorsWithAnnotations.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Cell modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:private EXPRESSION_BODY GET_VAR 'value: kotlin.Int declared in .Cell.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Cell) returnType:kotlin.Int @@ -43,14 +43,14 @@ FILE fqName: fileName:/delegatedPropertyAccessorsWithAnnotations.kt $this: VALUE_PARAMETER name: type:.Cell BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Cell' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .Cell declared in .Cell.' type=.Cell origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Cell, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.Cell VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .Cell declared in .Cell.' type=.Cell origin=null value: GET_VAR ': kotlin.Int declared in .Cell.' type=kotlin.Int origin=null FUN name:getValue visibility:public modality:FINAL <> ($this:.Cell, thisRef:kotlin.Any?, kProp:kotlin.Any?) returnType:kotlin.Int diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.txt index 1f89b9eadf6..1e11fec6a07 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/enumEntriesWithAnnotations.kt CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:.TestAnn [primary] VALUE_PARAMETER name:x index:0 type:kotlin.String PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.String declared in .TestAnn.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestAnn) returnType:kotlin.String @@ -12,7 +12,7 @@ FILE fqName: fileName:/enumEntriesWithAnnotations.kt $this: VALUE_PARAMETER name: type:.TestAnn BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .TestAnn' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .TestAnn declared in .TestAnn.' type=.TestAnn origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -51,7 +51,7 @@ FILE fqName: fileName:/enumEntriesWithAnnotations.kt ENUM_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .TestEnum' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY2 modality:FINAL visibility:public superTypes:[.TestEnum]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestEnum.ENTRY2) returnType:kotlin.Int @@ -59,7 +59,7 @@ FILE fqName: fileName:/enumEntriesWithAnnotations.kt $this: VALUE_PARAMETER name: type:.TestEnum.ENTRY2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestEnum.ENTRY2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestEnum.ENTRY2 declared in .TestEnum.ENTRY2.' type=.TestEnum.ENTRY2 origin=null FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<.TestEnum>) returnType:kotlin.Any overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.txt index fcf308b73c0..fafcb3a0173 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.txt @@ -66,7 +66,7 @@ FILE fqName: fileName:/enumsInAnnotationArguments.kt CONSTRUCTOR visibility:public <> (x:.En) returnType:.TestAnn [primary] VALUE_PARAMETER name:x index:0 type:.En PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:.En visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:.En visibility:private [final] EXPRESSION_BODY GET_VAR 'x: .En declared in .TestAnn.' type=.En origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestAnn) returnType:.En @@ -74,7 +74,7 @@ FILE fqName: fileName:/enumsInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:.TestAnn BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): .En declared in .TestAnn' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:.En visibility:public [final]' type=.En origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:.En visibility:private [final]' type=.En origin=null receiver: GET_VAR ': .TestAnn declared in .TestAnn.' type=.TestAnn origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.txt index 9455e3d54d9..055323cf1cd 100644 --- a/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/fieldsWithAnnotations.kt CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:.TestAnn [primary] VALUE_PARAMETER name:x index:0 type:kotlin.String PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.String declared in .TestAnn.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestAnn) returnType:kotlin.String @@ -12,7 +12,7 @@ FILE fqName: fileName:/fieldsWithAnnotations.kt $this: VALUE_PARAMETER name: type:.TestAnn BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .TestAnn' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .TestAnn declared in .TestAnn.' type=.TestAnn origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -28,7 +28,7 @@ FILE fqName: fileName:/fieldsWithAnnotations.kt public open fun toString (): kotlin.String declared in kotlin.Annotation $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:testVal visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.String visibility:private [final,static] annotations: TestAnn(x = 'testVal.field') EXPRESSION_BODY @@ -37,9 +37,9 @@ FILE fqName: fileName:/fieldsWithAnnotations.kt correspondingProperty: PROPERTY name:testVal visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:testVar visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:testVar type:kotlin.String visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:testVar type:kotlin.String visibility:private [static] annotations: TestAnn(x = 'testVar.field') EXPRESSION_BODY @@ -48,10 +48,10 @@ FILE fqName: fileName:/fieldsWithAnnotations.kt correspondingProperty: PROPERTY name:testVar visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testVar type:kotlin.String visibility:public [static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testVar type:kotlin.String visibility:private [static]' type=kotlin.String origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.String) returnType:kotlin.Unit correspondingProperty: PROPERTY name:testVar visibility:public modality:FINAL [var] VALUE_PARAMETER name: index:0 type:kotlin.String BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testVar type:kotlin.String visibility:public [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testVar type:kotlin.String visibility:private [static]' type=kotlin.Unit origin=null value: GET_VAR ': kotlin.String declared in .' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.txt index 376b7b65690..71c49dca0e5 100644 --- a/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.txt @@ -8,7 +8,7 @@ FILE fqName:test fileName:/fileAnnotations.kt CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:test.A [primary] VALUE_PARAMETER name:x index:0 type:kotlin.String PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.String declared in test.A.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:test.A) returnType:kotlin.String @@ -16,7 +16,7 @@ FILE fqName:test fileName:/fileAnnotations.kt $this: VALUE_PARAMETER name: type:test.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in test.A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': test.A declared in test.A.' type=test.A origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.txt index 63f5efa83f9..6904b067da3 100644 --- a/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/functionsWithAnnotations.kt CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:.TestAnn [primary] VALUE_PARAMETER name:x index:0 type:kotlin.Int PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .TestAnn.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestAnn) returnType:kotlin.Int @@ -12,7 +12,7 @@ FILE fqName: fileName:/functionsWithAnnotations.kt $this: VALUE_PARAMETER name: type:.TestAnn BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestAnn' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestAnn declared in .TestAnn.' type=.TestAnn origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.txt index 99f7f1ea417..b206c71237f 100644 --- a/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/localDelegatedPropertiesWithAnnotations.kt CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:.A [primary] VALUE_PARAMETER name:x index:0 type:kotlin.String PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.String declared in .A.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.String @@ -12,7 +12,7 @@ FILE fqName: fileName:/localDelegatedPropertiesWithAnnotations.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.txt index 89b1a467f90..16de2b8e9dd 100644 --- a/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.txt @@ -25,7 +25,7 @@ FILE fqName: fileName:/primaryConstructorParameterWithAnnotations.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Test.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test) returnType:kotlin.Int @@ -33,7 +33,7 @@ FILE fqName: fileName:/primaryConstructorParameterWithAnnotations.kt $this: VALUE_PARAMETER name: type:.Test BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test declared in .Test.' type=.Test origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.txt index 27e83f03166..34193b068b9 100644 --- a/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/propertiesWithAnnotations.kt CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:.TestAnn [primary] VALUE_PARAMETER name:x index:0 type:kotlin.String PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.String declared in .TestAnn.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestAnn) returnType:kotlin.String @@ -12,7 +12,7 @@ FILE fqName: fileName:/propertiesWithAnnotations.kt $this: VALUE_PARAMETER name: type:.TestAnn BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .TestAnn' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .TestAnn declared in .TestAnn.' type=.TestAnn origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -30,11 +30,11 @@ FILE fqName: fileName:/propertiesWithAnnotations.kt PROPERTY name:testVal visibility:public modality:FINAL [val] annotations: TestAnn(x = 'testVal.property') - FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CONST String type=kotlin.String value="" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:testVal visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.txt index aaf7b595044..464084bcaae 100644 --- a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:.A [primary] VALUE_PARAMETER name:x index:0 type:kotlin.String PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.String declared in .A.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.String @@ -12,7 +12,7 @@ FILE fqName: fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -36,7 +36,7 @@ FILE fqName: fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .C.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -46,10 +46,10 @@ FILE fqName: fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null PROPERTY name:y visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private EXPRESSION_BODY GET_VAR 'y: kotlin.Int declared in .C.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -59,7 +59,7 @@ FILE fqName: fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C, :kotlin.Int) returnType:kotlin.Unit annotations: @@ -68,7 +68,7 @@ FILE fqName: fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null value: GET_VAR ': kotlin.Int declared in .C.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.txt index 228f878d0f6..ead25efeba6 100644 --- a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/propertyAccessorsWithAnnotations.kt CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:.TestAnn [primary] VALUE_PARAMETER name:x index:0 type:kotlin.String PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.String declared in .TestAnn.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestAnn) returnType:kotlin.String @@ -12,7 +12,7 @@ FILE fqName: fileName:/propertyAccessorsWithAnnotations.kt $this: VALUE_PARAMETER name: type:.TestAnn BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .TestAnn' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .TestAnn declared in .TestAnn.' type=.TestAnn origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -50,7 +50,7 @@ FILE fqName: fileName:/propertyAccessorsWithAnnotations.kt VALUE_PARAMETER name:value index:0 type:kotlin.String BLOCK_BODY PROPERTY name:test3 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CONST String type=kotlin.String value="" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String @@ -59,9 +59,9 @@ FILE fqName: fileName:/propertyAccessorsWithAnnotations.kt correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:test4 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:private [static] EXPRESSION_BODY CONST String type=kotlin.String value="" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String @@ -70,12 +70,12 @@ FILE fqName: fileName:/propertyAccessorsWithAnnotations.kt correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:public [static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:private [static]' type=kotlin.String origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.String) returnType:kotlin.Unit annotations: TestAnn(x = 'test4.set') correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [var] VALUE_PARAMETER name: index:0 type:kotlin.String BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:public [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:private [static]' type=kotlin.Unit origin=null value: GET_VAR ': kotlin.String declared in .' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.txt index 9ee997e572f..228990aa573 100644 --- a/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.txt @@ -16,21 +16,21 @@ FILE fqName: fileName:/propertySetterParameterWithAnnotations.kt public open fun toString (): kotlin.String declared in kotlin.Annotation $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:p visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:p visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:p visibility:public modality:FINAL [var] VALUE_PARAMETER name: index:0 type:kotlin.Int annotations: AnnParam BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: GET_VAR ': kotlin.Int declared in .' type=kotlin.Int origin=null CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.C @@ -40,7 +40,7 @@ FILE fqName: fileName:/propertySetterParameterWithAnnotations.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:p visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private EXPRESSION_BODY GET_VAR 'p: kotlin.Int declared in .C.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -48,7 +48,7 @@ FILE fqName: fileName:/propertySetterParameterWithAnnotations.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:p visibility:public modality:FINAL [var] @@ -57,7 +57,7 @@ FILE fqName: fileName:/propertySetterParameterWithAnnotations.kt annotations: AnnParam BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null value: GET_VAR ': kotlin.Int declared in .C.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.txt b/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.txt index 61f3c44ccd2..90fa219253e 100644 --- a/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.txt +++ b/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/spreadOperatorInAnnotationArguments.kt CONSTRUCTOR visibility:public <> (xs:kotlin.Array) returnType:.A [primary] VALUE_PARAMETER name:xs index:0 type:kotlin.Array varargElementType:kotlin.String [vararg] PROPERTY name:xs visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array visibility:private [final] EXPRESSION_BODY GET_VAR 'xs: kotlin.Array [vararg] declared in .A.' type=kotlin.Array origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Array @@ -12,7 +12,7 @@ FILE fqName: fileName:/spreadOperatorInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array visibility:public [final]' type=kotlin.Array origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array visibility:private [final]' type=kotlin.Array origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.txt index dc67b8251c1..12e5cd92dd6 100644 --- a/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.txt @@ -6,7 +6,7 @@ FILE fqName: fileName:/typeAliasesWithAnnotations.kt CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:.TestAnn [primary] VALUE_PARAMETER name:x index:0 type:kotlin.String PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.String declared in .TestAnn.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestAnn) returnType:kotlin.String @@ -14,7 +14,7 @@ FILE fqName: fileName:/typeAliasesWithAnnotations.kt $this: VALUE_PARAMETER name: type:.TestAnn BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .TestAnn' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .TestAnn declared in .TestAnn.' type=.TestAnn origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.txt index 5882ef679d2..4eb7fa4006c 100644 --- a/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/valueParametersWithAnnotations.kt CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:.TestAnn [primary] VALUE_PARAMETER name:x index:0 type:kotlin.String PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.String declared in .TestAnn.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestAnn) returnType:kotlin.String @@ -12,7 +12,7 @@ FILE fqName: fileName:/valueParametersWithAnnotations.kt $this: VALUE_PARAMETER name: type:.TestAnn BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .TestAnn' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .TestAnn declared in .TestAnn.' type=.TestAnn origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -42,7 +42,7 @@ FILE fqName: fileName:/valueParametersWithAnnotations.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestClassConstructor1 modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:xx visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .TestClassConstructor1.' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestClassConstructor1) returnType:kotlin.Int @@ -50,7 +50,7 @@ FILE fqName: fileName:/valueParametersWithAnnotations.kt $this: VALUE_PARAMETER name: type:.TestClassConstructor1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestClassConstructor1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestClassConstructor1 declared in .TestClassConstructor1.' type=.TestClassConstructor1 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.txt b/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.txt index f449db7f378..a215eee6821 100644 --- a/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.txt +++ b/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/varargsInAnnotationArguments.kt CONSTRUCTOR visibility:public <> (xs:kotlin.IntArray) returnType:.A1 [primary] VALUE_PARAMETER name:xs index:0 type:kotlin.IntArray varargElementType:kotlin.Int [vararg] PROPERTY name:xs visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.IntArray visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.IntArray visibility:private [final] EXPRESSION_BODY GET_VAR 'xs: kotlin.IntArray [vararg] declared in .A1.' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A1) returnType:kotlin.IntArray @@ -12,7 +12,7 @@ FILE fqName: fileName:/varargsInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:.A1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.IntArray declared in .A1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.IntArray visibility:public [final]' type=kotlin.IntArray origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.IntArray visibility:private [final]' type=kotlin.IntArray origin=null receiver: GET_VAR ': .A1 declared in .A1.' type=.A1 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -32,7 +32,7 @@ FILE fqName: fileName:/varargsInAnnotationArguments.kt CONSTRUCTOR visibility:public <> (xs:kotlin.Array) returnType:.A2 [primary] VALUE_PARAMETER name:xs index:0 type:kotlin.Array varargElementType:kotlin.String [vararg] PROPERTY name:xs visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array visibility:private [final] EXPRESSION_BODY GET_VAR 'xs: kotlin.Array [vararg] declared in .A2.' type=kotlin.Array origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A2) returnType:kotlin.Array @@ -40,7 +40,7 @@ FILE fqName: fileName:/varargsInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:.A2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array declared in .A2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array visibility:public [final]' type=kotlin.Array origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array visibility:private [final]' type=kotlin.Array origin=null receiver: GET_VAR ': .A2 declared in .A2.' type=.A2 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -60,7 +60,7 @@ FILE fqName: fileName:/varargsInAnnotationArguments.kt CONSTRUCTOR visibility:public <> (xs:kotlin.Array.A1>) returnType:.AA [primary] VALUE_PARAMETER name:xs index:0 type:kotlin.Array.A1> varargElementType:.A1 [vararg] PROPERTY name:xs visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array.A1> visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array.A1> visibility:private [final] EXPRESSION_BODY GET_VAR 'xs: kotlin.Array.A1> [vararg] declared in .AA.' type=kotlin.Array.A1> origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.AA) returnType:kotlin.Array.A1> @@ -68,7 +68,7 @@ FILE fqName: fileName:/varargsInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:.AA BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array.A1> declared in .AA' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array.A1> visibility:public [final]' type=kotlin.Array.A1> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Array.A1> visibility:private [final]' type=kotlin.Array.A1> origin=null receiver: GET_VAR ': .AA declared in .AA.' type=.AA origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.txt index 7e20b5717be..3c6aec946a4 100644 --- a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/variablesWithAnnotations.kt CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:.TestAnn [primary] VALUE_PARAMETER name:x index:0 type:kotlin.String PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.String declared in .TestAnn.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestAnn) returnType:kotlin.String @@ -12,7 +12,7 @@ FILE fqName: fileName:/variablesWithAnnotations.kt $this: VALUE_PARAMETER name: type:.TestAnn BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .TestAnn' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .TestAnn declared in .TestAnn.' type=.TestAnn origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/catchParameterInTopLevelProperty.txt b/compiler/testData/ir/irText/declarations/catchParameterInTopLevelProperty.txt index bba6099331a..8c68b4766cb 100644 --- a/compiler/testData/ir/irText/declarations/catchParameterInTopLevelProperty.txt +++ b/compiler/testData/ir/irText/declarations/catchParameterInTopLevelProperty.txt @@ -1,6 +1,6 @@ FILE fqName: fileName:/catchParameterInTopLevelProperty.kt PROPERTY name:test visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Unit visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Unit visibility:private [final,static] EXPRESSION_BODY TRY type=kotlin.Unit try: BLOCK type=kotlin.Unit origin=null @@ -11,4 +11,4 @@ FILE fqName: fileName:/catchParameterInTopLevelProperty.kt correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Unit declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Unit visibility:public [final,static]' type=kotlin.Unit origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Unit visibility:private [final,static]' type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/declarations/classLevelProperties.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.txt index 072f1dba940..2a1b98708ba 100644 --- a/compiler/testData/ir/irText/declarations/classLevelProperties.txt +++ b/compiler/testData/ir/irText/declarations/classLevelProperties.txt @@ -6,7 +6,7 @@ FILE fqName: fileName:/classLevelProperties.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -14,7 +14,7 @@ FILE fqName: fileName:/classLevelProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] FUN name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -24,7 +24,7 @@ FILE fqName: fileName:/classLevelProperties.kt RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' CONST Int type=kotlin.Int value=0 PROPERTY name:test3 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -32,18 +32,18 @@ FILE fqName: fileName:/classLevelProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null value: GET_VAR ': kotlin.Int declared in .C.' type=kotlin.Int origin=null PROPERTY name:test4 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -51,18 +51,18 @@ FILE fqName: fileName:/classLevelProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN name: visibility:public modality:FINAL <> ($this:.C, value:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public' type=kotlin.Unit origin=EQ + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private' type=kotlin.Unit origin=EQ receiver: GET_VAR ': .C declared in .C.' type=.C origin=null value: GET_VAR 'value: kotlin.Int declared in .C.' type=kotlin.Int origin=null PROPERTY name:test5 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -70,18 +70,18 @@ FILE fqName: fileName:/classLevelProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> ($this:.C, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:test5 visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null value: GET_VAR ': kotlin.Int declared in .C.' type=kotlin.Int origin=null PROPERTY name:test6 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -89,7 +89,7 @@ FILE fqName: fileName:/classLevelProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null PROPERTY name:test7 visibility:public modality:FINAL [delegated,val] FIELD DELEGATE name:test7$delegate type:kotlin.Lazy visibility:private [final] diff --git a/compiler/testData/ir/irText/declarations/delegatedProperties.txt b/compiler/testData/ir/irText/declarations/delegatedProperties.txt index 1777747cf15..2c0e556ee65 100644 --- a/compiler/testData/ir/irText/declarations/delegatedProperties.txt +++ b/compiler/testData/ir/irText/declarations/delegatedProperties.txt @@ -26,7 +26,7 @@ FILE fqName: fileName:/delegatedProperties.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:map visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.MutableMap visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.MutableMap visibility:private [final] EXPRESSION_BODY GET_VAR 'map: kotlin.collections.MutableMap declared in .C.' type=kotlin.collections.MutableMap origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.collections.MutableMap @@ -34,7 +34,7 @@ FILE fqName: fileName:/delegatedProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.collections.MutableMap declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.MutableMap visibility:public [final]' type=kotlin.collections.MutableMap origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.MutableMap visibility:private [final]' type=kotlin.collections.MutableMap origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null PROPERTY name:test2 visibility:public modality:FINAL [delegated,val] FIELD DELEGATE name:test2$delegate type:kotlin.Lazy visibility:private [final] diff --git a/compiler/testData/ir/irText/declarations/fakeOverrides.txt b/compiler/testData/ir/irText/declarations/fakeOverrides.txt index 8d62dfa4061..703c1bc1560 100644 --- a/compiler/testData/ir/irText/declarations/fakeOverrides.txt +++ b/compiler/testData/ir/irText/declarations/fakeOverrides.txt @@ -68,7 +68,7 @@ FILE fqName: fileName:/fakeOverrides.kt : kotlin.String INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[.CFoo; .IFooStr; .IBar]' PROPERTY name:bar visibility:public modality:OPEN [val] - FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:.Test1) returnType:kotlin.Int @@ -78,7 +78,7 @@ FILE fqName: fileName:/fakeOverrides.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun (): kotlin.Int declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:.CFoo, x:kotlin.String) returnType:kotlin.Unit overridden: diff --git a/compiler/testData/ir/irText/declarations/fileWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/fileWithAnnotations.fir.txt new file mode 100644 index 00000000000..6186187ff64 --- /dev/null +++ b/compiler/testData/ir/irText/declarations/fileWithAnnotations.fir.txt @@ -0,0 +1,14 @@ +FILE fqName: fileName:/fileWithAnnotations.kt + annotations: + JvmName(name = 'FileWithAnnotations') + FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit + BLOCK_BODY + PROPERTY name:bar visibility:public modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public [final,static] + EXPRESSION_BODY + CONST Int type=kotlin.Int value=42 + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int + correspondingProperty: PROPERTY name:bar visibility:public modality:FINAL [val] + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/declarations/fileWithAnnotations.kt b/compiler/testData/ir/irText/declarations/fileWithAnnotations.kt index 0e0f4174bbb..9a773aa6858 100644 --- a/compiler/testData/ir/irText/declarations/fileWithAnnotations.kt +++ b/compiler/testData/ir/irText/declarations/fileWithAnnotations.kt @@ -1,4 +1,3 @@ -// FIR_IDENTICAL // WITH_RUNTIME @file:JvmName("FileWithAnnotations") diff --git a/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt b/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt index 6186187ff64..53dd97b4174 100644 --- a/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt @@ -4,11 +4,11 @@ FILE fqName: fileName:/fileWithAnnotations.kt FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY PROPERTY name:bar visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:bar visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/declarations/kt29833.txt b/compiler/testData/ir/irText/declarations/kt29833.txt index 3b641ec657b..136d2e8ea76 100644 --- a/compiler/testData/ir/irText/declarations/kt29833.txt +++ b/compiler/testData/ir/irText/declarations/kt29833.txt @@ -17,7 +17,7 @@ FILE fqName:interop fileName:/Definitions.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:KT_CONSTANT type:kotlin.String visibility:public [final]' type=kotlin.String origin=null receiver: GET_VAR ': interop.Definitions declared in interop.Definitions.' type=interop.Definitions origin=null PROPERTY name:ktValue visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:ktValue type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:ktValue type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:CONSTANT type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=GET_PROPERTY FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:interop.Definitions) returnType:kotlin.String @@ -25,7 +25,7 @@ FILE fqName:interop fileName:/Definitions.kt $this: VALUE_PARAMETER name: type:interop.Definitions BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in interop.Definitions' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ktValue type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ktValue type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': interop.Definitions declared in interop.Definitions.' type=interop.Definitions origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/localClassWithOverrides.txt b/compiler/testData/ir/irText/declarations/localClassWithOverrides.txt index 319bcdb0585..2cbcd98e0ed 100644 --- a/compiler/testData/ir/irText/declarations/localClassWithOverrides.txt +++ b/compiler/testData/ir/irText/declarations/localClassWithOverrides.txt @@ -46,7 +46,7 @@ FILE fqName: fileName:/localClassWithOverrides.kt $this: VALUE_PARAMETER name: type:.outer.Local BLOCK_BODY PROPERTY name:aval visibility:public modality:OPEN [val] - FIELD PROPERTY_BACKING_FIELD name:aval type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:aval type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:.outer.Local) returnType:kotlin.Int @@ -56,10 +56,10 @@ FILE fqName: fileName:/localClassWithOverrides.kt $this: VALUE_PARAMETER name: type:.outer.Local BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun (): kotlin.Int declared in .outer.Local' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:aval type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:aval type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .outer.Local declared in .outer.Local.' type=.outer.Local origin=null PROPERTY name:avar visibility:public modality:OPEN [var] - FIELD PROPERTY_BACKING_FIELD name:avar type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:avar type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=2 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:.outer.Local) returnType:kotlin.Int @@ -69,7 +69,7 @@ FILE fqName: fileName:/localClassWithOverrides.kt $this: VALUE_PARAMETER name: type:.outer.Local BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun (): kotlin.Int declared in .outer.Local' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:avar type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:avar type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .outer.Local declared in .outer.Local.' type=.outer.Local origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:.outer.Local, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:avar visibility:public modality:OPEN [var] @@ -78,7 +78,7 @@ FILE fqName: fileName:/localClassWithOverrides.kt $this: VALUE_PARAMETER name: type:.outer.Local VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:avar type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:avar type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .outer.Local declared in .outer.Local.' type=.outer.Local origin=null value: GET_VAR ': kotlin.Int declared in .outer.Local.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/irText/declarations/packageLevelProperties.txt b/compiler/testData/ir/irText/declarations/packageLevelProperties.txt index dd6e4ad8634..4bb665796d4 100644 --- a/compiler/testData/ir/irText/declarations/packageLevelProperties.txt +++ b/compiler/testData/ir/irText/declarations/packageLevelProperties.txt @@ -1,13 +1,13 @@ FILE fqName: fileName:/packageLevelProperties.kt PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] FUN name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] @@ -15,59 +15,59 @@ FILE fqName: fileName:/packageLevelProperties.kt RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' CONST Int type=kotlin.Int value=0 PROPERTY name:test3 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [var] VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: GET_VAR ': kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:test4 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null FUN name: visibility:public modality:FINAL <> (value:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=EQ + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=EQ value: GET_VAR 'value: kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:test5 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:test5 visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> (:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:test5 visibility:public modality:FINAL [var] VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: GET_VAR ': kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:test6 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:test6 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:test7 visibility:public modality:FINAL [delegated,val] FIELD DELEGATE name:test7$delegate type:kotlin.Lazy visibility:private [final,static] EXPRESSION_BODY diff --git a/compiler/testData/ir/irText/declarations/parameters/constructor.txt b/compiler/testData/ir/irText/declarations/parameters/constructor.txt index 6c4d768a19e..10ece936968 100644 --- a/compiler/testData/ir/irText/declarations/parameters/constructor.txt +++ b/compiler/testData/ir/irText/declarations/parameters/constructor.txt @@ -10,7 +10,7 @@ FILE fqName: fileName:/constructor.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:T1 of .Test1 visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:T1 of .Test1 visibility:private [final] EXPRESSION_BODY GET_VAR 'x: T1 of .Test1 declared in .Test1.' type=T1 of .Test1 origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1.Test1, T2 of .Test1>) returnType:T1 of .Test1 @@ -18,10 +18,10 @@ FILE fqName: fileName:/constructor.kt $this: VALUE_PARAMETER name: type:.Test1.Test1, T2 of .Test1> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T1 of .Test1 declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T1 of .Test1 visibility:public [final]' type=T1 of .Test1 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T1 of .Test1 visibility:private [final]' type=T1 of .Test1 origin=null receiver: GET_VAR ': .Test1.Test1, T2 of .Test1> declared in .Test1.' type=.Test1.Test1, T2 of .Test1> origin=null PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:T2 of .Test1 visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:T2 of .Test1 visibility:private [final] EXPRESSION_BODY GET_VAR 'y: T2 of .Test1 declared in .Test1.' type=T2 of .Test1 origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1.Test1, T2 of .Test1>) returnType:T2 of .Test1 @@ -29,7 +29,7 @@ FILE fqName: fileName:/constructor.kt $this: VALUE_PARAMETER name: type:.Test1.Test1, T2 of .Test1> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T2 of .Test1 declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:T2 of .Test1 visibility:public [final]' type=T2 of .Test1 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:T2 of .Test1 visibility:private [final]' type=T2 of .Test1 origin=null receiver: GET_VAR ': .Test1.Test1, T2 of .Test1> declared in .Test1.' type=.Test1.Test1, T2 of .Test1> origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -53,7 +53,7 @@ FILE fqName: fileName:/constructor.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'y: kotlin.String declared in .Test2.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test2) returnType:kotlin.String @@ -61,7 +61,7 @@ FILE fqName: fileName:/constructor.kt $this: VALUE_PARAMETER name: type:.Test2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Test2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .Test2 declared in .Test2.' type=.Test2 origin=null CLASS CLASS name:TestInner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test2.TestInner.Test2.TestInner> @@ -73,7 +73,7 @@ FILE fqName: fileName:/constructor.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]' PROPERTY name:z visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:z type:Z of .Test2.TestInner visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:z type:Z of .Test2.TestInner visibility:private [final] EXPRESSION_BODY GET_VAR 'z: Z of .Test2.TestInner declared in .Test2.TestInner.' type=Z of .Test2.TestInner origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test2.TestInner.Test2.TestInner>) returnType:Z of .Test2.TestInner @@ -81,7 +81,7 @@ FILE fqName: fileName:/constructor.kt $this: VALUE_PARAMETER name: type:.Test2.TestInner.Test2.TestInner> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): Z of .Test2.TestInner declared in .Test2.TestInner' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:Z of .Test2.TestInner visibility:public [final]' type=Z of .Test2.TestInner origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:Z of .Test2.TestInner visibility:private [final]' type=Z of .Test2.TestInner origin=null receiver: GET_VAR ': .Test2.TestInner.Test2.TestInner> declared in .Test2.TestInner.' type=.Test2.TestInner.Test2.TestInner> origin=null CONSTRUCTOR visibility:public <> ($this:.Test2, z:Z of .Test2.TestInner, i:kotlin.Int) returnType:.Test2.TestInner.Test2.TestInner> $outer: VALUE_PARAMETER name: type:.Test2 @@ -129,7 +129,7 @@ FILE fqName: fileName:/constructor.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Test3.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.Int @@ -137,10 +137,10 @@ FILE fqName: fileName:/constructor.kt $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test3' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test3 declared in .Test3.' type=.Test3 origin=null PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'y: kotlin.String declared in .Test3.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.String @@ -148,7 +148,7 @@ FILE fqName: fileName:/constructor.kt $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Test3' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .Test3 declared in .Test3.' type=.Test3 origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -172,7 +172,7 @@ FILE fqName: fileName:/constructor.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test4 modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Test4.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test4.Test4>) returnType:kotlin.Int @@ -180,7 +180,7 @@ FILE fqName: fileName:/constructor.kt $this: VALUE_PARAMETER name: type:.Test4.Test4> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test4' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test4.Test4> declared in .Test4.' type=.Test4.Test4> origin=null CONSTRUCTOR visibility:public <> (x:kotlin.Int, y:kotlin.Int) returnType:.Test4.Test4> VALUE_PARAMETER name:x index:0 type:kotlin.Int diff --git a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt index cbc9621cede..67aeb85baea 100644 --- a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt +++ b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt @@ -11,7 +11,7 @@ FILE fqName: fileName:/dataClassMembers.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test visibility:private [final] EXPRESSION_BODY GET_VAR 'x: T of .Test declared in .Test.' type=T of .Test origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test.Test>) returnType:T of .Test @@ -19,10 +19,10 @@ FILE fqName: fileName:/dataClassMembers.kt $this: VALUE_PARAMETER name: type:.Test.Test> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of .Test declared in .Test' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test visibility:public [final]' type=T of .Test origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test visibility:private [final]' type=T of .Test origin=null receiver: GET_VAR ': .Test.Test> declared in .Test.' type=.Test.Test> origin=null PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'y: kotlin.String declared in .Test.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test.Test>) returnType:kotlin.String @@ -30,7 +30,7 @@ FILE fqName: fileName:/dataClassMembers.kt $this: VALUE_PARAMETER name: type:.Test.Test> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Test' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .Test.Test> declared in .Test.' type=.Test.Test> origin=null FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.Test.Test>) returnType:T of .Test $this: VALUE_PARAMETER name: type:.Test.Test> diff --git a/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt b/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt index 9b039629cf5..bc7043880e5 100644 --- a/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt +++ b/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt @@ -1,27 +1,27 @@ FILE fqName: fileName:/defaultPropertyAccessors.kt PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:test2 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [var] VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: GET_VAR ': kotlin.Int declared in .' type=kotlin.Int origin=null CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Host @@ -30,7 +30,7 @@ FILE fqName: fileName:/defaultPropertyAccessors.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:testMember1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testMember1 type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:testMember1 type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Host) returnType:kotlin.Int @@ -38,10 +38,10 @@ FILE fqName: fileName:/defaultPropertyAccessors.kt $this: VALUE_PARAMETER name: type:.Host BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Host' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testMember1 type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testMember1 type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Host declared in .Host.' type=.Host origin=null PROPERTY name:testMember2 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:testMember2 type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:testMember2 type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Host) returnType:kotlin.Int @@ -49,14 +49,14 @@ FILE fqName: fileName:/defaultPropertyAccessors.kt $this: VALUE_PARAMETER name: type:.Host BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Host' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testMember2 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testMember2 type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .Host declared in .Host.' type=.Host origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Host, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:testMember2 visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.Host VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testMember2 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testMember2 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .Host declared in .Host.' type=.Host origin=null value: GET_VAR ': kotlin.Int declared in .Host.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean @@ -84,7 +84,7 @@ FILE fqName: fileName:/defaultPropertyAccessors.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:InPrimaryCtor modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:testInPrimaryCtor1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testInPrimaryCtor1 type:T of .InPrimaryCtor visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:testInPrimaryCtor1 type:T of .InPrimaryCtor visibility:private [final] EXPRESSION_BODY GET_VAR 'testInPrimaryCtor1: T of .InPrimaryCtor declared in .InPrimaryCtor.' type=T of .InPrimaryCtor origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.InPrimaryCtor.InPrimaryCtor>) returnType:T of .InPrimaryCtor @@ -92,10 +92,10 @@ FILE fqName: fileName:/defaultPropertyAccessors.kt $this: VALUE_PARAMETER name: type:.InPrimaryCtor.InPrimaryCtor> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of .InPrimaryCtor declared in .InPrimaryCtor' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testInPrimaryCtor1 type:T of .InPrimaryCtor visibility:public [final]' type=T of .InPrimaryCtor origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testInPrimaryCtor1 type:T of .InPrimaryCtor visibility:private [final]' type=T of .InPrimaryCtor origin=null receiver: GET_VAR ': .InPrimaryCtor.InPrimaryCtor> declared in .InPrimaryCtor.' type=.InPrimaryCtor.InPrimaryCtor> origin=null PROPERTY name:testInPrimaryCtor2 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:testInPrimaryCtor2 type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:testInPrimaryCtor2 type:kotlin.Int visibility:private EXPRESSION_BODY GET_VAR 'testInPrimaryCtor2: kotlin.Int declared in .InPrimaryCtor.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.InPrimaryCtor.InPrimaryCtor>) returnType:kotlin.Int @@ -103,14 +103,14 @@ FILE fqName: fileName:/defaultPropertyAccessors.kt $this: VALUE_PARAMETER name: type:.InPrimaryCtor.InPrimaryCtor> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .InPrimaryCtor' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testInPrimaryCtor2 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testInPrimaryCtor2 type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .InPrimaryCtor.InPrimaryCtor> declared in .InPrimaryCtor.' type=.InPrimaryCtor.InPrimaryCtor> origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.InPrimaryCtor.InPrimaryCtor>, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:testInPrimaryCtor2 visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.InPrimaryCtor.InPrimaryCtor> VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testInPrimaryCtor2 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testInPrimaryCtor2 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .InPrimaryCtor.InPrimaryCtor> declared in .InPrimaryCtor.' type=.InPrimaryCtor.InPrimaryCtor> origin=null value: GET_VAR ': kotlin.Int declared in .InPrimaryCtor.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/irText/declarations/parameters/lambdas.txt b/compiler/testData/ir/irText/declarations/parameters/lambdas.txt index a24d6e79541..c58d27fdbb1 100644 --- a/compiler/testData/ir/irText/declarations/parameters/lambdas.txt +++ b/compiler/testData/ir/irText/declarations/parameters/lambdas.txt @@ -1,6 +1,6 @@ FILE fqName: fileName:/lambdas.kt PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1 visibility:private [final,static] EXPRESSION_BODY FUN_EXPR type=kotlin.Function1 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:kotlin.String) returnType:kotlin.String @@ -12,9 +12,9 @@ FILE fqName: fileName:/lambdas.kt correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function1 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1 visibility:public [final,static]' type=kotlin.Function1 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1 visibility:private [final,static]' type=kotlin.Function1 origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:@[ExtensionFunctionType] kotlin.Function2 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:@[ExtensionFunctionType] kotlin.Function2 visibility:private [final,static] EXPRESSION_BODY FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function2 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:kotlin.Any, it:kotlin.Any) returnType:kotlin.Int @@ -28,9 +28,9 @@ FILE fqName: fileName:/lambdas.kt correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): @[ExtensionFunctionType] kotlin.Function2 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:@[ExtensionFunctionType] kotlin.Function2 visibility:public [final,static]' type=@[ExtensionFunctionType] kotlin.Function2 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:@[ExtensionFunctionType] kotlin.Function2 visibility:private [final,static]' type=@[ExtensionFunctionType] kotlin.Function2 origin=null PROPERTY name:test3 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function2 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function2 visibility:private [final,static] EXPRESSION_BODY FUN_EXPR type=kotlin.Function2 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (i:kotlin.Int, j:kotlin.Int) returnType:kotlin.Unit @@ -43,9 +43,9 @@ FILE fqName: fileName:/lambdas.kt correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function2 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function2 visibility:public [final,static]' type=kotlin.Function2 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function2 visibility:private [final,static]' type=kotlin.Function2 origin=null PROPERTY name:test4 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Function2 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Function2 visibility:private [final,static] EXPRESSION_BODY FUN_EXPR type=kotlin.Function2 origin=ANONYMOUS_FUNCTION FUN name: visibility:local modality:FINAL <> (i:kotlin.Int, j:kotlin.Int) returnType:kotlin.Unit @@ -56,4 +56,4 @@ FILE fqName: fileName:/lambdas.kt correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function2 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Function2 visibility:public [final,static]' type=kotlin.Function2 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Function2 visibility:private [final,static]' type=kotlin.Function2 origin=null diff --git a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.fir.txt b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.fir.txt new file mode 100644 index 00000000000..d38e761d9da --- /dev/null +++ b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.fir.txt @@ -0,0 +1,34 @@ +FILE fqName: fileName:/primaryCtorDefaultArguments.kt + CLASS CLASS name:Test modality:FINAL visibility:public superTypes:[kotlin.Any] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test + CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:.Test [primary] + VALUE_PARAMETER name:x index:0 type:kotlin.Int + EXPRESSION_BODY + CONST Int type=kotlin.Int value=0 + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test modality:FINAL visibility:public superTypes:[kotlin.Any]' + PROPERTY name:x visibility:public modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + EXPRESSION_BODY + GET_VAR 'x: kotlin.Int declared in .Test.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test) returnType:kotlin.Int + correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] + $this: VALUE_PARAMETER name: type:.Test + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + receiver: GET_VAR ': .Test declared in .Test.' type=.Test origin=null + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean + overridden: + public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + VALUE_PARAMETER name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int + overridden: + public open fun hashCode (): kotlin.Int declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String + overridden: + public open fun toString (): kotlin.String declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any diff --git a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.kt b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.kt index db717afd929..600e99d57f9 100644 --- a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.kt +++ b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.kt @@ -1,3 +1 @@ -// FIR_IDENTICAL - class Test(val x: Int = 0) \ No newline at end of file diff --git a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt index d38e761d9da..9aaf746c521 100644 --- a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt +++ b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt @@ -9,7 +9,7 @@ FILE fqName: fileName:/primaryCtorDefaultArguments.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Test.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test) returnType:kotlin.Int @@ -17,7 +17,7 @@ FILE fqName: fileName:/primaryCtorDefaultArguments.kt $this: VALUE_PARAMETER name: type:.Test BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test declared in .Test.' type=.Test origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/primaryCtorProperties.fir.txt b/compiler/testData/ir/irText/declarations/primaryCtorProperties.fir.txt new file mode 100644 index 00000000000..20d10f76b20 --- /dev/null +++ b/compiler/testData/ir/irText/declarations/primaryCtorProperties.fir.txt @@ -0,0 +1,52 @@ +FILE fqName: fileName:/primaryCtorProperties.kt + CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.C + CONSTRUCTOR visibility:public <> (test1:kotlin.Int, test2:kotlin.Int) returnType:.C [primary] + VALUE_PARAMETER name:test1 index:0 type:kotlin.Int + VALUE_PARAMETER name:test2 index:1 type:kotlin.Int + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' + PROPERTY name:test1 visibility:public modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final] + EXPRESSION_BODY + GET_VAR 'test1: kotlin.Int declared in .C.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int + correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] + $this: VALUE_PARAMETER name: type:.C + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + receiver: GET_VAR ': .C declared in .C.' type=.C origin=null + PROPERTY name:test2 visibility:public modality:FINAL [var] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public + EXPRESSION_BODY + GET_VAR 'test2: kotlin.Int declared in .C.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int + correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [var] + $this: VALUE_PARAMETER name: type:.C + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + receiver: GET_VAR ': .C declared in .C.' type=.C origin=null + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C, :kotlin.Int) returnType:kotlin.Unit + correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [var] + $this: VALUE_PARAMETER name: type:.C + VALUE_PARAMETER name: index:0 type:kotlin.Int + BLOCK_BODY + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + receiver: GET_VAR ': .C declared in .C.' type=.C origin=null + value: GET_VAR ': kotlin.Int declared in .C.' type=kotlin.Int origin=null + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean + overridden: + public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + VALUE_PARAMETER name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int + overridden: + public open fun hashCode (): kotlin.Int declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String + overridden: + public open fun toString (): kotlin.String declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any diff --git a/compiler/testData/ir/irText/declarations/primaryCtorProperties.kt b/compiler/testData/ir/irText/declarations/primaryCtorProperties.kt index 686d7225c5c..5a322a49d6d 100644 --- a/compiler/testData/ir/irText/declarations/primaryCtorProperties.kt +++ b/compiler/testData/ir/irText/declarations/primaryCtorProperties.kt @@ -1,5 +1,3 @@ -// FIR_IDENTICAL - class C( val test1: Int, var test2: Int diff --git a/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt b/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt index 20d10f76b20..94c08c98d38 100644 --- a/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt +++ b/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/primaryCtorProperties.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'test1: kotlin.Int declared in .C.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -16,10 +16,10 @@ FILE fqName: fileName:/primaryCtorProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null PROPERTY name:test2 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private EXPRESSION_BODY GET_VAR 'test2: kotlin.Int declared in .C.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -27,14 +27,14 @@ FILE fqName: fileName:/primaryCtorProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null value: GET_VAR ': kotlin.Int declared in .C.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt index 4179803a6ba..a4fd2a36f4c 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/differentReceivers.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyClass modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'value: kotlin.String declared in .MyClass.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.MyClass) returnType:kotlin.String @@ -15,7 +15,7 @@ FILE fqName: fileName:/differentReceivers.kt $this: VALUE_PARAMETER name: type:.MyClass BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .MyClass' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .MyClass declared in .MyClass.' type=.MyClass origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -74,7 +74,7 @@ FILE fqName: fileName:/differentReceivers.kt receiver: CONST Null type=kotlin.Nothing? value=null p: PROPERTY_REFERENCE 'public final testK: kotlin.String [delegated,val]' field=null getter='public final fun (): kotlin.String declared in ' setter=null type=kotlin.reflect.KProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE PROPERTY name:testOK visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testOK type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testOK type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUS $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY @@ -83,4 +83,4 @@ FILE fqName: fileName:/differentReceivers.kt correspondingProperty: PROPERTY name:testOK visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testOK type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testOK type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/local.txt b/compiler/testData/ir/irText/declarations/provideDelegate/local.txt index c3ed4ed255f..f46f7df5f77 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/local.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/local.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/local.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Delegate modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'value: kotlin.String declared in .Delegate.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Delegate) returnType:kotlin.String @@ -15,7 +15,7 @@ FILE fqName: fileName:/local.kt $this: VALUE_PARAMETER name: type:.Delegate BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Delegate' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .Delegate declared in .Delegate.' type=.Delegate origin=null FUN name:getValue visibility:public modality:FINAL <> ($this:.Delegate, thisRef:kotlin.Any?, property:kotlin.Any?) returnType:kotlin.String $this: VALUE_PARAMETER name: type:.Delegate @@ -46,7 +46,7 @@ FILE fqName: fileName:/local.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:DelegateProvider modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'value: kotlin.String declared in .DelegateProvider.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.DelegateProvider) returnType:kotlin.String @@ -54,7 +54,7 @@ FILE fqName: fileName:/local.kt $this: VALUE_PARAMETER name: type:.DelegateProvider BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .DelegateProvider' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .DelegateProvider declared in .DelegateProvider.' type=.DelegateProvider origin=null FUN name:provideDelegate visibility:public modality:FINAL <> ($this:.DelegateProvider, thisRef:kotlin.Any?, property:kotlin.Any?) returnType:.Delegate $this: VALUE_PARAMETER name: type:.DelegateProvider diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt index 6cd86b7ab67..a653b0f0d2d 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/localDifferentReceivers.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyClass modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'value: kotlin.String declared in .MyClass.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.MyClass) returnType:kotlin.String @@ -15,7 +15,7 @@ FILE fqName: fileName:/localDifferentReceivers.kt $this: VALUE_PARAMETER name: type:.MyClass BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .MyClass' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .MyClass declared in .MyClass.' type=.MyClass origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/member.txt b/compiler/testData/ir/irText/declarations/provideDelegate/member.txt index 9c1b969d41d..02a0e552812 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/member.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/member.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/member.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Delegate modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'value: kotlin.String declared in .Delegate.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Delegate) returnType:kotlin.String @@ -15,7 +15,7 @@ FILE fqName: fileName:/member.kt $this: VALUE_PARAMETER name: type:.Delegate BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Delegate' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .Delegate declared in .Delegate.' type=.Delegate origin=null FUN name:getValue visibility:public modality:FINAL <> ($this:.Delegate, thisRef:kotlin.Any?, property:kotlin.Any?) returnType:kotlin.String $this: VALUE_PARAMETER name: type:.Delegate @@ -46,7 +46,7 @@ FILE fqName: fileName:/member.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:DelegateProvider modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'value: kotlin.String declared in .DelegateProvider.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.DelegateProvider) returnType:kotlin.String @@ -54,7 +54,7 @@ FILE fqName: fileName:/member.kt $this: VALUE_PARAMETER name: type:.DelegateProvider BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .DelegateProvider' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .DelegateProvider declared in .DelegateProvider.' type=.DelegateProvider origin=null FUN name:provideDelegate visibility:public modality:FINAL <> ($this:.DelegateProvider, thisRef:kotlin.Any?, property:kotlin.Any?) returnType:.Delegate $this: VALUE_PARAMETER name: type:.DelegateProvider diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt index 526d9332738..fdfbf7e1987 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt @@ -13,7 +13,7 @@ FILE fqName: fileName:/memberExtension.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:StringDelegate modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:s visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 's: kotlin.String declared in .Host.StringDelegate.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Host.StringDelegate) returnType:kotlin.String @@ -21,7 +21,7 @@ FILE fqName: fileName:/memberExtension.kt $this: VALUE_PARAMETER name: type:.Host.StringDelegate BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Host.StringDelegate' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .Host.StringDelegate declared in .Host.StringDelegate.' type=.Host.StringDelegate origin=null FUN name:getValue visibility:public modality:FINAL <> ($this:.Host.StringDelegate, receiver:kotlin.String, p:kotlin.Any) returnType:kotlin.String $this: VALUE_PARAMETER name: type:.Host.StringDelegate @@ -75,7 +75,7 @@ FILE fqName: fileName:/memberExtension.kt receiver: GET_VAR ': kotlin.String declared in .Host.' type=kotlin.String origin=null p: PROPERTY_REFERENCE 'public final plusK: kotlin.String [delegated,val]' field=null getter='public final fun (): kotlin.String declared in .Host' setter=null type=kotlin.reflect.KProperty2.Host, kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE PROPERTY name:ok visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:ok type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:ok type:kotlin.String visibility:private [final] EXPRESSION_BODY CALL 'public final fun (): kotlin.String declared in .Host' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .Host declared in .Host' type=.Host origin=null @@ -85,7 +85,7 @@ FILE fqName: fileName:/memberExtension.kt $this: VALUE_PARAMETER name: type:.Host BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Host' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ok type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ok type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .Host declared in .Host.' type=.Host origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt index 1974ffe5b79..83008c15939 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/topLevel.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Delegate modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'value: kotlin.String declared in .Delegate.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Delegate) returnType:kotlin.String @@ -15,7 +15,7 @@ FILE fqName: fileName:/topLevel.kt $this: VALUE_PARAMETER name: type:.Delegate BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Delegate' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .Delegate declared in .Delegate.' type=.Delegate origin=null FUN name:getValue visibility:public modality:FINAL <> ($this:.Delegate, thisRef:kotlin.Any?, property:kotlin.Any?) returnType:kotlin.String $this: VALUE_PARAMETER name: type:.Delegate @@ -46,7 +46,7 @@ FILE fqName: fileName:/topLevel.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:DelegateProvider modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final] EXPRESSION_BODY GET_VAR 'value: kotlin.String declared in .DelegateProvider.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.DelegateProvider) returnType:kotlin.String @@ -54,7 +54,7 @@ FILE fqName: fileName:/topLevel.kt $this: VALUE_PARAMETER name: type:.DelegateProvider BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .DelegateProvider' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .DelegateProvider declared in .DelegateProvider.' type=.DelegateProvider origin=null FUN name:provideDelegate visibility:public modality:FINAL <> ($this:.DelegateProvider, thisRef:kotlin.Any?, property:kotlin.Any?) returnType:.Delegate $this: VALUE_PARAMETER name: type:.DelegateProvider diff --git a/compiler/testData/ir/irText/errors/unresolvedReference.txt b/compiler/testData/ir/irText/errors/unresolvedReference.txt index 1a8bad88af4..acd1660f01f 100644 --- a/compiler/testData/ir/irText/errors/unresolvedReference.txt +++ b/compiler/testData/ir/irText/errors/unresolvedReference.txt @@ -1,24 +1,24 @@ FILE fqName: fileName:/unresolvedReference.kt PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType visibility:private [final,static] EXPRESSION_BODY ERROR_CALL '' type=IrErrorType FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:IrErrorType correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): IrErrorType declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType visibility:public [final,static]' type=IrErrorType origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType visibility:private [final,static]' type=IrErrorType origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType visibility:private [final,static] EXPRESSION_BODY ERROR_CALL '' type=IrErrorType FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:IrErrorType correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): IrErrorType declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType visibility:public [final,static]' type=IrErrorType origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType visibility:private [final,static]' type=IrErrorType origin=null PROPERTY name:test3 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test3 type:IrErrorType visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test3 type:IrErrorType visibility:private [final,static] EXPRESSION_BODY ERROR_CALL '' type=IrErrorType receiver: CONST Int type=kotlin.Int value=42 @@ -27,13 +27,13 @@ FILE fqName: fileName:/unresolvedReference.kt correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): IrErrorType declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:IrErrorType visibility:public [final,static]' type=IrErrorType origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:IrErrorType visibility:private [final,static]' type=IrErrorType origin=null PROPERTY name:test4 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test4 type:IrErrorType visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test4 type:IrErrorType visibility:private [final,static] EXPRESSION_BODY ERROR_EXPR '' type=IrErrorType FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:IrErrorType correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): IrErrorType declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:IrErrorType visibility:public [final,static]' type=IrErrorType origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:IrErrorType visibility:private [final,static]' type=IrErrorType origin=null diff --git a/compiler/testData/ir/irText/expressions/arrayAccess.txt b/compiler/testData/ir/irText/expressions/arrayAccess.txt index b6641d1c17a..bd9c3d894f8 100644 --- a/compiler/testData/ir/irText/expressions/arrayAccess.txt +++ b/compiler/testData/ir/irText/expressions/arrayAccess.txt @@ -1,13 +1,13 @@ FILE fqName: fileName:/arrayAccess.kt PROPERTY name:p visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:p visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.Int declared in ' diff --git a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt index da35e0343b0..0db13bbc4af 100644 --- a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt +++ b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt @@ -19,7 +19,7 @@ FILE fqName: fileName:/arrayAugmentedAssignment1.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.IntArray visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.IntArray visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.IntArray declared in .C.' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.IntArray @@ -27,7 +27,7 @@ FILE fqName: fileName:/arrayAugmentedAssignment1.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.IntArray declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.IntArray visibility:public [final]' type=kotlin.IntArray origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.IntArray visibility:private [final]' type=kotlin.IntArray origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/expressions/assignments.txt b/compiler/testData/ir/irText/expressions/assignments.txt index a6cc47587ac..f81d58f46d0 100644 --- a/compiler/testData/ir/irText/expressions/assignments.txt +++ b/compiler/testData/ir/irText/expressions/assignments.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/assignments.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Ref modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Ref.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Ref) returnType:kotlin.Int @@ -15,14 +15,14 @@ FILE fqName: fileName:/assignments.kt $this: VALUE_PARAMETER name: type:.Ref BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Ref' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .Ref declared in .Ref.' type=.Ref origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Ref, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.Ref VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .Ref declared in .Ref.' type=.Ref origin=null value: GET_VAR ': kotlin.Int declared in .Ref.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt index 43806b24cbb..66c2a603e79 100644 --- a/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt +++ b/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt @@ -1,18 +1,18 @@ FILE fqName: fileName:/augmentedAssignment1.kt PROPERTY name:p visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:p visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:p visibility:public modality:FINAL [var] VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: GET_VAR ': kotlin.Int declared in .' type=kotlin.Int origin=null FUN name:testVariable visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt index 08b0e8523ba..a1515909528 100644 --- a/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt +++ b/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt @@ -39,14 +39,14 @@ FILE fqName: fileName:/augmentedAssignment2.kt VALUE_PARAMETER name:s index:0 type:kotlin.String BLOCK_BODY PROPERTY name:p visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:p type:.A visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:p type:.A visibility:private [final,static] EXPRESSION_BODY CONSTRUCTOR_CALL 'public constructor () [primary] declared in .A' type=.A origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.A correspondingProperty: PROPERTY name:p visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): .A declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:.A visibility:public [final,static]' type=.A origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:.A visibility:private [final,static]' type=.A origin=null FUN name:testVariable visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR name:a type:.A [val] diff --git a/compiler/testData/ir/irText/expressions/boundCallableReferences.txt b/compiler/testData/ir/irText/expressions/boundCallableReferences.txt index abf39924a4a..406dc7f2f9f 100644 --- a/compiler/testData/ir/irText/expressions/boundCallableReferences.txt +++ b/compiler/testData/ir/irText/expressions/boundCallableReferences.txt @@ -9,7 +9,7 @@ FILE fqName: fileName:/boundCallableReferences.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY PROPERTY name:bar visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Int @@ -17,7 +17,7 @@ FILE fqName: fileName:/boundCallableReferences.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -36,7 +36,7 @@ FILE fqName: fileName:/boundCallableReferences.kt $receiver: VALUE_PARAMETER name: type:.A BLOCK_BODY PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KFunction0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KFunction0 visibility:private [final,static] EXPRESSION_BODY FUNCTION_REFERENCE 'public final fun foo (): kotlin.Unit declared in .A' type=kotlin.reflect.KFunction0 origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .A' type=.A origin=null @@ -44,9 +44,9 @@ FILE fqName: fileName:/boundCallableReferences.kt correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KFunction0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KFunction0 visibility:public [final,static]' type=kotlin.reflect.KFunction0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KFunction0 visibility:private [final,static]' type=kotlin.reflect.KFunction0 origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KProperty0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KProperty0 visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final bar: kotlin.Int [val]' field=null getter='public final fun (): kotlin.Int declared in .A' setter=null type=kotlin.reflect.KProperty0 origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .A' type=.A origin=null @@ -54,9 +54,9 @@ FILE fqName: fileName:/boundCallableReferences.kt correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KProperty0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KProperty0 visibility:public [final,static]' type=kotlin.reflect.KProperty0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KProperty0 visibility:private [final,static]' type=kotlin.reflect.KProperty0 origin=null PROPERTY name:test3 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.reflect.KFunction0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.reflect.KFunction0 visibility:private [final,static] EXPRESSION_BODY FUNCTION_REFERENCE 'public final fun qux (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null $receiver: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .A' type=.A origin=null @@ -64,4 +64,4 @@ FILE fqName: fileName:/boundCallableReferences.kt correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KFunction0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.reflect.KFunction0 visibility:public [final,static]' type=kotlin.reflect.KFunction0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.reflect.KFunction0 visibility:private [final,static]' type=kotlin.reflect.KFunction0 origin=null diff --git a/compiler/testData/ir/irText/expressions/callableRefToGenericMember.txt b/compiler/testData/ir/irText/expressions/callableRefToGenericMember.txt index 42c62125c57..d0613aa1f27 100644 --- a/compiler/testData/ir/irText/expressions/callableRefToGenericMember.txt +++ b/compiler/testData/ir/irText/expressions/callableRefToGenericMember.txt @@ -10,7 +10,7 @@ FILE fqName: fileName:/callableRefToGenericMember.kt $this: VALUE_PARAMETER name: type:.A.A> BLOCK_BODY PROPERTY name:bar visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A.A>) returnType:kotlin.Int @@ -18,7 +18,7 @@ FILE fqName: fileName:/callableRefToGenericMember.kt $this: VALUE_PARAMETER name: type:.A.A> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .A.A> declared in .A.' type=.A.A> origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -34,20 +34,20 @@ FILE fqName: fileName:/callableRefToGenericMember.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KFunction1<.A, kotlin.Unit> visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KFunction1<.A, kotlin.Unit> visibility:private [final,static] EXPRESSION_BODY FUNCTION_REFERENCE 'public final fun foo (): kotlin.Unit declared in .A' type=kotlin.reflect.KFunction1<.A, kotlin.Unit> origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KFunction1<.A, kotlin.Unit> correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KFunction1<.A, kotlin.Unit> declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KFunction1<.A, kotlin.Unit> visibility:public [final,static]' type=kotlin.reflect.KFunction1<.A, kotlin.Unit> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KFunction1<.A, kotlin.Unit> visibility:private [final,static]' type=kotlin.reflect.KFunction1<.A, kotlin.Unit> origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KProperty1<.A, kotlin.Int> visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KProperty1<.A, kotlin.Int> visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final bar: kotlin.Int [val]' field=null getter='public final fun (): kotlin.Int declared in .A' setter=null type=kotlin.reflect.KProperty1<.A, kotlin.Int> origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KProperty1<.A, kotlin.Int> correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KProperty1<.A, kotlin.Int> declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KProperty1<.A, kotlin.Int> visibility:public [final,static]' type=kotlin.reflect.KProperty1<.A, kotlin.Int> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KProperty1<.A, kotlin.Int> visibility:private [final,static]' type=kotlin.reflect.KProperty1<.A, kotlin.Int> origin=null diff --git a/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.txt b/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.txt index 761f0fd9ac1..78bf20ea518 100644 --- a/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.txt +++ b/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.txt @@ -6,7 +6,7 @@ FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:a visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.String visibility:private [final] EXPRESSION_BODY CONST String type=kotlin.String value="" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:test.Foo) returnType:kotlin.String @@ -14,7 +14,7 @@ FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt $this: VALUE_PARAMETER name: type:test.Foo BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in test.Foo' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': test.Foo declared in test.Foo.' type=test.Foo origin=null FUN name:foo visibility:public modality:FINAL <> ($this:test.Foo) returnType:kotlin.String $this: VALUE_PARAMETER name: type:test.Foo @@ -35,7 +35,7 @@ FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KProperty0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KProperty0 visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final a: kotlin.String [val]' field=null getter='public final fun (): kotlin.String declared in test.Foo' setter=null type=kotlin.reflect.KProperty0 origin=null $this: GET_OBJECT 'CLASS OBJECT name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]' type=test.Foo @@ -43,9 +43,9 @@ FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KProperty0 declared in test' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KProperty0 visibility:public [final,static]' type=kotlin.reflect.KProperty0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KProperty0 visibility:private [final,static]' type=kotlin.reflect.KProperty0 origin=null PROPERTY name:test1a visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1a type:kotlin.reflect.KProperty0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1a type:kotlin.reflect.KProperty0 visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final a: kotlin.String [val]' field=null getter='public final fun (): kotlin.String declared in test.Foo' setter=null type=kotlin.reflect.KProperty0 origin=null $this: GET_OBJECT 'CLASS OBJECT name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]' type=test.Foo @@ -53,9 +53,9 @@ FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt correspondingProperty: PROPERTY name:test1a visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KProperty0 declared in test' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1a type:kotlin.reflect.KProperty0 visibility:public [final,static]' type=kotlin.reflect.KProperty0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1a type:kotlin.reflect.KProperty0 visibility:private [final,static]' type=kotlin.reflect.KProperty0 origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KFunction0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KFunction0 visibility:private [final,static] EXPRESSION_BODY FUNCTION_REFERENCE 'public final fun foo (): kotlin.String declared in test.Foo' type=kotlin.reflect.KFunction0 origin=null $this: GET_OBJECT 'CLASS OBJECT name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]' type=test.Foo @@ -63,9 +63,9 @@ FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KFunction0 declared in test' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KFunction0 visibility:public [final,static]' type=kotlin.reflect.KFunction0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KFunction0 visibility:private [final,static]' type=kotlin.reflect.KFunction0 origin=null PROPERTY name:test2a visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2a type:kotlin.reflect.KFunction0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2a type:kotlin.reflect.KFunction0 visibility:private [final,static] EXPRESSION_BODY FUNCTION_REFERENCE 'public final fun foo (): kotlin.String declared in test.Foo' type=kotlin.reflect.KFunction0 origin=null $this: GET_OBJECT 'CLASS OBJECT name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]' type=test.Foo @@ -73,4 +73,4 @@ FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt correspondingProperty: PROPERTY name:test2a visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KFunction0 declared in test' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2a type:kotlin.reflect.KFunction0 visibility:public [final,static]' type=kotlin.reflect.KFunction0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2a type:kotlin.reflect.KFunction0 visibility:private [final,static]' type=kotlin.reflect.KFunction0 origin=null diff --git a/compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.txt b/compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.txt index 8c1c811aea8..908d5a37faf 100644 --- a/compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.txt +++ b/compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.txt @@ -32,7 +32,7 @@ FILE fqName: fileName:/callableReferenceTypeArguments.kt VALUE_PARAMETER name:x index:0 type:kotlin.collections.List.topLevel2> BLOCK_BODY PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1 visibility:private [final,static] EXPRESSION_BODY FUNCTION_REFERENCE 'public final fun topLevel1 (x: T of .topLevel1): kotlin.Unit [inline] declared in ' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'x')] kotlin.Int, kotlin.Unit> origin=null : kotlin.Int @@ -40,9 +40,9 @@ FILE fqName: fileName:/callableReferenceTypeArguments.kt correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function1 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1 visibility:public [final,static]' type=kotlin.Function1 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1 visibility:private [final,static]' type=kotlin.Function1 origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function1, kotlin.Unit> visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function1, kotlin.Unit> visibility:private [final,static] EXPRESSION_BODY FUNCTION_REFERENCE 'public final fun topLevel2 (x: kotlin.collections.List.topLevel2>): kotlin.Unit [inline] declared in ' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'x')] kotlin.collections.List, kotlin.Unit> origin=null : kotlin.String @@ -50,9 +50,9 @@ FILE fqName: fileName:/callableReferenceTypeArguments.kt correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function1, kotlin.Unit> declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function1, kotlin.Unit> visibility:public [final,static]' type=kotlin.Function1, kotlin.Unit> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function1, kotlin.Unit> visibility:private [final,static]' type=kotlin.Function1, kotlin.Unit> origin=null PROPERTY name:test3 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function1 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function1 visibility:private [final,static] EXPRESSION_BODY FUNCTION_REFERENCE 'public final fun objectMember (x: T of .Host.objectMember): kotlin.Unit [inline] declared in .Host' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'x')] kotlin.Int, kotlin.Unit> origin=null : kotlin.Int @@ -61,4 +61,4 @@ FILE fqName: fileName:/callableReferenceTypeArguments.kt correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function1 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function1 visibility:public [final,static]' type=kotlin.Function1 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function1 visibility:private [final,static]' type=kotlin.Function1 origin=null diff --git a/compiler/testData/ir/irText/expressions/coercionToUnit.txt b/compiler/testData/ir/irText/expressions/coercionToUnit.txt index d2e07b2cdd4..c99287745e8 100644 --- a/compiler/testData/ir/irText/expressions/coercionToUnit.txt +++ b/compiler/testData/ir/irText/expressions/coercionToUnit.txt @@ -1,6 +1,6 @@ FILE fqName: fileName:/coercionToUnit.kt PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function0 visibility:private [final,static] EXPRESSION_BODY FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit @@ -12,7 +12,7 @@ FILE fqName: fileName:/coercionToUnit.kt correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function0 visibility:public [final,static]' type=kotlin.Function0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function0 visibility:private [final,static]' type=kotlin.Function0 origin=null FUN name:test2 visibility:public modality:FINAL <> (mc:kotlin.collections.MutableCollection) returnType:kotlin.Unit VALUE_PARAMETER name:mc index:0 type:kotlin.collections.MutableCollection BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt index 975a7915131..4d0576fe82e 100644 --- a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt +++ b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt @@ -6,7 +6,7 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:X1 modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x1 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:x1 type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:x1 type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.X1) returnType:kotlin.Int @@ -14,14 +14,14 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt $this: VALUE_PARAMETER name: type:.X1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .X1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x1 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x1 type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .X1 declared in .X1.' type=.X1 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.X1, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:x1 visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.X1 VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x1 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x1 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .X1 declared in .X1.' type=.X1 origin=null value: GET_VAR ': kotlin.Int declared in .X1.' type=kotlin.Int origin=null CLASS OBJECT name:X2 modality:FINAL visibility:public superTypes:[kotlin.Any] @@ -31,7 +31,7 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:X2 modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x2 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:x2 type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:x2 type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.X1.X2) returnType:kotlin.Int @@ -39,14 +39,14 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt $this: VALUE_PARAMETER name: type:.X1.X2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .X1.X2' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x2 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x2 type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .X1.X2 declared in .X1.X2.' type=.X1.X2 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.X1.X2, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:x2 visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.X1.X2 VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x2 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x2 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .X1.X2 declared in .X1.X2.' type=.X1.X2 origin=null value: GET_VAR ': kotlin.Int declared in .X1.X2.' type=kotlin.Int origin=null CLASS OBJECT name:X3 modality:FINAL visibility:public superTypes:[kotlin.Any] @@ -56,7 +56,7 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:X3 modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x3 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:x3 type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:x3 type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.X1.X2.X3) returnType:kotlin.Int @@ -64,14 +64,14 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt $this: VALUE_PARAMETER name: type:.X1.X2.X3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .X1.X2.X3' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x3 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x3 type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .X1.X2.X3 declared in .X1.X2.X3.' type=.X1.X2.X3 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.X1.X2.X3, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:x3 visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.X1.X2.X3 VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x3 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x3 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .X1.X2.X3 declared in .X1.X2.X3.' type=.X1.X2.X3 origin=null value: GET_VAR ': kotlin.Int declared in .X1.X2.X3.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean @@ -191,7 +191,7 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:B modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:s visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.Int visibility:private EXPRESSION_BODY GET_VAR 's: kotlin.Int declared in .B.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.B) returnType:kotlin.Int @@ -199,14 +199,14 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt $this: VALUE_PARAMETER name: type:.B BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .B' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .B declared in .B.' type=.B origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.B, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:s visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.B VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .B declared in .B.' type=.B origin=null value: GET_VAR ': kotlin.Int declared in .B.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/irText/expressions/contructorCall.fir.txt b/compiler/testData/ir/irText/expressions/contructorCall.fir.txt new file mode 100644 index 00000000000..de1caf2ba9a --- /dev/null +++ b/compiler/testData/ir/irText/expressions/contructorCall.fir.txt @@ -0,0 +1,29 @@ +FILE fqName: fileName:/contructorCall.kt + CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.A + CONSTRUCTOR visibility:public <> () returnType:.A [primary] + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' + FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean + overridden: + public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + VALUE_PARAMETER name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int + overridden: + public open fun hashCode (): kotlin.Int declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String + overridden: + public open fun toString (): kotlin.String declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + PROPERTY name:test visibility:public modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:test type:.A visibility:public [final,static] + EXPRESSION_BODY + CONSTRUCTOR_CALL 'public constructor () [primary] declared in .A' type=.A origin=null + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.A + correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): .A declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:.A visibility:public [final,static]' type=.A origin=null diff --git a/compiler/testData/ir/irText/expressions/contructorCall.kt b/compiler/testData/ir/irText/expressions/contructorCall.kt index 4fdd87aabd5..06e20e8e32a 100644 --- a/compiler/testData/ir/irText/expressions/contructorCall.kt +++ b/compiler/testData/ir/irText/expressions/contructorCall.kt @@ -1,5 +1,3 @@ -// FIR_IDENTICAL - class A val test = A() \ No newline at end of file diff --git a/compiler/testData/ir/irText/expressions/contructorCall.txt b/compiler/testData/ir/irText/expressions/contructorCall.txt index de1caf2ba9a..8699fb69898 100644 --- a/compiler/testData/ir/irText/expressions/contructorCall.txt +++ b/compiler/testData/ir/irText/expressions/contructorCall.txt @@ -19,11 +19,11 @@ FILE fqName: fileName:/contructorCall.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:test visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test type:.A visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test type:.A visibility:private [final,static] EXPRESSION_BODY CONSTRUCTOR_CALL 'public constructor () [primary] declared in .A' type=.A origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.A correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): .A declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:.A visibility:public [final,static]' type=.A origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:.A visibility:private [final,static]' type=.A origin=null diff --git a/compiler/testData/ir/irText/expressions/elvis.txt b/compiler/testData/ir/irText/expressions/elvis.txt index f0b07194164..896c4407371 100644 --- a/compiler/testData/ir/irText/expressions/elvis.txt +++ b/compiler/testData/ir/irText/expressions/elvis.txt @@ -1,13 +1,13 @@ FILE fqName: fileName:/elvis.kt PROPERTY name:p visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Any? visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Any? visibility:private [final,static] EXPRESSION_BODY CONST Null type=kotlin.Nothing? value=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Any? correspondingProperty: PROPERTY name:p visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any? declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Any? visibility:public [final,static]' type=kotlin.Any? origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Any? visibility:private [final,static]' type=kotlin.Any? origin=null FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Any? BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.Any? declared in ' diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt index c5a46b0e491..9265a329a92 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt +++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt @@ -15,7 +15,7 @@ FILE fqName: fileName:/enumEntryAsReceiver.kt ENUM_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .X' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:B modality:FINAL visibility:public superTypes:[.X]' PROPERTY name:value2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value2 type:kotlin.String visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value2 type:kotlin.String visibility:private [final] EXPRESSION_BODY CONST String type=kotlin.String value="OK" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.X.B) returnType:kotlin.String @@ -23,10 +23,10 @@ FILE fqName: fileName:/enumEntryAsReceiver.kt $this: VALUE_PARAMETER name: type:.X.B BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .X.B' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value2 type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value2 type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .X.B declared in .X.B.' type=.X.B origin=null PROPERTY name:value visibility:public modality:OPEN [val] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Function0 visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Function0 visibility:private [final] EXPRESSION_BODY FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String @@ -41,7 +41,7 @@ FILE fqName: fileName:/enumEntryAsReceiver.kt $this: VALUE_PARAMETER name: type:.X.B BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun (): kotlin.Function0 declared in .X.B' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Function0 visibility:public [final]' type=kotlin.Function0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Function0 visibility:private [final]' type=kotlin.Function0 origin=null receiver: GET_VAR ': .X.B declared in .X.B.' type=.X.B origin=null FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<.X>) returnType:kotlin.Any overridden: diff --git a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.txt b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.txt index a6654e43c41..ddd44e45ae8 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.txt +++ b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.txt @@ -15,7 +15,7 @@ FILE fqName: fileName:/enumEntryReferenceFromEnumEntryClass.kt ENUM_CONSTRUCTOR_CALL 'private constructor () [primary] declared in .MyEnum' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:Z modality:FINAL visibility:public superTypes:[.MyEnum]' PROPERTY name:counter visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.MyEnum.Z) returnType:kotlin.Int @@ -23,14 +23,14 @@ FILE fqName: fileName:/enumEntryReferenceFromEnumEntryClass.kt $this: VALUE_PARAMETER name: type:.MyEnum.Z BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .MyEnum.Z' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .MyEnum.Z declared in .MyEnum.Z.' type=.MyEnum.Z origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.MyEnum.Z, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:counter visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.MyEnum.Z VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .MyEnum.Z declared in .MyEnum.Z.' type=.MyEnum.Z origin=null value: GET_VAR ': kotlin.Int declared in .MyEnum.Z.' type=kotlin.Int origin=null FUN name:foo visibility:public modality:FINAL <> ($this:.MyEnum.Z) returnType:kotlin.Unit @@ -45,7 +45,7 @@ FILE fqName: fileName:/enumEntryReferenceFromEnumEntryClass.kt CALL 'public final fun foo (): kotlin.Unit declared in .MyEnum.Z' type=kotlin.Unit origin=null $this: GET_VAR ': .MyEnum.Z declared in .MyEnum.Z.bar' type=.MyEnum.Z origin=null PROPERTY name:aLambda visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:aLambda type:kotlin.Function0 visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:aLambda type:kotlin.Function0 visibility:private [final] EXPRESSION_BODY FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit @@ -61,10 +61,10 @@ FILE fqName: fileName:/enumEntryReferenceFromEnumEntryClass.kt $this: VALUE_PARAMETER name: type:.MyEnum.Z BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function0 declared in .MyEnum.Z' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:aLambda type:kotlin.Function0 visibility:public [final]' type=kotlin.Function0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:aLambda type:kotlin.Function0 visibility:private [final]' type=kotlin.Function0 origin=null receiver: GET_VAR ': .MyEnum.Z declared in .MyEnum.Z.' type=.MyEnum.Z origin=null PROPERTY name:anObject visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:anObject type:kotlin.Any visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:anObject type:kotlin.Any visibility:private [final] EXPRESSION_BODY BLOCK type=.MyEnum.Z.anObject. origin=OBJECT_LITERAL CLASS CLASS name: modality:FINAL visibility:local superTypes:[kotlin.Any] @@ -107,7 +107,7 @@ FILE fqName: fileName:/enumEntryReferenceFromEnumEntryClass.kt $this: VALUE_PARAMETER name: type:.MyEnum.Z BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in .MyEnum.Z' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anObject type:kotlin.Any visibility:public [final]' type=kotlin.Any origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anObject type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null receiver: GET_VAR ': .MyEnum.Z declared in .MyEnum.Z.' type=.MyEnum.Z origin=null FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<.MyEnum>) returnType:kotlin.Any overridden: diff --git a/compiler/testData/ir/irText/expressions/field.txt b/compiler/testData/ir/irText/expressions/field.txt index ff2e1d2a727..e12b3436cda 100644 --- a/compiler/testData/ir/irText/expressions/field.txt +++ b/compiler/testData/ir/irText/expressions/field.txt @@ -1,33 +1,33 @@ FILE fqName: fileName:/field.kt PROPERTY name:testSimple visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:testSimple type:kotlin.Int visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:testSimple type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:testSimple visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testSimple type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testSimple type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null FUN name: visibility:public modality:FINAL <> (value:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:testSimple visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testSimple type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=EQ + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testSimple type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=EQ value: GET_VAR 'value: kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:testAugmented visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:testAugmented visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null FUN name: visibility:public modality:FINAL <> (value:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:testAugmented visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=PLUSEQ + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=PLUSEQ value: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=PLUSEQ - $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=PLUSEQ + $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=PLUSEQ other: GET_VAR 'value: kotlin.Int declared in .' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt index 58ce8625c17..0482f7904ef 100644 --- a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt +++ b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt @@ -26,7 +26,7 @@ FILE fqName: fileName:/forWithImplicitReceivers.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:IntCell modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:private EXPRESSION_BODY GET_VAR 'value: kotlin.Int declared in .IntCell.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.IntCell) returnType:kotlin.Int @@ -34,14 +34,14 @@ FILE fqName: fileName:/forWithImplicitReceivers.kt $this: VALUE_PARAMETER name: type:.IntCell BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .IntCell' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .IntCell declared in .IntCell.' type=.IntCell origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.IntCell, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.IntCell VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .IntCell declared in .IntCell.' type=.IntCell origin=null value: GET_VAR ': kotlin.Int declared in .IntCell.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/irText/expressions/genericConstructorCallWithTypeArguments.txt b/compiler/testData/ir/irText/expressions/genericConstructorCallWithTypeArguments.txt index f228ff52a13..d9789ead10c 100644 --- a/compiler/testData/ir/irText/expressions/genericConstructorCallWithTypeArguments.txt +++ b/compiler/testData/ir/irText/expressions/genericConstructorCallWithTypeArguments.txt @@ -33,7 +33,7 @@ FILE fqName: fileName:/genericConstructorCallWithTypeArguments.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Box modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:T of .Box visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:T of .Box visibility:private [final] EXPRESSION_BODY GET_VAR 'value: T of .Box declared in .Box.' type=T of .Box origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Box.Box>) returnType:T of .Box @@ -41,7 +41,7 @@ FILE fqName: fileName:/genericConstructorCallWithTypeArguments.kt $this: VALUE_PARAMETER name: type:.Box.Box> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of .Box declared in .Box' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Box visibility:public [final]' type=T of .Box origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Box visibility:private [final]' type=T of .Box origin=null receiver: GET_VAR ': .Box.Box> declared in .Box.' type=.Box.Box> origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/expressions/genericPropertyCall.txt b/compiler/testData/ir/irText/expressions/genericPropertyCall.txt index 6de65a96957..ddabcb98567 100644 --- a/compiler/testData/ir/irText/expressions/genericPropertyCall.txt +++ b/compiler/testData/ir/irText/expressions/genericPropertyCall.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/genericPropertyCall.kt RETURN type=kotlin.Nothing from='public final fun (): T of . declared in ' GET_VAR ': T of . declared in .' type=T of . origin=null PROPERTY name:test visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun (): T of . declared in ' type=kotlin.String origin=GET_PROPERTY : kotlin.String @@ -17,4 +17,4 @@ FILE fqName: fileName:/genericPropertyCall.kt correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/expressions/genericPropertyRef.txt b/compiler/testData/ir/irText/expressions/genericPropertyRef.txt index 78e71a0e1cb..e5b669883d7 100644 --- a/compiler/testData/ir/irText/expressions/genericPropertyRef.txt +++ b/compiler/testData/ir/irText/expressions/genericPropertyRef.txt @@ -14,7 +14,7 @@ FILE fqName: fileName:/genericPropertyRef.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Value modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:value type:T of .Value visibility:public + FIELD PROPERTY_BACKING_FIELD name:value type:T of .Value visibility:private EXPRESSION_BODY GET_VAR 'value: T of .Value declared in .Value.' type=T of .Value origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Value.Value>) returnType:T of .Value @@ -22,18 +22,18 @@ FILE fqName: fileName:/genericPropertyRef.kt $this: VALUE_PARAMETER name: type:.Value.Value> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of .Value declared in .Value' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Value visibility:public' type=T of .Value origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Value visibility:private' type=T of .Value origin=null receiver: GET_VAR ': .Value.Value> declared in .Value.' type=.Value.Value> origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Value.Value>, :T of .Value) returnType:kotlin.Unit correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.Value.Value> VALUE_PARAMETER name: index:0 type:T of .Value BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Value visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Value visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .Value.Value> declared in .Value.' type=.Value.Value> origin=null value: GET_VAR ': T of .Value declared in .Value.' type=T of .Value origin=null PROPERTY name:text visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:text type:kotlin.String? visibility:public + FIELD PROPERTY_BACKING_FIELD name:text type:kotlin.String? visibility:private EXPRESSION_BODY GET_VAR 'text: kotlin.String? declared in .Value.' type=kotlin.String? origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Value.Value>) returnType:kotlin.String? @@ -41,14 +41,14 @@ FILE fqName: fileName:/genericPropertyRef.kt $this: VALUE_PARAMETER name: type:.Value.Value> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String? declared in .Value' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:text type:kotlin.String? visibility:public' type=kotlin.String? origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:text type:kotlin.String? visibility:private' type=kotlin.String? origin=null receiver: GET_VAR ': .Value.Value> declared in .Value.' type=.Value.Value> origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Value.Value>, :kotlin.String?) returnType:kotlin.Unit correspondingProperty: PROPERTY name:text visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.Value.Value> VALUE_PARAMETER name: index:0 type:kotlin.String? BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:text type:kotlin.String? visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:text type:kotlin.String? visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .Value.Value> declared in .Value.' type=.Value.Value> origin=null value: GET_VAR ': kotlin.String? declared in .Value.' type=kotlin.String? origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean @@ -104,7 +104,7 @@ FILE fqName: fileName:/genericPropertyRef.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:DVal modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:kmember visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:kmember type:kotlin.Any visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:kmember type:kotlin.Any visibility:private [final] EXPRESSION_BODY GET_VAR 'kmember: kotlin.Any declared in .DVal.' type=kotlin.Any origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.DVal) returnType:kotlin.Any @@ -112,7 +112,7 @@ FILE fqName: fileName:/genericPropertyRef.kt $this: VALUE_PARAMETER name: type:.DVal BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in .DVal' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:kmember type:kotlin.Any visibility:public [final]' type=kotlin.Any origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:kmember type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null receiver: GET_VAR ': .DVal declared in .DVal.' type=.DVal origin=null FUN name:getValue visibility:public modality:FINAL <> ($this:.DVal, t:kotlin.Any?, p:kotlin.Any) returnType:kotlin.Int $this: VALUE_PARAMETER name: type:.DVal @@ -135,34 +135,34 @@ FILE fqName: fileName:/genericPropertyRef.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:recivier visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:recivier type:kotlin.Any? visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:recivier type:kotlin.Any? visibility:private [static] EXPRESSION_BODY CONST String type=kotlin.String value="fail" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Any? correspondingProperty: PROPERTY name:recivier visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any? declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:recivier type:kotlin.Any? visibility:public [static]' type=kotlin.Any? origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:recivier type:kotlin.Any? visibility:private [static]' type=kotlin.Any? origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.Any?) returnType:kotlin.Unit correspondingProperty: PROPERTY name:recivier visibility:public modality:FINAL [var] VALUE_PARAMETER name: index:0 type:kotlin.Any? BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:recivier type:kotlin.Any? visibility:public [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:recivier type:kotlin.Any? visibility:private [static]' type=kotlin.Unit origin=null value: GET_VAR ': kotlin.Any? declared in .' type=kotlin.Any? origin=null PROPERTY name:value2 visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:value2 type:kotlin.Any? visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:value2 type:kotlin.Any? visibility:private [static] EXPRESSION_BODY CONST String type=kotlin.String value="fail2" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Any? correspondingProperty: PROPERTY name:value2 visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any? declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value2 type:kotlin.Any? visibility:public [static]' type=kotlin.Any? origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value2 type:kotlin.Any? visibility:private [static]' type=kotlin.Any? origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.Any?) returnType:kotlin.Unit correspondingProperty: PROPERTY name:value2 visibility:public modality:FINAL [var] VALUE_PARAMETER name: index:0 type:kotlin.Any? BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value2 type:kotlin.Any? visibility:public [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value2 type:kotlin.Any? visibility:private [static]' type=kotlin.Unit origin=null value: GET_VAR ': kotlin.Any? declared in .' type=kotlin.Any? origin=null PROPERTY name:bar visibility:public modality:FINAL [var] FUN name: visibility:public modality:FINAL ($receiver:T of .) returnType:T of . @@ -183,7 +183,7 @@ FILE fqName: fileName:/genericPropertyRef.kt CALL 'public final fun (: kotlin.Any?): kotlin.Unit declared in ' type=kotlin.Unit origin=EQ : GET_VAR 'value: T of . declared in .' type=T of . origin=null PROPERTY name:barRef visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:barRef type:kotlin.reflect.KMutableProperty1 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:barRef type:kotlin.reflect.KMutableProperty1 visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final bar: T of . [var]' field=null getter='public final fun (): T of . declared in ' setter='public final fun (value: T of .): kotlin.Unit declared in ' type=kotlin.reflect.KMutableProperty1 origin=null <1>: kotlin.String? @@ -191,4 +191,4 @@ FILE fqName: fileName:/genericPropertyRef.kt correspondingProperty: PROPERTY name:barRef visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KMutableProperty1 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:barRef type:kotlin.reflect.KMutableProperty1 visibility:public [final,static]' type=kotlin.reflect.KMutableProperty1 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:barRef type:kotlin.reflect.KMutableProperty1 visibility:private [final,static]' type=kotlin.reflect.KMutableProperty1 origin=null diff --git a/compiler/testData/ir/irText/expressions/incrementDecrement.txt b/compiler/testData/ir/irText/expressions/incrementDecrement.txt index 2131cd12830..32bd5e31bb9 100644 --- a/compiler/testData/ir/irText/expressions/incrementDecrement.txt +++ b/compiler/testData/ir/irText/expressions/incrementDecrement.txt @@ -1,21 +1,21 @@ FILE fqName: fileName:/incrementDecrement.kt PROPERTY name:p visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:p visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:p visibility:public modality:FINAL [var] VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: GET_VAR ': kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:arr visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:arr type:kotlin.IntArray visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:arr type:kotlin.IntArray visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun intArrayOf (vararg elements: kotlin.Int): kotlin.IntArray declared in kotlin' type=kotlin.IntArray origin=null elements: VARARG type=kotlin.IntArray varargElementType=kotlin.Int @@ -26,7 +26,7 @@ FILE fqName: fileName:/incrementDecrement.kt correspondingProperty: PROPERTY name:arr visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.IntArray declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:arr type:kotlin.IntArray visibility:public [final,static]' type=kotlin.IntArray origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:arr type:kotlin.IntArray visibility:private [final,static]' type=kotlin.IntArray origin=null FUN name:testVarPrefix visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR name:x type:kotlin.Int [var] diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt index ab7650ed8ad..80cc93d98f9 100644 --- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt +++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt @@ -27,7 +27,7 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:test visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:private [final] EXPRESSION_BODY WHEN type=kotlin.Int origin=WHEN BRANCH @@ -42,7 +42,7 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt $this: VALUE_PARAMETER name: type:.TestClass BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .TestClass' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .TestClass declared in .TestClass.' type=.TestClass origin=null ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/kt16904.txt b/compiler/testData/ir/irText/expressions/kt16904.txt index db5d0b4b756..e401be749a5 100644 --- a/compiler/testData/ir/irText/expressions/kt16904.txt +++ b/compiler/testData/ir/irText/expressions/kt16904.txt @@ -6,7 +6,7 @@ FILE fqName: fileName:/kt16904.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:.B visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:.B visibility:private [final] EXPRESSION_BODY CONSTRUCTOR_CALL 'public constructor () [primary] declared in .B' type=.B origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:.B @@ -14,10 +14,10 @@ FILE fqName: fileName:/kt16904.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): .B declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:.B visibility:public [final]' type=.B origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:.B visibility:private [final]' type=.B origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null PROPERTY name:y visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Int @@ -25,14 +25,14 @@ FILE fqName: fileName:/kt16904.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.A VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null value: GET_VAR ': kotlin.Int declared in .A.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean @@ -94,18 +94,12 @@ FILE fqName: fileName:/kt16904.kt $this: GET_VAR 'val tmp1_this: .Test1 [val] declared in .Test1.' type=.Test1 origin=null other: CONST Int type=kotlin.Int value=42 PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] - FIELD FAKE_OVERRIDE name:x type:.B visibility:public [final] - overridden: - FIELD PROPERTY_BACKING_FIELD name:x type:.B visibility:public [final] FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.A) returnType:.B correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] overridden: public final fun (): .B declared in .A $this: VALUE_PARAMETER name: type:.A PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [var] - FIELD FAKE_OVERRIDE name:y type:kotlin.Int visibility:public - overridden: - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Int correspondingProperty: PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [var] overridden: diff --git a/compiler/testData/ir/irText/expressions/kt28006.txt b/compiler/testData/ir/irText/expressions/kt28006.txt index 08fc87d3cb0..9cd4e297103 100644 --- a/compiler/testData/ir/irText/expressions/kt28006.txt +++ b/compiler/testData/ir/irText/expressions/kt28006.txt @@ -1,22 +1,22 @@ FILE fqName: fileName:/kt28006.kt PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CONST String type=kotlin.String value="\uD83E\uDD17" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CONST String type=kotlin.String value="\uD83E\uDD17\uD83E\uDD17" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:testConst1 visibility:public modality:FINAL [const,val] FIELD PROPERTY_BACKING_FIELD name:testConst1 type:kotlin.String visibility:public [final,static] EXPRESSION_BODY diff --git a/compiler/testData/ir/irText/expressions/literals.txt b/compiler/testData/ir/irText/expressions/literals.txt index 8f2f41ee94c..9161619ba89 100644 --- a/compiler/testData/ir/irText/expressions/literals.txt +++ b/compiler/testData/ir/irText/expressions/literals.txt @@ -1,154 +1,154 @@ FILE fqName: fileName:/literals.kt PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=-1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:test3 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Boolean visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Boolean visibility:private [final,static] EXPRESSION_BODY CONST Boolean type=kotlin.Boolean value=true FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Boolean correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Boolean declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Boolean visibility:public [final,static]' type=kotlin.Boolean origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Boolean visibility:private [final,static]' type=kotlin.Boolean origin=null PROPERTY name:test4 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Boolean visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Boolean visibility:private [final,static] EXPRESSION_BODY CONST Boolean type=kotlin.Boolean value=false FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Boolean correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Boolean declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Boolean visibility:public [final,static]' type=kotlin.Boolean origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Boolean visibility:private [final,static]' type=kotlin.Boolean origin=null PROPERTY name:test5 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CONST String type=kotlin.String value="abc" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:test5 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:test6 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Nothing? visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Nothing? visibility:private [final,static] EXPRESSION_BODY CONST Null type=kotlin.Nothing? value=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Nothing? correspondingProperty: PROPERTY name:test6 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Nothing? declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Nothing? visibility:public [final,static]' type=kotlin.Nothing? origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Nothing? visibility:private [final,static]' type=kotlin.Nothing? origin=null PROPERTY name:test7 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test7 type:kotlin.Long visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test7 type:kotlin.Long visibility:private [final,static] EXPRESSION_BODY CONST Long type=kotlin.Long value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Long correspondingProperty: PROPERTY name:test7 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Long declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test7 type:kotlin.Long visibility:public [final,static]' type=kotlin.Long origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test7 type:kotlin.Long visibility:private [final,static]' type=kotlin.Long origin=null PROPERTY name:test8 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Long visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Long visibility:private [final,static] EXPRESSION_BODY CONST Long type=kotlin.Long value=-1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Long correspondingProperty: PROPERTY name:test8 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Long declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Long visibility:public [final,static]' type=kotlin.Long origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Long visibility:private [final,static]' type=kotlin.Long origin=null PROPERTY name:test9 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Double visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Double visibility:private [final,static] EXPRESSION_BODY CONST Double type=kotlin.Double value=1.0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Double correspondingProperty: PROPERTY name:test9 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Double declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Double visibility:public [final,static]' type=kotlin.Double origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Double visibility:private [final,static]' type=kotlin.Double origin=null PROPERTY name:test10 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Double visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Double visibility:private [final,static] EXPRESSION_BODY CONST Double type=kotlin.Double value=-1.0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Double correspondingProperty: PROPERTY name:test10 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Double declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Double visibility:public [final,static]' type=kotlin.Double origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Double visibility:private [final,static]' type=kotlin.Double origin=null PROPERTY name:test11 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Float visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Float visibility:private [final,static] EXPRESSION_BODY CONST Float type=kotlin.Float value=1.0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Float correspondingProperty: PROPERTY name:test11 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Float declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Float visibility:public [final,static]' type=kotlin.Float origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Float visibility:private [final,static]' type=kotlin.Float origin=null PROPERTY name:test12 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Float visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Float visibility:private [final,static] EXPRESSION_BODY CONST Float type=kotlin.Float value=-1.0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Float correspondingProperty: PROPERTY name:test12 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Float declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Float visibility:public [final,static]' type=kotlin.Float origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Float visibility:private [final,static]' type=kotlin.Float origin=null PROPERTY name:test13 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Char visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Char visibility:private [final,static] EXPRESSION_BODY CONST Char type=kotlin.Char value='a' FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Char correspondingProperty: PROPERTY name:test13 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Char declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Char visibility:public [final,static]' type=kotlin.Char origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Char visibility:private [final,static]' type=kotlin.Char origin=null PROPERTY name:testB visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testB type:kotlin.Byte visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testB type:kotlin.Byte visibility:private [final,static] EXPRESSION_BODY CONST Byte type=kotlin.Byte value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Byte correspondingProperty: PROPERTY name:testB visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Byte declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testB type:kotlin.Byte visibility:public [final,static]' type=kotlin.Byte origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testB type:kotlin.Byte visibility:private [final,static]' type=kotlin.Byte origin=null PROPERTY name:testS visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testS type:kotlin.Short visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testS type:kotlin.Short visibility:private [final,static] EXPRESSION_BODY CONST Short type=kotlin.Short value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Short correspondingProperty: PROPERTY name:testS visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Short declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testS type:kotlin.Short visibility:public [final,static]' type=kotlin.Short origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testS type:kotlin.Short visibility:private [final,static]' type=kotlin.Short origin=null PROPERTY name:testI visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testI type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testI type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:testI visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testI type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testI type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:testL visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testL type:kotlin.Long visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testL type:kotlin.Long visibility:private [final,static] EXPRESSION_BODY CONST Long type=kotlin.Long value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Long correspondingProperty: PROPERTY name:testL visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Long declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testL type:kotlin.Long visibility:public [final,static]' type=kotlin.Long origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testL type:kotlin.Long visibility:private [final,static]' type=kotlin.Long origin=null diff --git a/compiler/testData/ir/irText/expressions/memberTypeArguments.txt b/compiler/testData/ir/irText/expressions/memberTypeArguments.txt index bc837967813..982c599f386 100644 --- a/compiler/testData/ir/irText/expressions/memberTypeArguments.txt +++ b/compiler/testData/ir/irText/expressions/memberTypeArguments.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/memberTypeArguments.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:GenericClass modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:T of .GenericClass visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:T of .GenericClass visibility:private [final] EXPRESSION_BODY GET_VAR 'value: T of .GenericClass declared in .GenericClass.' type=T of .GenericClass origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.GenericClass.GenericClass>) returnType:T of .GenericClass @@ -16,7 +16,7 @@ FILE fqName: fileName:/memberTypeArguments.kt $this: VALUE_PARAMETER name: type:.GenericClass.GenericClass> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of .GenericClass declared in .GenericClass' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .GenericClass visibility:public [final]' type=T of .GenericClass origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .GenericClass visibility:private [final]' type=T of .GenericClass origin=null receiver: GET_VAR ': .GenericClass.GenericClass> declared in .GenericClass.' type=.GenericClass.GenericClass> origin=null FUN name:withNewValue visibility:public modality:FINAL <> ($this:.GenericClass.GenericClass>, newValue:T of .GenericClass) returnType:.GenericClass.GenericClass> $this: VALUE_PARAMETER name: type:.GenericClass.GenericClass> diff --git a/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt b/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt index 6b14104f347..28f6f41a7e2 100644 --- a/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt +++ b/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt @@ -17,7 +17,7 @@ FILE fqName: fileName:/membersImportedFromObject.kt RETURN type=kotlin.Nothing from='public final fun fooExt (): kotlin.Int declared in .A' CONST Int type=kotlin.Int value=2 PROPERTY name:bar visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:private [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Int @@ -25,7 +25,7 @@ FILE fqName: fileName:/membersImportedFromObject.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null PROPERTY name:barExt visibility:public modality:FINAL [val] FUN name: visibility:public modality:FINAL <> ($this:.A, $receiver:kotlin.Int) returnType:kotlin.Int @@ -49,7 +49,7 @@ FILE fqName: fileName:/membersImportedFromObject.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun foo (): kotlin.Int declared in .A' type=kotlin.Int origin=null $this: GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.A @@ -57,9 +57,9 @@ FILE fqName: fileName:/membersImportedFromObject.kt correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=GET_PROPERTY $this: GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.A @@ -67,9 +67,9 @@ FILE fqName: fileName:/membersImportedFromObject.kt correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:test3 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun fooExt (): kotlin.Int declared in .A' type=kotlin.Int origin=null $this: GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.A @@ -78,9 +78,9 @@ FILE fqName: fileName:/membersImportedFromObject.kt correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:test4 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=GET_PROPERTY $this: GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.A @@ -89,4 +89,4 @@ FILE fqName: fileName:/membersImportedFromObject.kt correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/multipleThisReferences.txt b/compiler/testData/ir/irText/expressions/multipleThisReferences.txt index d5341292bd7..0427bd9d99f 100644 --- a/compiler/testData/ir/irText/expressions/multipleThisReferences.txt +++ b/compiler/testData/ir/irText/expressions/multipleThisReferences.txt @@ -14,7 +14,7 @@ FILE fqName: fileName:/multipleThisReferences.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Inner modality:OPEN visibility:public [inner] superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .Outer.Inner.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Outer.Inner) returnType:kotlin.Int @@ -22,7 +22,7 @@ FILE fqName: fileName:/multipleThisReferences.kt $this: VALUE_PARAMETER name: type:.Outer.Inner BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Outer.Inner' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Outer.Inner declared in .Outer.Inner.' type=.Outer.Inner origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -58,7 +58,7 @@ FILE fqName: fileName:/multipleThisReferences.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'y: kotlin.Int declared in .Host.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Host) returnType:kotlin.Int @@ -66,7 +66,7 @@ FILE fqName: fileName:/multipleThisReferences.kt $this: VALUE_PARAMETER name: type:.Host BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Host' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Host declared in .Host.' type=.Host origin=null FUN name:test visibility:public modality:FINAL <> ($this:.Host, $receiver:.Outer) returnType:.Outer.Inner $this: VALUE_PARAMETER name: type:.Host @@ -83,7 +83,7 @@ FILE fqName: fileName:/multipleThisReferences.kt x: CONST Int type=kotlin.Int value=42 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name: modality:FINAL visibility:local superTypes:[.Outer.Inner]' PROPERTY name:xx visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:private [final] EXPRESSION_BODY CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=PLUS $this: CALL 'public final fun (): kotlin.Int declared in .Host.test.' type=kotlin.Int origin=GET_PROPERTY @@ -95,12 +95,9 @@ FILE fqName: fileName:/multipleThisReferences.kt $this: VALUE_PARAMETER name: type:.Host.test. BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Host.test.' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Host.test. declared in .Host.test..' type=.Host.test. origin=null PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] - FIELD FAKE_OVERRIDE name:x type:kotlin.Int visibility:public [final] - overridden: - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.Outer.Inner) returnType:kotlin.Int correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [val] overridden: diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.txt index c75f932c6dd..6288e7002ea 100644 --- a/compiler/testData/ir/irText/expressions/objectAsCallable.txt +++ b/compiler/testData/ir/irText/expressions/objectAsCallable.txt @@ -87,7 +87,7 @@ FILE fqName: fileName:/objectAsCallable.kt RETURN type=kotlin.Nothing from='public final fun invoke (i: kotlin.Int): kotlin.Int declared in ' GET_VAR 'i: kotlin.Int declared in .invoke' type=kotlin.Int origin=null PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun invoke (i: kotlin.Int): kotlin.Int declared in ' type=kotlin.Int origin=INVOKE $receiver: GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.A @@ -96,9 +96,9 @@ FILE fqName: fileName:/objectAsCallable.kt correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun invoke (i: kotlin.Int): kotlin.Int declared in ' type=kotlin.Int origin=INVOKE $receiver: GET_ENUM 'ENUM_ENTRY name:X' type=.En @@ -107,4 +107,4 @@ FILE fqName: fileName:/objectAsCallable.kt correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/objectReference.txt b/compiler/testData/ir/irText/expressions/objectReference.txt index f6d869e828c..b5bd60ab3dd 100644 --- a/compiler/testData/ir/irText/expressions/objectReference.txt +++ b/compiler/testData/ir/irText/expressions/objectReference.txt @@ -6,7 +6,7 @@ FILE fqName: fileName:/objectReference.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:counter visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Z) returnType:kotlin.Int @@ -14,14 +14,14 @@ FILE fqName: fileName:/objectReference.kt $this: VALUE_PARAMETER name: type:.Z BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Z' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .Z declared in .Z.' type=.Z origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Z, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:counter visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.Z VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .Z declared in .Z.' type=.Z origin=null value: GET_VAR ': kotlin.Int declared in .Z.' type=kotlin.Int origin=null FUN name:foo visibility:public modality:FINAL <> ($this:.Z) returnType:kotlin.Unit @@ -85,7 +85,7 @@ FILE fqName: fileName:/objectReference.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:aLambda visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:aLambda type:kotlin.Function0 visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:aLambda type:kotlin.Function0 visibility:private [final] EXPRESSION_BODY FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit @@ -106,10 +106,10 @@ FILE fqName: fileName:/objectReference.kt $this: VALUE_PARAMETER name: type:.Z BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function0 declared in .Z' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:aLambda type:kotlin.Function0 visibility:public [final]' type=kotlin.Function0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:aLambda type:kotlin.Function0 visibility:private [final]' type=kotlin.Function0 origin=null receiver: GET_VAR ': .Z declared in .Z.' type=.Z origin=null PROPERTY name:anObject visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:anObject type:kotlin.Any visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:anObject type:kotlin.Any visibility:private [final] EXPRESSION_BODY BLOCK type=.Z.anObject. origin=OBJECT_LITERAL CLASS CLASS name: modality:FINAL visibility:local superTypes:[kotlin.Any] @@ -162,7 +162,7 @@ FILE fqName: fileName:/objectReference.kt $this: VALUE_PARAMETER name: type:.Z BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in .Z' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anObject type:kotlin.Any visibility:public [final]' type=kotlin.Any origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anObject type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null receiver: GET_VAR ': .Z declared in .Z.' type=.Z origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.txt b/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.txt index a408721ea85..e648ba86429 100644 --- a/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.txt +++ b/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/objectReferenceInClosureInSuperConstructorCall.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]' PROPERTY name:lambda visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:lambda type:kotlin.Function0 visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:lambda type:kotlin.Function0 visibility:private [final] EXPRESSION_BODY GET_VAR 'lambda: kotlin.Function0 declared in .Base.' type=kotlin.Function0 origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Base) returnType:kotlin.Function0 @@ -15,7 +15,7 @@ FILE fqName: fileName:/objectReferenceInClosureInSuperConstructorCall.kt $this: VALUE_PARAMETER name: type:.Base BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function0 declared in .Base' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:lambda type:kotlin.Function0 visibility:public [final]' type=kotlin.Function0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:lambda type:kotlin.Function0 visibility:private [final]' type=kotlin.Function0 origin=null receiver: GET_VAR ': .Base declared in .Base.' type=.Base origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -42,9 +42,6 @@ FILE fqName: fileName:/objectReferenceInClosureInSuperConstructorCall.kt GET_OBJECT 'CLASS OBJECT name:Test modality:FINAL visibility:public superTypes:[.Base]' type=.Test INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Test modality:FINAL visibility:public superTypes:[.Base]' PROPERTY FAKE_OVERRIDE name:lambda visibility:public modality:FINAL [val] - FIELD FAKE_OVERRIDE name:lambda type:kotlin.Function0 visibility:public [final] - overridden: - FIELD PROPERTY_BACKING_FIELD name:lambda type:kotlin.Function0 visibility:public [final] FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.Base) returnType:kotlin.Function0 correspondingProperty: PROPERTY FAKE_OVERRIDE name:lambda visibility:public modality:FINAL [val] overridden: diff --git a/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt b/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt index 29fab493bed..526a1367ab6 100644 --- a/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt +++ b/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt @@ -1,33 +1,33 @@ FILE fqName: fileName:/primitivesImplicitConversions.kt PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Long visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Long visibility:private [final,static] EXPRESSION_BODY CONST Long type=kotlin.Long value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Long correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Long declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Long visibility:public [final,static]' type=kotlin.Long origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Long visibility:private [final,static]' type=kotlin.Long origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Short visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Short visibility:private [final,static] EXPRESSION_BODY CONST Short type=kotlin.Short value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Short correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Short declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Short visibility:public [final,static]' type=kotlin.Short origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Short visibility:private [final,static]' type=kotlin.Short origin=null PROPERTY name:test3 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Byte visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Byte visibility:private [final,static] EXPRESSION_BODY CONST Byte type=kotlin.Byte value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Byte correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Byte declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Byte visibility:public [final,static]' type=kotlin.Byte origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Byte visibility:private [final,static]' type=kotlin.Byte origin=null PROPERTY name:test4 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Long visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Long visibility:private [final,static] EXPRESSION_BODY TYPE_OP type=kotlin.Long origin=IMPLICIT_INTEGER_COERCION typeOperand=kotlin.Long CALL 'public final fun unaryMinus (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null @@ -36,9 +36,9 @@ FILE fqName: fileName:/primitivesImplicitConversions.kt correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Long declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Long visibility:public [final,static]' type=kotlin.Long origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Long visibility:private [final,static]' type=kotlin.Long origin=null PROPERTY name:test5 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Short visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Short visibility:private [final,static] EXPRESSION_BODY TYPE_OP type=kotlin.Short origin=IMPLICIT_INTEGER_COERCION typeOperand=kotlin.Short CALL 'public final fun unaryMinus (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null @@ -47,9 +47,9 @@ FILE fqName: fileName:/primitivesImplicitConversions.kt correspondingProperty: PROPERTY name:test5 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Short declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Short visibility:public [final,static]' type=kotlin.Short origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Short visibility:private [final,static]' type=kotlin.Short origin=null PROPERTY name:test6 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Byte visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Byte visibility:private [final,static] EXPRESSION_BODY TYPE_OP type=kotlin.Byte origin=IMPLICIT_INTEGER_COERCION typeOperand=kotlin.Byte CALL 'public final fun unaryMinus (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null @@ -58,7 +58,7 @@ FILE fqName: fileName:/primitivesImplicitConversions.kt correspondingProperty: PROPERTY name:test6 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Byte declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Byte visibility:public [final,static]' type=kotlin.Byte origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Byte visibility:private [final,static]' type=kotlin.Byte origin=null FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR name:test1 type:kotlin.Int? [val] @@ -100,7 +100,7 @@ FILE fqName: fileName:/primitivesImplicitConversions.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestImplicitArguments modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Long visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Long visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Long declared in .TestImplicitArguments.' type=kotlin.Long origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestImplicitArguments) returnType:kotlin.Long @@ -108,7 +108,7 @@ FILE fqName: fileName:/primitivesImplicitConversions.kt $this: VALUE_PARAMETER name: type:.TestImplicitArguments BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Long declared in .TestImplicitArguments' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Long visibility:public [final]' type=kotlin.Long origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Long visibility:private [final]' type=kotlin.Long origin=null receiver: GET_VAR ': .TestImplicitArguments declared in .TestImplicitArguments.' type=.TestImplicitArguments origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/expressions/propertyReferences.txt b/compiler/testData/ir/irText/expressions/propertyReferences.txt index f4847508b6e..0f25b11315b 100644 --- a/compiler/testData/ir/irText/expressions/propertyReferences.txt +++ b/compiler/testData/ir/irText/expressions/propertyReferences.txt @@ -38,7 +38,7 @@ FILE fqName: fileName:/propertyReferences.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:OPEN visibility:public superTypes:[kotlin.Any]' PROPERTY name:varWithPrivateSet visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:varWithPrivateSet type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:varWithPrivateSet type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -46,18 +46,18 @@ FILE fqName: fileName:/propertyReferences.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithPrivateSet type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithPrivateSet type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> ($this:.C, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:varWithPrivateSet visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithPrivateSet type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithPrivateSet type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null value: GET_VAR ': kotlin.Int declared in .C.' type=kotlin.Int origin=null PROPERTY name:varWithProtectedSet visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:varWithProtectedSet type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:varWithProtectedSet type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -65,14 +65,14 @@ FILE fqName: fileName:/propertyReferences.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithProtectedSet type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithProtectedSet type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:protected modality:FINAL <> ($this:.C, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:varWithProtectedSet visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithProtectedSet type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithProtectedSet type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null value: GET_VAR ': kotlin.Int declared in .C.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean @@ -89,71 +89,71 @@ FILE fqName: fileName:/propertyReferences.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:valWithBackingField visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:valWithBackingField type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:valWithBackingField type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:valWithBackingField visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:valWithBackingField type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:valWithBackingField type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:test_valWithBackingField visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test_valWithBackingField type:kotlin.reflect.KProperty0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test_valWithBackingField type:kotlin.reflect.KProperty0 visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final valWithBackingField: kotlin.Int [val]' field=null getter='public final fun (): kotlin.Int declared in ' setter=null type=kotlin.reflect.KProperty0 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KProperty0 correspondingProperty: PROPERTY name:test_valWithBackingField visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KProperty0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_valWithBackingField type:kotlin.reflect.KProperty0 visibility:public [final,static]' type=kotlin.reflect.KProperty0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_valWithBackingField type:kotlin.reflect.KProperty0 visibility:private [final,static]' type=kotlin.reflect.KProperty0 origin=null PROPERTY name:varWithBackingField visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:varWithBackingField type:kotlin.Int visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:varWithBackingField type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:varWithBackingField visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingField type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingField type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:varWithBackingField visibility:public modality:FINAL [var] VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingField type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingField type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: GET_VAR ': kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:test_varWithBackingField visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test_varWithBackingField type:kotlin.reflect.KMutableProperty0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test_varWithBackingField type:kotlin.reflect.KMutableProperty0 visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final varWithBackingField: kotlin.Int [var]' field=null getter='public final fun (): kotlin.Int declared in ' setter='public final fun (: kotlin.Int): kotlin.Unit declared in ' type=kotlin.reflect.KMutableProperty0 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KMutableProperty0 correspondingProperty: PROPERTY name:test_varWithBackingField visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KMutableProperty0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithBackingField type:kotlin.reflect.KMutableProperty0 visibility:public [final,static]' type=kotlin.reflect.KMutableProperty0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithBackingField type:kotlin.reflect.KMutableProperty0 visibility:private [final,static]' type=kotlin.reflect.KMutableProperty0 origin=null PROPERTY name:varWithBackingFieldAndAccessors visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:varWithBackingFieldAndAccessors type:kotlin.Int visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:varWithBackingFieldAndAccessors type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:varWithBackingFieldAndAccessors visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingFieldAndAccessors type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingFieldAndAccessors type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null FUN name: visibility:public modality:FINAL <> (value:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:varWithBackingFieldAndAccessors visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingFieldAndAccessors type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=EQ + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingFieldAndAccessors type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=EQ value: GET_VAR 'value: kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:test_varWithBackingFieldAndAccessors visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test_varWithBackingFieldAndAccessors type:kotlin.reflect.KMutableProperty0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test_varWithBackingFieldAndAccessors type:kotlin.reflect.KMutableProperty0 visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final varWithBackingFieldAndAccessors: kotlin.Int [var]' field=null getter='public final fun (): kotlin.Int declared in ' setter='public final fun (value: kotlin.Int): kotlin.Unit declared in ' type=kotlin.reflect.KMutableProperty0 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KMutableProperty0 correspondingProperty: PROPERTY name:test_varWithBackingFieldAndAccessors visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KMutableProperty0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithBackingFieldAndAccessors type:kotlin.reflect.KMutableProperty0 visibility:public [final,static]' type=kotlin.reflect.KMutableProperty0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithBackingFieldAndAccessors type:kotlin.reflect.KMutableProperty0 visibility:private [final,static]' type=kotlin.reflect.KMutableProperty0 origin=null PROPERTY name:valWithAccessors visibility:public modality:FINAL [val] FUN name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:valWithAccessors visibility:public modality:FINAL [val] @@ -161,14 +161,14 @@ FILE fqName: fileName:/propertyReferences.kt RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' CONST Int type=kotlin.Int value=1 PROPERTY name:test_valWithAccessors visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test_valWithAccessors type:kotlin.reflect.KProperty0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test_valWithAccessors type:kotlin.reflect.KProperty0 visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final valWithAccessors: kotlin.Int [val]' field=null getter='public final fun (): kotlin.Int declared in ' setter=null type=kotlin.reflect.KProperty0 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KProperty0 correspondingProperty: PROPERTY name:test_valWithAccessors visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KProperty0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_valWithAccessors type:kotlin.reflect.KProperty0 visibility:public [final,static]' type=kotlin.reflect.KProperty0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_valWithAccessors type:kotlin.reflect.KProperty0 visibility:private [final,static]' type=kotlin.reflect.KProperty0 origin=null PROPERTY name:varWithAccessors visibility:public modality:FINAL [var] FUN name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:varWithAccessors visibility:public modality:FINAL [var] @@ -180,14 +180,14 @@ FILE fqName: fileName:/propertyReferences.kt VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY PROPERTY name:test_varWithAccessors visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test_varWithAccessors type:kotlin.reflect.KMutableProperty0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test_varWithAccessors type:kotlin.reflect.KMutableProperty0 visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final varWithAccessors: kotlin.Int [var]' field=null getter='public final fun (): kotlin.Int declared in ' setter='public final fun (value: kotlin.Int): kotlin.Unit declared in ' type=kotlin.reflect.KMutableProperty0 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KMutableProperty0 correspondingProperty: PROPERTY name:test_varWithAccessors visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KMutableProperty0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithAccessors type:kotlin.reflect.KMutableProperty0 visibility:public [final,static]' type=kotlin.reflect.KMutableProperty0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithAccessors type:kotlin.reflect.KMutableProperty0 visibility:private [final,static]' type=kotlin.reflect.KMutableProperty0 origin=null PROPERTY name:delegatedVal visibility:public modality:FINAL [delegated,val] FIELD DELEGATE name:delegatedVal$delegate type:.Delegate visibility:private [final,static] EXPRESSION_BODY @@ -201,14 +201,14 @@ FILE fqName: fileName:/propertyReferences.kt thisRef: CONST Null type=kotlin.Nothing? value=null kProp: PROPERTY_REFERENCE 'public final delegatedVal: kotlin.Int [delegated,val]' field=null getter='public final fun (): kotlin.Int declared in ' setter=null type=kotlin.reflect.KProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE PROPERTY name:test_delegatedVal visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test_delegatedVal type:kotlin.reflect.KProperty0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test_delegatedVal type:kotlin.reflect.KProperty0 visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final delegatedVal: kotlin.Int [delegated,val]' field=null getter='public final fun (): kotlin.Int declared in ' setter=null type=kotlin.reflect.KProperty0 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KProperty0 correspondingProperty: PROPERTY name:test_delegatedVal visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KProperty0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_delegatedVal type:kotlin.reflect.KProperty0 visibility:public [final,static]' type=kotlin.reflect.KProperty0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_delegatedVal type:kotlin.reflect.KProperty0 visibility:private [final,static]' type=kotlin.reflect.KProperty0 origin=null PROPERTY name:delegatedVar visibility:public modality:FINAL [delegated,var] FIELD DELEGATE name:delegatedVar$delegate type:.Delegate visibility:private [final,static] EXPRESSION_BODY @@ -232,65 +232,65 @@ FILE fqName: fileName:/propertyReferences.kt kProp: PROPERTY_REFERENCE 'public final delegatedVar: kotlin.Int [delegated,var]' field=null getter='public final fun (): kotlin.Int declared in ' setter='public final fun (: kotlin.Int): kotlin.Unit declared in ' type=kotlin.reflect.KMutableProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE value: GET_VAR ': kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:test_delegatedVar visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test_delegatedVar type:kotlin.reflect.KMutableProperty0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test_delegatedVar type:kotlin.reflect.KMutableProperty0 visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final delegatedVar: kotlin.Int [delegated,var]' field=null getter='public final fun (): kotlin.Int declared in ' setter='public final fun (: kotlin.Int): kotlin.Unit declared in ' type=kotlin.reflect.KMutableProperty0 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KMutableProperty0 correspondingProperty: PROPERTY name:test_delegatedVar visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KMutableProperty0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_delegatedVar type:kotlin.reflect.KMutableProperty0 visibility:public [final,static]' type=kotlin.reflect.KMutableProperty0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_delegatedVar type:kotlin.reflect.KMutableProperty0 visibility:private [final,static]' type=kotlin.reflect.KMutableProperty0 origin=null PROPERTY name:constVal visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:constVal type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:constVal type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:constVal visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:constVal type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:constVal type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:test_constVal visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test_constVal type:kotlin.reflect.KProperty0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test_constVal type:kotlin.reflect.KProperty0 visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final constVal: kotlin.Int [val]' field=null getter='public final fun (): kotlin.Int declared in ' setter=null type=kotlin.reflect.KProperty0 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KProperty0 correspondingProperty: PROPERTY name:test_constVal visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KProperty0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_constVal type:kotlin.reflect.KProperty0 visibility:public [final,static]' type=kotlin.reflect.KProperty0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_constVal type:kotlin.reflect.KProperty0 visibility:private [final,static]' type=kotlin.reflect.KProperty0 origin=null PROPERTY name:test_J_CONST visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test_J_CONST type:kotlin.reflect.KProperty0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test_J_CONST type:kotlin.reflect.KProperty0 visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final CONST: kotlin.Int [const,val]' field='FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:CONST type:kotlin.Int visibility:public [final,static]' getter=null setter=null type=kotlin.reflect.KProperty0 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KProperty0 correspondingProperty: PROPERTY name:test_J_CONST visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KProperty0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_J_CONST type:kotlin.reflect.KProperty0 visibility:public [final,static]' type=kotlin.reflect.KProperty0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_J_CONST type:kotlin.reflect.KProperty0 visibility:private [final,static]' type=kotlin.reflect.KProperty0 origin=null PROPERTY name:test_J_nonConst visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test_J_nonConst type:kotlin.reflect.KMutableProperty0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test_J_nonConst type:kotlin.reflect.KMutableProperty0 visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final nonConst: kotlin.Int [var]' field='FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:nonConst type:kotlin.Int visibility:public [static]' getter=null setter=null type=kotlin.reflect.KMutableProperty0 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KMutableProperty0 correspondingProperty: PROPERTY name:test_J_nonConst visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KMutableProperty0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_J_nonConst type:kotlin.reflect.KMutableProperty0 visibility:public [final,static]' type=kotlin.reflect.KMutableProperty0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_J_nonConst type:kotlin.reflect.KMutableProperty0 visibility:private [final,static]' type=kotlin.reflect.KMutableProperty0 origin=null PROPERTY name:test_varWithPrivateSet visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test_varWithPrivateSet type:kotlin.reflect.KProperty1<.C, kotlin.Int> visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test_varWithPrivateSet type:kotlin.reflect.KProperty1<.C, kotlin.Int> visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final varWithPrivateSet: kotlin.Int [var]' field=null getter='public final fun (): kotlin.Int declared in .C' setter=null type=kotlin.reflect.KProperty1<.C, kotlin.Int> origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KProperty1<.C, kotlin.Int> correspondingProperty: PROPERTY name:test_varWithPrivateSet visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KProperty1<.C, kotlin.Int> declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithPrivateSet type:kotlin.reflect.KProperty1<.C, kotlin.Int> visibility:public [final,static]' type=kotlin.reflect.KProperty1<.C, kotlin.Int> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithPrivateSet type:kotlin.reflect.KProperty1<.C, kotlin.Int> visibility:private [final,static]' type=kotlin.reflect.KProperty1<.C, kotlin.Int> origin=null PROPERTY name:test_varWithProtectedSet visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test_varWithProtectedSet type:kotlin.reflect.KProperty1<.C, kotlin.Int> visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test_varWithProtectedSet type:kotlin.reflect.KProperty1<.C, kotlin.Int> visibility:private [final,static] EXPRESSION_BODY PROPERTY_REFERENCE 'public final varWithProtectedSet: kotlin.Int [var]' field=null getter='public final fun (): kotlin.Int declared in .C' setter=null type=kotlin.reflect.KProperty1<.C, kotlin.Int> origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KProperty1<.C, kotlin.Int> correspondingProperty: PROPERTY name:test_varWithProtectedSet visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KProperty1<.C, kotlin.Int> declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithProtectedSet type:kotlin.reflect.KProperty1<.C, kotlin.Int> visibility:public [final,static]' type=kotlin.reflect.KProperty1<.C, kotlin.Int> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithProtectedSet type:kotlin.reflect.KProperty1<.C, kotlin.Int> visibility:private [final,static]' type=kotlin.reflect.KProperty1<.C, kotlin.Int> origin=null diff --git a/compiler/testData/ir/irText/expressions/references.txt b/compiler/testData/ir/irText/expressions/references.txt index be83e892cb1..adfc2aada4c 100644 --- a/compiler/testData/ir/irText/expressions/references.txt +++ b/compiler/testData/ir/irText/expressions/references.txt @@ -1,22 +1,22 @@ FILE fqName: fileName:/references.kt PROPERTY name:ok visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:ok type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:ok type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CONST String type=kotlin.String value="OK" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:ok visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ok type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ok type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:ok2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:ok2 type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:ok2 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:ok2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ok2 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ok2 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:ok3 visibility:public modality:FINAL [val] FUN name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:ok3 visibility:public modality:FINAL [val] diff --git a/compiler/testData/ir/irText/expressions/reflectionLiterals.txt b/compiler/testData/ir/irText/expressions/reflectionLiterals.txt index 3b4da6856f5..3006c9ca94d 100644 --- a/compiler/testData/ir/irText/expressions/reflectionLiterals.txt +++ b/compiler/testData/ir/irText/expressions/reflectionLiterals.txt @@ -24,25 +24,25 @@ FILE fqName: fileName:/reflectionLiterals.kt FUN name:bar visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY PROPERTY name:qux visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:qux type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:qux type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:qux visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:qux type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:qux type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KClass<.A> visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KClass<.A> visibility:private [final,static] EXPRESSION_BODY CLASS_REFERENCE 'CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.A> FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KClass<.A> correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KClass<.A> declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KClass<.A> visibility:public [final,static]' type=kotlin.reflect.KClass<.A> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KClass<.A> visibility:private [final,static]' type=kotlin.reflect.KClass<.A> origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KClass visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KClass visibility:private [final,static] EXPRESSION_BODY GET_CLASS type=kotlin.reflect.KClass CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY @@ -50,27 +50,27 @@ FILE fqName: fileName:/reflectionLiterals.kt correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KClass declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KClass visibility:public [final,static]' type=kotlin.reflect.KClass origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KClass visibility:private [final,static]' type=kotlin.reflect.KClass origin=null PROPERTY name:test3 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.reflect.KFunction1<.A, kotlin.Unit> visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.reflect.KFunction1<.A, kotlin.Unit> visibility:private [final,static] EXPRESSION_BODY FUNCTION_REFERENCE 'public final fun foo (): kotlin.Unit declared in .A' type=kotlin.reflect.KFunction1<.A, kotlin.Unit> origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KFunction1<.A, kotlin.Unit> correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KFunction1<.A, kotlin.Unit> declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.reflect.KFunction1<.A, kotlin.Unit> visibility:public [final,static]' type=kotlin.reflect.KFunction1<.A, kotlin.Unit> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.reflect.KFunction1<.A, kotlin.Unit> visibility:private [final,static]' type=kotlin.reflect.KFunction1<.A, kotlin.Unit> origin=null PROPERTY name:test4 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.reflect.KFunction0<.A> visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.reflect.KFunction0<.A> visibility:private [final,static] EXPRESSION_BODY FUNCTION_REFERENCE 'public constructor () [primary] declared in .A' type=kotlin.reflect.KFunction0<.A> origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KFunction0<.A> correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KFunction0<.A> declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.reflect.KFunction0<.A> visibility:public [final,static]' type=kotlin.reflect.KFunction0<.A> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.reflect.KFunction0<.A> visibility:private [final,static]' type=kotlin.reflect.KFunction0<.A> origin=null PROPERTY name:test5 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.reflect.KFunction0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.reflect.KFunction0 visibility:private [final,static] EXPRESSION_BODY FUNCTION_REFERENCE 'public final fun foo (): kotlin.Unit declared in .A' type=kotlin.reflect.KFunction0 origin=null $this: CONSTRUCTOR_CALL 'public constructor () [primary] declared in .A' type=.A origin=null @@ -78,13 +78,13 @@ FILE fqName: fileName:/reflectionLiterals.kt correspondingProperty: PROPERTY name:test5 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KFunction0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.reflect.KFunction0 visibility:public [final,static]' type=kotlin.reflect.KFunction0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.reflect.KFunction0 visibility:private [final,static]' type=kotlin.reflect.KFunction0 origin=null PROPERTY name:test6 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.reflect.KFunction0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.reflect.KFunction0 visibility:private [final,static] EXPRESSION_BODY FUNCTION_REFERENCE 'public final fun bar (): kotlin.Unit declared in ' type=kotlin.reflect.KFunction0 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KFunction0 correspondingProperty: PROPERTY name:test6 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KFunction0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.reflect.KFunction0 visibility:public [final,static]' type=kotlin.reflect.KFunction0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.reflect.KFunction0 visibility:private [final,static]' type=kotlin.reflect.KFunction0 origin=null diff --git a/compiler/testData/ir/irText/expressions/safeAssignment.txt b/compiler/testData/ir/irText/expressions/safeAssignment.txt index 775ea1e1e2b..5988402711a 100644 --- a/compiler/testData/ir/irText/expressions/safeAssignment.txt +++ b/compiler/testData/ir/irText/expressions/safeAssignment.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/safeAssignment.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .C.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -15,14 +15,14 @@ FILE fqName: fileName:/safeAssignment.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null value: GET_VAR ': kotlin.Int declared in .C.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/irText/expressions/safeCalls.txt b/compiler/testData/ir/irText/expressions/safeCalls.txt index 4ac18871249..6bddececddb 100644 --- a/compiler/testData/ir/irText/expressions/safeCalls.txt +++ b/compiler/testData/ir/irText/expressions/safeCalls.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/safeCalls.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Ref modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:private EXPRESSION_BODY GET_VAR 'value: kotlin.Int declared in .Ref.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Ref) returnType:kotlin.Int @@ -15,14 +15,14 @@ FILE fqName: fileName:/safeCalls.kt $this: VALUE_PARAMETER name: type:.Ref BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Ref' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .Ref declared in .Ref.' type=.Ref origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Ref, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.Ref VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .Ref declared in .Ref.' type=.Ref origin=null value: GET_VAR ': kotlin.Int declared in .Ref.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.txt b/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.txt index 91741e44c2b..d5f16a4f47b 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.txt @@ -21,7 +21,7 @@ FILE fqName: fileName:/samConversionInGenericConstructorCall_NI.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Outer modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:j11 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:j11 type:.J.Outer, T1 of .Outer> visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:j11 type:.J.Outer, T1 of .Outer> visibility:private [final] EXPRESSION_BODY GET_VAR 'j11: .J.Outer, T1 of .Outer> declared in .Outer.' type=.J.Outer, T1 of .Outer> origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Outer.Outer>) returnType:.J.Outer, T1 of .Outer> @@ -29,7 +29,7 @@ FILE fqName: fileName:/samConversionInGenericConstructorCall_NI.kt $this: VALUE_PARAMETER name: type:.Outer.Outer> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): .J.Outer, T1 of .Outer> declared in .Outer' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:j11 type:.J.Outer, T1 of .Outer> visibility:public [final]' type=.J.Outer, T1 of .Outer> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:j11 type:.J.Outer, T1 of .Outer> visibility:private [final]' type=.J.Outer, T1 of .Outer> origin=null receiver: GET_VAR ': .Outer.Outer> declared in .Outer.' type=.Outer.Outer> origin=null CLASS CLASS name:Inner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Outer.Inner.Outer.Inner, T1 of .Outer> @@ -41,7 +41,7 @@ FILE fqName: fileName:/samConversionInGenericConstructorCall_NI.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Inner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]' PROPERTY name:j12 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:j12 type:.J.Outer, T2 of .Outer.Inner> visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:j12 type:.J.Outer, T2 of .Outer.Inner> visibility:private [final] EXPRESSION_BODY GET_VAR 'j12: .J.Outer, T2 of .Outer.Inner> declared in .Outer.Inner.' type=.J.Outer, T2 of .Outer.Inner> origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Outer.Inner.Outer.Inner, T1 of .Outer>) returnType:.J.Outer, T2 of .Outer.Inner> @@ -49,7 +49,7 @@ FILE fqName: fileName:/samConversionInGenericConstructorCall_NI.kt $this: VALUE_PARAMETER name: type:.Outer.Inner.Outer.Inner, T1 of .Outer> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): .J.Outer, T2 of .Outer.Inner> declared in .Outer.Inner' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:j12 type:.J.Outer, T2 of .Outer.Inner> visibility:public [final]' type=.J.Outer, T2 of .Outer.Inner> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:j12 type:.J.Outer, T2 of .Outer.Inner> visibility:private [final]' type=.J.Outer, T2 of .Outer.Inner> origin=null receiver: GET_VAR ': .Outer.Inner.Outer.Inner, T1 of .Outer> declared in .Outer.Inner.' type=.Outer.Inner.Outer.Inner, T1 of .Outer> origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.txt b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.txt index 24dcca968dc..e0ca3415713 100644 --- a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.txt +++ b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.txt @@ -35,14 +35,14 @@ FILE fqName: fileName:/signedToUnsignedConversions_test.kt PROPERTY name:NON_CONST visibility:public modality:FINAL [val] annotations: ImplicitIntegerCoercion - FIELD PROPERTY_BACKING_FIELD name:NON_CONST type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:NON_CONST type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=255 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:NON_CONST visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:NON_CONST type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:NON_CONST type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:BIGGER_THAN_UBYTE visibility:public modality:FINAL [const,val] annotations: ImplicitIntegerCoercion diff --git a/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.txt b/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.txt index 33938bf733e..09a9534c7d6 100644 --- a/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.txt +++ b/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/specializedTypeAliasConstructorCall.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Cell modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:T of .Cell visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:T of .Cell visibility:private [final] EXPRESSION_BODY GET_VAR 'value: T of .Cell declared in .Cell.' type=T of .Cell origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Cell.Cell>) returnType:T of .Cell @@ -16,7 +16,7 @@ FILE fqName: fileName:/specializedTypeAliasConstructorCall.kt $this: VALUE_PARAMETER name: type:.Cell.Cell> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of .Cell declared in .Cell' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Cell visibility:public [final]' type=T of .Cell origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Cell visibility:private [final]' type=T of .Cell origin=null receiver: GET_VAR ': .Cell.Cell> declared in .Cell.' type=.Cell.Cell> origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/expressions/stringTemplates.txt b/compiler/testData/ir/irText/expressions/stringTemplates.txt index b5e8a64cb5c..4800fb044e6 100644 --- a/compiler/testData/ir/irText/expressions/stringTemplates.txt +++ b/compiler/testData/ir/irText/expressions/stringTemplates.txt @@ -4,61 +4,61 @@ FILE fqName: fileName:/stringTemplates.kt RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in ' CONST String type=kotlin.String value="" PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CONST String type=kotlin.String value="" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CONST String type=kotlin.String value="abc" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:test3 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CONST String type=kotlin.String value="" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:test4 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CONST String type=kotlin.String value="abc" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:test5 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CONST String type=kotlin.String value="\nabc\n" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:test5 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:test6 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY STRING_CONCATENATION type=kotlin.String CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY @@ -68,9 +68,9 @@ FILE fqName: fileName:/stringTemplates.kt correspondingProperty: PROPERTY name:test6 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:test7 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test7 type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test7 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY STRING_CONCATENATION type=kotlin.String CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY @@ -78,9 +78,9 @@ FILE fqName: fileName:/stringTemplates.kt correspondingProperty: PROPERTY name:test7 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test7 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test7 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:test8 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY STRING_CONCATENATION type=kotlin.String CALL 'public final fun foo (): kotlin.String declared in ' type=kotlin.String origin=null @@ -88,9 +88,9 @@ FILE fqName: fileName:/stringTemplates.kt correspondingProperty: PROPERTY name:test8 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null PROPERTY name:test9 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.String visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY STRING_CONCATENATION type=kotlin.String CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY @@ -98,4 +98,4 @@ FILE fqName: fileName:/stringTemplates.kt correspondingProperty: PROPERTY name:test9 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.txt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.txt index 76a3f5b4ccd..146fdabeb15 100644 --- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.txt +++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.txt @@ -1,13 +1,13 @@ FILE fqName: fileName:/temporaryInEnumEntryInitializer.kt PROPERTY name:n visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:n type:kotlin.Any? visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:n type:kotlin.Any? visibility:private [final,static] EXPRESSION_BODY CONST Null type=kotlin.Nothing? value=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Any? correspondingProperty: PROPERTY name:n visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any? declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:n type:kotlin.Any? visibility:public [final,static]' type=kotlin.Any? origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:n type:kotlin.Any? visibility:private [final,static]' type=kotlin.Any? origin=null CLASS ENUM_CLASS name:En modality:FINAL visibility:public superTypes:[kotlin.Enum<.En>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.En CONSTRUCTOR visibility:private <> (x:kotlin.String?) returnType:.En [primary] @@ -17,7 +17,7 @@ FILE fqName: fileName:/temporaryInEnumEntryInitializer.kt : .En INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:En modality:FINAL visibility:public superTypes:[kotlin.Enum<.En>]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String? visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String? visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.String? declared in .En.' type=kotlin.String? origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.En) returnType:kotlin.String? @@ -25,7 +25,7 @@ FILE fqName: fileName:/temporaryInEnumEntryInitializer.kt $this: VALUE_PARAMETER name: type:.En BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String? declared in .En' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String? visibility:public [final]' type=kotlin.String? origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String? visibility:private [final]' type=kotlin.String? origin=null receiver: GET_VAR ': .En declared in .En.' type=.En origin=null ENUM_ENTRY name:ENTRY init: ENUM_CONSTRUCTOR_CALL 'private constructor (x: kotlin.String?) [primary] declared in .En' diff --git a/compiler/testData/ir/irText/expressions/temporaryInInitBlock.txt b/compiler/testData/ir/irText/expressions/temporaryInInitBlock.txt index 9a92fe01363..f74458267d4 100644 --- a/compiler/testData/ir/irText/expressions/temporaryInInitBlock.txt +++ b/compiler/testData/ir/irText/expressions/temporaryInInitBlock.txt @@ -7,17 +7,17 @@ FILE fqName: fileName:/temporaryInInitBlock.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:s visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String? visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String? visibility:private [final] FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.String? correspondingProperty: PROPERTY name:s visibility:public modality:FINAL [val] $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String? declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String? visibility:public [final]' type=kotlin.String? origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String? visibility:private [final]' type=kotlin.String? origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String? visibility:public [final]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String? visibility:private [final]' type=kotlin.Unit origin=null receiver: GET_VAR ': .C declared in .C' type=.C origin=null value: BLOCK type=kotlin.String? origin=SAFE_CALL VAR IR_TEMPORARY_VARIABLE name:tmp0_safe_receiver type:kotlin.Any? [val] diff --git a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt index 17666aba31d..c9f547a86dc 100644 --- a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt +++ b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/thisOfGenericOuterClass.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Outer modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:T of .Outer visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:T of .Outer visibility:private [final] EXPRESSION_BODY GET_VAR 'x: T of .Outer declared in .Outer.' type=T of .Outer origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Outer.Outer>) returnType:T of .Outer @@ -16,7 +16,7 @@ FILE fqName: fileName:/thisOfGenericOuterClass.kt $this: VALUE_PARAMETER name: type:.Outer.Outer> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of .Outer declared in .Outer' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .Outer visibility:public [final]' type=T of .Outer origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .Outer visibility:private [final]' type=T of .Outer origin=null receiver: GET_VAR ': .Outer.Outer> declared in .Outer.' type=.Outer.Outer> origin=null CLASS CLASS name:Inner modality:OPEN visibility:public [inner] superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Outer.Inner.Outer> @@ -27,7 +27,7 @@ FILE fqName: fileName:/thisOfGenericOuterClass.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Inner modality:OPEN visibility:public [inner] superTypes:[kotlin.Any]' PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'y: kotlin.Int declared in .Outer.Inner.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Outer.Inner.Outer>) returnType:kotlin.Int @@ -35,7 +35,7 @@ FILE fqName: fileName:/thisOfGenericOuterClass.kt $this: VALUE_PARAMETER name: type:.Outer.Inner.Outer> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Outer.Inner' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Outer.Inner.Outer> declared in .Outer.Inner.' type=.Outer.Inner.Outer> origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: @@ -77,7 +77,7 @@ FILE fqName: fileName:/thisOfGenericOuterClass.kt y: CONST Int type=kotlin.Int value=42 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name: modality:FINAL visibility:local superTypes:[.Outer.Inner]' PROPERTY name:xx visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:private [final] EXPRESSION_BODY CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=PLUS $this: CALL 'public final fun (): T of .Outer declared in .Outer' type=kotlin.Int origin=GET_PROPERTY @@ -89,7 +89,7 @@ FILE fqName: fileName:/thisOfGenericOuterClass.kt $this: VALUE_PARAMETER name: type:.test. BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .test.' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .test. declared in .test..' type=.test. origin=null PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [val] FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.Outer.Inner) returnType:kotlin.Int diff --git a/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.txt b/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.txt index 107e58c42a1..e9df54cd4c5 100644 --- a/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.txt +++ b/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.txt @@ -1,60 +1,60 @@ FILE fqName: fileName:/unsignedIntegerLiterals.kt PROPERTY name:testSimpleUIntLiteral visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testSimpleUIntLiteral type:kotlin.UInt visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testSimpleUIntLiteral type:kotlin.UInt visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.UInt value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.UInt correspondingProperty: PROPERTY name:testSimpleUIntLiteral visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.UInt declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testSimpleUIntLiteral type:kotlin.UInt visibility:public [final,static]' type=kotlin.UInt origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testSimpleUIntLiteral type:kotlin.UInt visibility:private [final,static]' type=kotlin.UInt origin=null PROPERTY name:testSimpleUIntLiteralWithOverflow visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testSimpleUIntLiteralWithOverflow type:kotlin.UInt visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testSimpleUIntLiteralWithOverflow type:kotlin.UInt visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.UInt value=-1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.UInt correspondingProperty: PROPERTY name:testSimpleUIntLiteralWithOverflow visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.UInt declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testSimpleUIntLiteralWithOverflow type:kotlin.UInt visibility:public [final,static]' type=kotlin.UInt origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testSimpleUIntLiteralWithOverflow type:kotlin.UInt visibility:private [final,static]' type=kotlin.UInt origin=null PROPERTY name:testUByteWithExpectedType visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testUByteWithExpectedType type:kotlin.UByte visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testUByteWithExpectedType type:kotlin.UByte visibility:private [final,static] EXPRESSION_BODY CONST Byte type=kotlin.UByte value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.UByte correspondingProperty: PROPERTY name:testUByteWithExpectedType visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.UByte declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testUByteWithExpectedType type:kotlin.UByte visibility:public [final,static]' type=kotlin.UByte origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testUByteWithExpectedType type:kotlin.UByte visibility:private [final,static]' type=kotlin.UByte origin=null PROPERTY name:testUShortWithExpectedType visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testUShortWithExpectedType type:kotlin.UShort visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testUShortWithExpectedType type:kotlin.UShort visibility:private [final,static] EXPRESSION_BODY CONST Short type=kotlin.UShort value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.UShort correspondingProperty: PROPERTY name:testUShortWithExpectedType visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.UShort declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testUShortWithExpectedType type:kotlin.UShort visibility:public [final,static]' type=kotlin.UShort origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testUShortWithExpectedType type:kotlin.UShort visibility:private [final,static]' type=kotlin.UShort origin=null PROPERTY name:testUIntWithExpectedType visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testUIntWithExpectedType type:kotlin.UInt visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testUIntWithExpectedType type:kotlin.UInt visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.UInt value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.UInt correspondingProperty: PROPERTY name:testUIntWithExpectedType visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.UInt declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testUIntWithExpectedType type:kotlin.UInt visibility:public [final,static]' type=kotlin.UInt origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testUIntWithExpectedType type:kotlin.UInt visibility:private [final,static]' type=kotlin.UInt origin=null PROPERTY name:testULongWithExpectedType visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testULongWithExpectedType type:kotlin.ULong visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testULongWithExpectedType type:kotlin.ULong visibility:private [final,static] EXPRESSION_BODY CONST Long type=kotlin.ULong value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.ULong correspondingProperty: PROPERTY name:testULongWithExpectedType visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.ULong declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testULongWithExpectedType type:kotlin.ULong visibility:public [final,static]' type=kotlin.ULong origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testULongWithExpectedType type:kotlin.ULong visibility:private [final,static]' type=kotlin.ULong origin=null PROPERTY name:testToUByte visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testToUByte type:kotlin.UByte visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testToUByte type:kotlin.UByte visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin' type=kotlin.UByte origin=null $receiver: CONST Int type=kotlin.Int value=1 @@ -62,9 +62,9 @@ FILE fqName: fileName:/unsignedIntegerLiterals.kt correspondingProperty: PROPERTY name:testToUByte visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.UByte declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToUByte type:kotlin.UByte visibility:public [final,static]' type=kotlin.UByte origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToUByte type:kotlin.UByte visibility:private [final,static]' type=kotlin.UByte origin=null PROPERTY name:testToUShort visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testToUShort type:kotlin.UShort visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testToUShort type:kotlin.UShort visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun toUShort (): kotlin.UShort [inline] declared in kotlin' type=kotlin.UShort origin=null $receiver: CONST Int type=kotlin.Int value=1 @@ -72,9 +72,9 @@ FILE fqName: fileName:/unsignedIntegerLiterals.kt correspondingProperty: PROPERTY name:testToUShort visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.UShort declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToUShort type:kotlin.UShort visibility:public [final,static]' type=kotlin.UShort origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToUShort type:kotlin.UShort visibility:private [final,static]' type=kotlin.UShort origin=null PROPERTY name:testToUInt visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testToUInt type:kotlin.UInt visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testToUInt type:kotlin.UInt visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin' type=kotlin.UInt origin=null $receiver: CONST Int type=kotlin.Int value=1 @@ -82,9 +82,9 @@ FILE fqName: fileName:/unsignedIntegerLiterals.kt correspondingProperty: PROPERTY name:testToUInt visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.UInt declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToUInt type:kotlin.UInt visibility:public [final,static]' type=kotlin.UInt origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToUInt type:kotlin.UInt visibility:private [final,static]' type=kotlin.UInt origin=null PROPERTY name:testToULong visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:testToULong type:kotlin.ULong visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:testToULong type:kotlin.ULong visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin' type=kotlin.ULong origin=null $receiver: CONST Int type=kotlin.Int value=1 @@ -92,4 +92,4 @@ FILE fqName: fileName:/unsignedIntegerLiterals.kt correspondingProperty: PROPERTY name:testToULong visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.ULong declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToULong type:kotlin.ULong visibility:public [final,static]' type=kotlin.ULong origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToULong type:kotlin.ULong visibility:private [final,static]' type=kotlin.ULong origin=null diff --git a/compiler/testData/ir/irText/expressions/useImportedMember.txt b/compiler/testData/ir/irText/expressions/useImportedMember.txt index 3647060ea0f..da7aa1988a6 100644 --- a/compiler/testData/ir/irText/expressions/useImportedMember.txt +++ b/compiler/testData/ir/irText/expressions/useImportedMember.txt @@ -81,7 +81,7 @@ FILE fqName: fileName:/useImportedMember.kt RETURN type=kotlin.Nothing from='public final fun f (): kotlin.Int declared in .C' CONST Int type=kotlin.Int value=3 PROPERTY name:p visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public + FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private EXPRESSION_BODY CONST Int type=kotlin.Int value=4 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -89,14 +89,14 @@ FILE fqName: fileName:/useImportedMember.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C, :kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:p visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null value: GET_VAR ': kotlin.Int declared in .C.' type=kotlin.Int origin=null PROPERTY name:ext visibility:public modality:FINAL [val] diff --git a/compiler/testData/ir/irText/expressions/values.txt b/compiler/testData/ir/irText/expressions/values.txt index 768f2c607f3..9e6ccb865be 100644 --- a/compiler/testData/ir/irText/expressions/values.txt +++ b/compiler/testData/ir/irText/expressions/values.txt @@ -75,14 +75,14 @@ FILE fqName: fileName:/values.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:a visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:a visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null CLASS CLASS name:Z modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Z CONSTRUCTOR visibility:public <> () returnType:.Z [primary] diff --git a/compiler/testData/ir/irText/expressions/vararg.txt b/compiler/testData/ir/irText/expressions/vararg.txt index 032d3e8e03d..b320901b70c 100644 --- a/compiler/testData/ir/irText/expressions/vararg.txt +++ b/compiler/testData/ir/irText/expressions/vararg.txt @@ -1,6 +1,6 @@ FILE fqName: fileName:/vararg.kt PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Array visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Array visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun arrayOf (vararg elements: T of kotlin.arrayOf): kotlin.Array [inline] declared in kotlin' type=kotlin.Array origin=null : kotlin.String @@ -8,9 +8,9 @@ FILE fqName: fileName:/vararg.kt correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Array visibility:public [final,static]' type=kotlin.Array origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Array visibility:private [final,static]' type=kotlin.Array origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Array visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Array visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun arrayOf (vararg elements: T of kotlin.arrayOf): kotlin.Array [inline] declared in kotlin' type=kotlin.Array origin=null : kotlin.String @@ -22,9 +22,9 @@ FILE fqName: fileName:/vararg.kt correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Array visibility:public [final,static]' type=kotlin.Array origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Array visibility:private [final,static]' type=kotlin.Array origin=null PROPERTY name:test3 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Array visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Array visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun arrayOf (vararg elements: T of kotlin.arrayOf): kotlin.Array [inline] declared in kotlin' type=kotlin.Array origin=null : kotlin.String @@ -39,4 +39,4 @@ FILE fqName: fileName:/vararg.kt correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Array visibility:public [final,static]' type=kotlin.Array origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Array visibility:private [final,static]' type=kotlin.Array origin=null diff --git a/compiler/testData/ir/irText/lambdas/anonymousFunction.txt b/compiler/testData/ir/irText/lambdas/anonymousFunction.txt index c0e1b945477..1a05c052836 100644 --- a/compiler/testData/ir/irText/lambdas/anonymousFunction.txt +++ b/compiler/testData/ir/irText/lambdas/anonymousFunction.txt @@ -1,6 +1,6 @@ FILE fqName: fileName:/anonymousFunction.kt PROPERTY name:anonymous visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:anonymous type:kotlin.Function0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:anonymous type:kotlin.Function0 visibility:private [final,static] EXPRESSION_BODY FUN_EXPR type=kotlin.Function0 origin=ANONYMOUS_FUNCTION FUN name: visibility:local modality:FINAL <> () returnType:kotlin.Unit @@ -10,4 +10,4 @@ FILE fqName: fileName:/anonymousFunction.kt correspondingProperty: PROPERTY name:anonymous visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anonymous type:kotlin.Function0 visibility:public [final,static]' type=kotlin.Function0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anonymous type:kotlin.Function0 visibility:private [final,static]' type=kotlin.Function0 origin=null diff --git a/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt b/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt index e473315db7d..e4a253f7524 100644 --- a/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt +++ b/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/destructuringInLambda.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'x: kotlin.Int declared in .A.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Int @@ -16,10 +16,10 @@ FILE fqName: fileName:/destructuringInLambda.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null PROPERTY name:y visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'y: kotlin.Int declared in .A.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Int @@ -27,7 +27,7 @@ FILE fqName: fileName:/destructuringInLambda.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Int $this: VALUE_PARAMETER name: type:.A @@ -138,7 +138,7 @@ FILE fqName: fileName:/destructuringInLambda.kt RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in .A' CONST Boolean type=kotlin.Boolean value=true PROPERTY name:fn visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:fn type:kotlin.Function1<.A, kotlin.Int> visibility:public [static] + FIELD PROPERTY_BACKING_FIELD name:fn type:kotlin.Function1<.A, kotlin.Int> visibility:private [static] EXPRESSION_BODY FUN_EXPR type=kotlin.Function1<.A, kotlin.Int> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (:.A) returnType:kotlin.Int @@ -155,10 +155,10 @@ FILE fqName: fileName:/destructuringInLambda.kt correspondingProperty: PROPERTY name:fn visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function1<.A, kotlin.Int> declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:fn type:kotlin.Function1<.A, kotlin.Int> visibility:public [static]' type=kotlin.Function1<.A, kotlin.Int> origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:fn type:kotlin.Function1<.A, kotlin.Int> visibility:private [static]' type=kotlin.Function1<.A, kotlin.Int> origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.Function1<.A, kotlin.Int>) returnType:kotlin.Unit correspondingProperty: PROPERTY name:fn visibility:public modality:FINAL [var] VALUE_PARAMETER name: index:0 type:kotlin.Function1<.A, kotlin.Int> BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:fn type:kotlin.Function1<.A, kotlin.Int> visibility:public [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:fn type:kotlin.Function1<.A, kotlin.Int> visibility:private [static]' type=kotlin.Unit origin=null value: GET_VAR ': kotlin.Function1<.A, kotlin.Int> declared in .' type=kotlin.Function1<.A, kotlin.Int> origin=null diff --git a/compiler/testData/ir/irText/lambdas/justLambda.txt b/compiler/testData/ir/irText/lambdas/justLambda.txt index 72a52207749..9a0cc50ffb4 100644 --- a/compiler/testData/ir/irText/lambdas/justLambda.txt +++ b/compiler/testData/ir/irText/lambdas/justLambda.txt @@ -1,6 +1,6 @@ FILE fqName: fileName:/justLambda.kt PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function0 visibility:private [final,static] EXPRESSION_BODY FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Int @@ -11,9 +11,9 @@ FILE fqName: fileName:/justLambda.kt correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function0 visibility:public [final,static]' type=kotlin.Function0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function0 visibility:private [final,static]' type=kotlin.Function0 origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function0 visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function0 visibility:private [final,static] EXPRESSION_BODY FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit @@ -24,4 +24,4 @@ FILE fqName: fileName:/justLambda.kt correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function0 declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function0 visibility:public [final,static]' type=kotlin.Function0 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function0 visibility:private [final,static]' type=kotlin.Function0 origin=null diff --git a/compiler/testData/ir/irText/regressions/integerCoercionToT.txt b/compiler/testData/ir/irText/regressions/integerCoercionToT.txt index eaccc701d6f..f702d14b6ee 100644 --- a/compiler/testData/ir/irText/regressions/integerCoercionToT.txt +++ b/compiler/testData/ir/irText/regressions/integerCoercionToT.txt @@ -63,7 +63,7 @@ FILE fqName: fileName:/integerCoercionToT.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:IdType modality:FINAL visibility:public superTypes:[.CPointed]' PROPERTY name:value visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:private [final] EXPRESSION_BODY GET_VAR 'value: kotlin.Int declared in .IdType.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.IdType) returnType:kotlin.Int @@ -71,7 +71,7 @@ FILE fqName: fileName:/integerCoercionToT.kt $this: VALUE_PARAMETER name: type:.IdType BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .IdType' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .IdType declared in .IdType.' type=.IdType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.txt b/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.txt index 34ea26c41db..36c38fd2cb0 100644 --- a/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.txt +++ b/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/typeAliasCtorForGenericClass.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:q visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:q type:Q of .A visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:q type:Q of .A visibility:private [final] EXPRESSION_BODY GET_VAR 'q: Q of .A declared in .A.' type=Q of .A origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A.A>) returnType:Q of .A @@ -16,7 +16,7 @@ FILE fqName: fileName:/typeAliasCtorForGenericClass.kt $this: VALUE_PARAMETER name: type:.A.A> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): Q of .A declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:q type:Q of .A visibility:public [final]' type=Q of .A origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:q type:Q of .A visibility:private [final]' type=Q of .A origin=null receiver: GET_VAR ': .A.A> declared in .A.' type=.A.A> origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: diff --git a/compiler/testData/ir/irText/stubs/constFromBuiltins.txt b/compiler/testData/ir/irText/stubs/constFromBuiltins.txt index 8e8a1b4e48d..745e26fb074 100644 --- a/compiler/testData/ir/irText/stubs/constFromBuiltins.txt +++ b/compiler/testData/ir/irText/stubs/constFromBuiltins.txt @@ -1,6 +1,6 @@ FILE fqName: fileName:/constFromBuiltins.kt PROPERTY name:test visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun (): kotlin.Int declared in kotlin.Int.Companion' type=kotlin.Int origin=GET_PROPERTY $this: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=kotlin.Int.Companion @@ -8,4 +8,4 @@ FILE fqName: fileName:/constFromBuiltins.kt correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m1.txt b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m1.txt index 74d8b7cc762..567993f1996 100644 --- a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m1.txt +++ b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m1.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/genericClassInDifferentModule_m1.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:x type:T of .Base visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:x type:T of .Base visibility:private [final] EXPRESSION_BODY GET_VAR 'x: T of .Base declared in .Base.' type=T of .Base origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Base.Base>) returnType:T of .Base @@ -16,7 +16,7 @@ FILE fqName: fileName:/genericClassInDifferentModule_m1.kt $this: VALUE_PARAMETER name: type:.Base.Base> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of .Base declared in .Base' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .Base visibility:public [final]' type=T of .Base origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .Base visibility:private [final]' type=T of .Base origin=null receiver: GET_VAR ': .Base.Base> declared in .Base.' type=.Base.Base> origin=null FUN name:foo visibility:public modality:ABSTRACT ($this:.Base.Base>, y:Y of .Base.foo) returnType:T of .Base TYPE_PARAMETER name:Y index:0 variance: superTypes:[kotlin.Any?] diff --git a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.txt b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.txt index 9dfb00a72d6..ee8c51aaf3a 100644 --- a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.txt +++ b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.txt @@ -20,7 +20,7 @@ FILE fqName: fileName:/genericClassInDifferentModule_m2.kt CALL 'public final fun (): T of .Derived1 declared in .Derived1' type=T of .Derived1 origin=GET_PROPERTY $this: GET_VAR ': .Derived1.Derived1> declared in .Derived1.foo' type=.Derived1.Derived1> origin=null PROPERTY name:bar visibility:public modality:OPEN [var] - FIELD PROPERTY_BACKING_FIELD name:bar type:T of .Derived1 visibility:public + FIELD PROPERTY_BACKING_FIELD name:bar type:T of .Derived1 visibility:private EXPRESSION_BODY GET_VAR 'x: T of .Derived1 declared in .Derived1.' type=T of .Derived1 origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:.Derived1.Derived1>) returnType:T of .Derived1 @@ -30,7 +30,7 @@ FILE fqName: fileName:/genericClassInDifferentModule_m2.kt $this: VALUE_PARAMETER name: type:.Derived1.Derived1> BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun (): T of .Derived1 declared in .Derived1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:T of .Derived1 visibility:public' type=T of .Derived1 origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:T of .Derived1 visibility:private' type=T of .Derived1 origin=null receiver: GET_VAR ': .Derived1.Derived1> declared in .Derived1.' type=.Derived1.Derived1> origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:.Derived1.Derived1>, :T of .Derived1) returnType:kotlin.Unit correspondingProperty: PROPERTY name:bar visibility:public modality:OPEN [var] @@ -39,7 +39,7 @@ FILE fqName: fileName:/genericClassInDifferentModule_m2.kt $this: VALUE_PARAMETER name: type:.Derived1.Derived1> VALUE_PARAMETER name: index:0 type:T of .Derived1 BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:T of .Derived1 visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:T of .Derived1 visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .Derived1.Derived1> declared in .Derived1.' type=.Derived1.Derived1> origin=null value: GET_VAR ': T of .Derived1 declared in .Derived1.' type=T of .Derived1 origin=null PROPERTY name:exn visibility:public modality:OPEN [var] diff --git a/compiler/testData/ir/irText/stubs/javaEnum.txt b/compiler/testData/ir/irText/stubs/javaEnum.txt index 162b3cb1062..30146144e65 100644 --- a/compiler/testData/ir/irText/stubs/javaEnum.txt +++ b/compiler/testData/ir/irText/stubs/javaEnum.txt @@ -1,10 +1,10 @@ FILE fqName: fileName:/javaEnum.kt PROPERTY name:test visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test type:.JEnum visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test type:.JEnum visibility:private [final,static] EXPRESSION_BODY GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:ONE' type=.JEnum FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.JEnum correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): .JEnum declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:.JEnum visibility:public [final,static]' type=.JEnum origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:.JEnum visibility:private [final,static]' type=.JEnum origin=null diff --git a/compiler/testData/ir/irText/stubs/javaInnerClass.txt b/compiler/testData/ir/irText/stubs/javaInnerClass.txt index d2a861e35ce..f53aaa00742 100644 --- a/compiler/testData/ir/irText/stubs/javaInnerClass.txt +++ b/compiler/testData/ir/irText/stubs/javaInnerClass.txt @@ -6,7 +6,7 @@ FILE fqName: fileName:/javaInnerClass.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[.J]' PROPERTY name:test visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test type:.J.JInner visibility:public [final] + FIELD PROPERTY_BACKING_FIELD name:test type:.J.JInner visibility:private [final] EXPRESSION_BODY CONSTRUCTOR_CALL 'public constructor () [primary] declared in .J.JInner' type=.J.JInner origin=null $outer: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null @@ -15,7 +15,7 @@ FILE fqName: fileName:/javaInnerClass.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): .J.JInner declared in .Test1' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:.J.JInner visibility:public [final]' type=.J.JInner origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:.J.JInner visibility:private [final]' type=.J.JInner origin=null receiver: GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [var] FIELD FAKE_OVERRIDE name:x type:kotlin.Int visibility:public diff --git a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt new file mode 100644 index 00000000000..bc02488ab2a --- /dev/null +++ b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt @@ -0,0 +1,11 @@ +FILE fqName: fileName:/javaSyntheticProperty.kt + PROPERTY name:test visibility:public modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String? visibility:public [final,static] + EXPRESSION_BODY + CALL 'public open fun getFoo (): kotlin.String? declared in .J' type=kotlin.String? origin=GET_PROPERTY + $this: CONSTRUCTOR_CALL 'public/*package*/ constructor () [primary] declared in .J' type=.J origin=null + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String? + correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): kotlin.String? declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String? visibility:public [final,static]' type=kotlin.String? origin=null diff --git a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.kt b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.kt index 5b1920c2104..3fed59d2988 100644 --- a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.kt +++ b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.kt @@ -1,6 +1,5 @@ // !DUMP_DEPENDENCIES // FILE: javaSyntheticProperty.kt -// FIR_IDENTICAL val test = J().foo // FILE: J.java diff --git a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.txt b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.txt index bc02488ab2a..951243fb016 100644 --- a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.txt +++ b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.txt @@ -1,6 +1,6 @@ FILE fqName: fileName:/javaSyntheticProperty.kt PROPERTY name:test visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String? visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String? visibility:private [final,static] EXPRESSION_BODY CALL 'public open fun getFoo (): kotlin.String? declared in .J' type=kotlin.String? origin=GET_PROPERTY $this: CONSTRUCTOR_CALL 'public/*package*/ constructor () [primary] declared in .J' type=.J origin=null @@ -8,4 +8,4 @@ FILE fqName: fileName:/javaSyntheticProperty.kt correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String? declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String? visibility:public [final,static]' type=kotlin.String? origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String? visibility:private [final,static]' type=kotlin.String? origin=null diff --git a/compiler/testData/ir/irText/stubs/simple.txt b/compiler/testData/ir/irText/stubs/simple.txt index 200e4edb9be..83edb7a1f9c 100644 --- a/compiler/testData/ir/irText/stubs/simple.txt +++ b/compiler/testData/ir/irText/stubs/simple.txt @@ -1,6 +1,6 @@ FILE fqName: fileName:/simple.kt PROPERTY name:test visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:public [final,static] + FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=PLUS $this: CONST Int type=kotlin.Int value=2 @@ -9,4 +9,4 @@ FILE fqName: fileName:/simple.kt correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/types/genericPropertyReferenceType.txt b/compiler/testData/ir/irText/types/genericPropertyReferenceType.txt index 0b300505e56..d747d7e911c 100644 --- a/compiler/testData/ir/irText/types/genericPropertyReferenceType.txt +++ b/compiler/testData/ir/irText/types/genericPropertyReferenceType.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/genericPropertyReferenceType.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:x visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:x type:T of .C visibility:public + FIELD PROPERTY_BACKING_FIELD name:x type:T of .C visibility:private EXPRESSION_BODY GET_VAR 'x: T of .C declared in .C.' type=T of .C origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C.C>) returnType:T of .C @@ -16,14 +16,14 @@ FILE fqName: fileName:/genericPropertyReferenceType.kt $this: VALUE_PARAMETER name: type:.C.C> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of .C declared in .C' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .C visibility:public' type=T of .C origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .C visibility:private' type=T of .C origin=null receiver: GET_VAR ': .C.C> declared in .C.' type=.C.C> origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C.C>, :T of .C) returnType:kotlin.Unit correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C.C> VALUE_PARAMETER name: index:0 type:T of .C BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .C visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .C visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .C.C> declared in .C.' type=.C.C> origin=null value: GET_VAR ': T of .C declared in .C.' type=T of .C origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.txt b/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.txt index 85d2335a6cc..fef12213079 100644 --- a/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.txt +++ b/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.txt @@ -77,7 +77,7 @@ FILE fqName: fileName:/smartCastOnReceiverOfGenericType.kt DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Cell modality:FINAL visibility:public superTypes:[kotlin.Any]' PROPERTY name:value visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:value type:T of .Cell visibility:public + FIELD PROPERTY_BACKING_FIELD name:value type:T of .Cell visibility:private EXPRESSION_BODY GET_VAR 'value: T of .Cell declared in .Cell.' type=T of .Cell origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Cell.Cell>) returnType:T of .Cell @@ -85,14 +85,14 @@ FILE fqName: fileName:/smartCastOnReceiverOfGenericType.kt $this: VALUE_PARAMETER name: type:.Cell.Cell> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of .Cell declared in .Cell' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Cell visibility:public' type=T of .Cell origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Cell visibility:private' type=T of .Cell origin=null receiver: GET_VAR ': .Cell.Cell> declared in .Cell.' type=.Cell.Cell> origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Cell.Cell>, :T of .Cell) returnType:kotlin.Unit correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.Cell.Cell> VALUE_PARAMETER name: index:0 type:T of .Cell BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Cell visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Cell visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .Cell.Cell> declared in .Cell.' type=.Cell.Cell> origin=null value: GET_VAR ': T of .Cell declared in .Cell.' type=T of .Cell origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/sourceRanges/comments.txt b/compiler/testData/ir/sourceRanges/comments.txt index 6eaf244aab9..f94baab790b 100644 --- a/compiler/testData/ir/sourceRanges/comments.txt +++ b/compiler/testData/ir/sourceRanges/comments.txt @@ -25,7 +25,7 @@ @18:27..33 VALUE_PARAMETER name:y index:0 type:kotlin.Int @18:35..20:39 BLOCK_BODY @25:4..27:25 PROPERTY name:x visibility:public modality:FINAL [val] - @25:4..27:25 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + @25:4..27:25 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] @25:17..19 EXPRESSION_BODY @25:17..19 CONST Int type=kotlin.Int value=42 @27:8..25 FUN name: visibility:public modality:FINAL <> ($this:.Foo) returnType:kotlin.Int @@ -33,7 +33,7 @@ @27:16..25 BLOCK_BODY @27:16..25 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Foo' @27:16..25 CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=PLUS - @27:16..21 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + @27:16..21 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null @27:16..21 GET_VAR ': .Foo declared in .Foo.' type=.Foo origin=null @27:24..25 CONST Int type=kotlin.Int value=1 @30:4..32:5 FUN name:test visibility:public modality:FINAL <> ($this:.Foo) returnType:kotlin.Unit diff --git a/compiler/testData/ir/sourceRanges/declarations/classProperties.txt b/compiler/testData/ir/sourceRanges/declarations/classProperties.txt index ed7d86118c7..c34c612253a 100644 --- a/compiler/testData/ir/sourceRanges/declarations/classProperties.txt +++ b/compiler/testData/ir/sourceRanges/declarations/classProperties.txt @@ -6,34 +6,34 @@ @2:0..77:1 DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' @2:0..77:1 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test modality:FINAL visibility:public superTypes:[kotlin.Any]' @4:4..18 PROPERTY name:test0 visibility:public modality:FINAL [val] - @4:4..18 FIELD PROPERTY_BACKING_FIELD name:test0 type:kotlin.Int visibility:public [final] + @4:4..18 FIELD PROPERTY_BACKING_FIELD name:test0 type:kotlin.Int visibility:private [final] @4:16..18 EXPRESSION_BODY @4:16..18 CONST Int type=kotlin.Int value=42 @4:4..18 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:test.Test) returnType:kotlin.Int @4:4..18 VALUE_PARAMETER name: type:test.Test @4:4..18 BLOCK_BODY @4:4..18 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test.Test' - @4:4..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test0 type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + @4:4..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test0 type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null @4:4..18 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @10:4..18 PROPERTY name:test1 visibility:public modality:FINAL [val] - @10:4..18 FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final] + @10:4..18 FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final] @10:16..18 EXPRESSION_BODY @10:16..18 CONST Int type=kotlin.Int value=42 @10:4..18 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:test.Test) returnType:kotlin.Int @10:4..18 VALUE_PARAMETER name: type:test.Test @10:4..18 BLOCK_BODY @10:4..18 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test.Test' - @10:4..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + @10:4..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null @10:4..18 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @13:4..16:18 PROPERTY name:test2 visibility:public modality:FINAL [val] - @13:4..16:18 FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [final] + @13:4..16:18 FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [final] @16:16..18 EXPRESSION_BODY @16:16..18 CONST Int type=kotlin.Int value=42 @16:4..18 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:test.Test) returnType:kotlin.Int @13:4..16:18 VALUE_PARAMETER name: type:test.Test @16:4..18 BLOCK_BODY @16:4..18 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test.Test' - @16:4..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + @16:4..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null @16:4..18 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @19:4..20:18 PROPERTY name:test3 visibility:private modality:FINAL [val] @19:4..20:18 FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:private [final] @@ -70,105 +70,105 @@ @41:16..18 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test.Test' @41:16..18 CONST Int type=kotlin.Int value=42 @44:4..18 PROPERTY name:test8 visibility:public modality:FINAL [var] - @44:4..18 FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Int visibility:public + @44:4..18 FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Int visibility:private @44:16..18 EXPRESSION_BODY @44:16..18 CONST Int type=kotlin.Int value=42 @44:4..18 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:test.Test) returnType:kotlin.Int @44:4..18 VALUE_PARAMETER name: type:test.Test @44:4..18 BLOCK_BODY @44:4..18 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test.Test' - @44:4..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + @44:4..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Int visibility:private' type=kotlin.Int origin=null @44:4..18 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @44:4..18 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:test.Test, :kotlin.Int) returnType:kotlin.Unit @44:4..18 VALUE_PARAMETER name: type:test.Test @44:4..18 VALUE_PARAMETER name: index:0 type:kotlin.Int @44:4..18 BLOCK_BODY - @44:4..18 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + @44:4..18 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null @44:4..18 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @44:4..18 GET_VAR ': kotlin.Int declared in test.Test.' type=kotlin.Int origin=null @47:4..31 PROPERTY name:test9 visibility:public modality:FINAL [var] - @47:4..31 FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Int visibility:public + @47:4..31 FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Int visibility:private @47:16..18 EXPRESSION_BODY @47:16..18 CONST Int type=kotlin.Int value=42 @47:4..31 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:test.Test) returnType:kotlin.Int @47:4..31 VALUE_PARAMETER name: type:test.Test @47:4..31 BLOCK_BODY @47:4..31 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test.Test' - @47:4..31 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + @47:4..31 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Int visibility:private' type=kotlin.Int origin=null @47:4..31 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @47:28..31 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> ($this:test.Test, :kotlin.Int) returnType:kotlin.Unit @47:20..31 VALUE_PARAMETER name: type:test.Test @47:28..31 VALUE_PARAMETER name: index:0 type:kotlin.Int @47:28..31 BLOCK_BODY - @47:28..31 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + @47:28..31 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null @47:28..31 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @47:28..31 GET_VAR ': kotlin.Int declared in test.Test.' type=kotlin.Int origin=null @50:4..51:19 PROPERTY name:test10 visibility:public modality:FINAL [var] - @50:4..51:19 FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Int visibility:public + @50:4..51:19 FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Int visibility:private @50:17..19 EXPRESSION_BODY @50:17..19 CONST Int type=kotlin.Int value=42 @50:4..51:19 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:test.Test) returnType:kotlin.Int @50:4..51:19 VALUE_PARAMETER name: type:test.Test @50:4..51:19 BLOCK_BODY @50:4..51:19 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test.Test' - @50:4..51:19 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + @50:4..51:19 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Int visibility:private' type=kotlin.Int origin=null @50:4..51:19 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @51:16..19 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> ($this:test.Test, :kotlin.Int) returnType:kotlin.Unit @51:8..19 VALUE_PARAMETER name: type:test.Test @51:16..19 VALUE_PARAMETER name: index:0 type:kotlin.Int @51:16..19 BLOCK_BODY - @51:16..19 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + @51:16..19 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null @51:16..19 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @51:16..19 GET_VAR ': kotlin.Int declared in test.Test.' type=kotlin.Int origin=null @54:4..57:9 PROPERTY name:test11 visibility:public modality:FINAL [var] - @54:4..57:9 FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Int visibility:public + @54:4..57:9 FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Int visibility:private @54:17..19 EXPRESSION_BODY @54:17..19 CONST Int type=kotlin.Int value=42 @54:4..57:9 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:test.Test) returnType:kotlin.Int @54:4..57:9 VALUE_PARAMETER name: type:test.Test @54:4..57:9 BLOCK_BODY @54:4..57:9 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test.Test' - @54:4..57:9 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + @54:4..57:9 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Int visibility:private' type=kotlin.Int origin=null @54:4..57:9 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @55:8..57:9 FUN name: visibility:public modality:FINAL <> ($this:test.Test, value:kotlin.Int) returnType:kotlin.Unit @55:8..57:9 VALUE_PARAMETER name: type:test.Test @55:12..17 VALUE_PARAMETER name:value index:0 type:kotlin.Int @55:19..57:9 BLOCK_BODY - @56:12..17 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Int visibility:public' type=kotlin.Unit origin=EQ + @56:12..17 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Int visibility:private' type=kotlin.Unit origin=EQ @56:12..17 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @56:20..25 GET_VAR 'value: kotlin.Int declared in test.Test.' type=kotlin.Int origin=null @60:4..66:9 PROPERTY name:test12 visibility:public modality:FINAL [var] - @60:4..66:9 FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Int visibility:public + @60:4..66:9 FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Int visibility:private @60:17..19 EXPRESSION_BODY @60:17..19 CONST Int type=kotlin.Int value=42 @60:4..66:9 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:test.Test) returnType:kotlin.Int @60:4..66:9 VALUE_PARAMETER name: type:test.Test @60:4..66:9 BLOCK_BODY @60:4..66:9 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test.Test' - @60:4..66:9 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + @60:4..66:9 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Int visibility:private' type=kotlin.Int origin=null @60:4..66:9 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @64:8..66:9 FUN name: visibility:public modality:FINAL <> ($this:test.Test, value:kotlin.Int) returnType:kotlin.Unit @64:8..66:9 VALUE_PARAMETER name: type:test.Test @64:12..17 VALUE_PARAMETER name:value index:0 type:kotlin.Int @64:19..66:9 BLOCK_BODY - @65:12..17 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Int visibility:public' type=kotlin.Unit origin=EQ + @65:12..17 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Int visibility:private' type=kotlin.Unit origin=EQ @65:12..17 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @65:20..25 GET_VAR 'value: kotlin.Int declared in test.Test.' type=kotlin.Int origin=null @69:4..75:9 PROPERTY name:test13 visibility:public modality:FINAL [var] - @69:4..75:9 FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Int visibility:public + @69:4..75:9 FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Int visibility:private @69:17..19 EXPRESSION_BODY @69:17..19 CONST Int type=kotlin.Int value=42 @69:4..75:9 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:test.Test) returnType:kotlin.Int @69:4..75:9 VALUE_PARAMETER name: type:test.Test @69:4..75:9 BLOCK_BODY @69:4..75:9 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test.Test' - @69:4..75:9 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Int visibility:public' type=kotlin.Int origin=null + @69:4..75:9 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Int visibility:private' type=kotlin.Int origin=null @69:4..75:9 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @73:8..75:9 FUN name: visibility:public modality:FINAL <> ($this:test.Test, value:kotlin.Int) returnType:kotlin.Unit @70:8..75:9 VALUE_PARAMETER name: type:test.Test @73:12..17 VALUE_PARAMETER name:value index:0 type:kotlin.Int @73:19..75:9 BLOCK_BODY - @74:12..17 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Int visibility:public' type=kotlin.Unit origin=EQ + @74:12..17 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Int visibility:private' type=kotlin.Unit origin=EQ @74:12..17 GET_VAR ': test.Test declared in test.Test.' type=test.Test origin=null @74:20..25 GET_VAR 'value: kotlin.Int declared in test.Test.' type=kotlin.Int origin=null @2:0..77:1 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean diff --git a/compiler/testData/ir/sourceRanges/declarations/kt29862.txt b/compiler/testData/ir/sourceRanges/declarations/kt29862.txt index e92df3d48cc..20c61948754 100644 --- a/compiler/testData/ir/sourceRanges/declarations/kt29862.txt +++ b/compiler/testData/ir/sourceRanges/declarations/kt29862.txt @@ -7,14 +7,14 @@ @0:0..3:1 DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' @0:0..3:1 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:ABSTRACT visibility:public superTypes:[kotlin.Any]' @1:4..14 PROPERTY name:x visibility:public modality:FINAL [val] - @1:4..14 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + @1:4..14 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] @1:4..14 EXPRESSION_BODY @1:4..14 GET_VAR 'x: kotlin.Int declared in .Test1.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER @1:4..14 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.Int @1:4..14 VALUE_PARAMETER name: type:.Test1 @1:4..14 BLOCK_BODY @1:4..14 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test1' - @1:4..14 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + @1:4..14 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null @1:4..14 GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null @0:9..3:1 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean @0:0..3:1 VALUE_PARAMETER name: type:kotlin.Any @@ -31,14 +31,14 @@ @5:0..14:1 DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' @5:0..14:1 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:ABSTRACT visibility:public superTypes:[kotlin.Any]' @8:4..14 PROPERTY name:x visibility:public modality:FINAL [val] - @8:4..14 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + @8:4..14 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] @8:4..14 EXPRESSION_BODY @8:4..14 GET_VAR 'x: kotlin.Int declared in .Test2.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER @8:4..14 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test2) returnType:kotlin.Int @8:4..14 VALUE_PARAMETER name: type:.Test2 @8:4..14 BLOCK_BODY @8:4..14 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test2' - @8:4..14 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + @8:4..14 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null @8:4..14 GET_VAR ': .Test2 declared in .Test2.' type=.Test2 origin=null @10:4..13:5 CLASS CLASS name:TestInner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any] @10:4..13:5 VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test2.TestInner @@ -49,14 +49,14 @@ @10:4..13:5 DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' @10:4..13:5 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]' @12:8..18 PROPERTY name:x visibility:public modality:FINAL [val] - @12:8..18 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + @12:8..18 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] @12:8..18 EXPRESSION_BODY @12:8..18 GET_VAR 'x: kotlin.Int declared in .Test2.TestInner.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER @12:8..18 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test2.TestInner) returnType:kotlin.Int @12:8..18 VALUE_PARAMETER name: type:.Test2.TestInner @12:8..18 BLOCK_BODY @12:8..18 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test2.TestInner' - @12:8..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + @12:8..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null @12:8..18 GET_VAR ': .Test2.TestInner declared in .Test2.TestInner.' type=.Test2.TestInner origin=null @11:4..13:5 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean @10:4..13:5 VALUE_PARAMETER name: type:kotlin.Any diff --git a/compiler/testData/ir/sourceRanges/declarations/primaryConstructors.txt b/compiler/testData/ir/sourceRanges/declarations/primaryConstructors.txt index 6cfef297221..64e37fda25c 100644 --- a/compiler/testData/ir/sourceRanges/declarations/primaryConstructors.txt +++ b/compiler/testData/ir/sourceRanges/declarations/primaryConstructors.txt @@ -7,14 +7,14 @@ @0:0..23 DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' @0:0..23 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[kotlin.Any]' @0:12..22 PROPERTY name:x visibility:public modality:FINAL [val] - @0:12..22 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + @0:12..22 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] @0:12..22 EXPRESSION_BODY @0:12..22 GET_VAR 'x: kotlin.Int declared in .Test1.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER @0:12..22 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.Int @0:12..22 VALUE_PARAMETER name: type:.Test1 @0:12..22 BLOCK_BODY @0:12..22 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test1' - @0:12..22 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + @0:12..22 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null @0:12..22 GET_VAR ': .Test1 declared in .Test1.' type=.Test1 origin=null @0:0..23 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean @0:0..23 VALUE_PARAMETER name: type:kotlin.Any @@ -31,14 +31,14 @@ @2:0..3:32 DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' @2:0..3:32 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[kotlin.Any]' @3:21..31 PROPERTY name:x visibility:public modality:FINAL [val] - @3:21..31 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + @3:21..31 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] @3:21..31 EXPRESSION_BODY @3:21..31 GET_VAR 'x: kotlin.Int declared in .Test2.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER @3:21..31 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test2) returnType:kotlin.Int @3:21..31 VALUE_PARAMETER name: type:.Test2 @3:21..31 BLOCK_BODY @3:21..31 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test2' - @3:21..31 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + @3:21..31 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null @3:21..31 GET_VAR ': .Test2 declared in .Test2.' type=.Test2 origin=null @2:0..3:32 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean @2:0..3:32 VALUE_PARAMETER name: type:kotlin.Any @@ -55,14 +55,14 @@ @5:0..9:23 DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' @5:0..9:23 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public superTypes:[kotlin.Any]' @9:12..22 PROPERTY name:x visibility:public modality:FINAL [val] - @9:12..22 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + @9:12..22 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] @9:12..22 EXPRESSION_BODY @9:12..22 GET_VAR 'x: kotlin.Int declared in .Test3.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER @9:12..22 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.Int @9:12..22 VALUE_PARAMETER name: type:.Test3 @9:12..22 BLOCK_BODY @9:12..22 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test3' - @9:12..22 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + @9:12..22 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null @9:12..22 GET_VAR ': .Test3 declared in .Test3.' type=.Test3 origin=null @5:0..9:23 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean @5:0..9:23 VALUE_PARAMETER name: type:kotlin.Any @@ -79,14 +79,14 @@ @11:0..13:23 DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' @11:0..13:23 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test4 modality:FINAL visibility:public superTypes:[kotlin.Any]' @13:12..22 PROPERTY name:x visibility:public modality:FINAL [val] - @13:12..22 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + @13:12..22 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] @13:12..22 EXPRESSION_BODY @13:12..22 GET_VAR 'x: kotlin.Int declared in .Test4.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER @13:12..22 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Test4) returnType:kotlin.Int @13:12..22 VALUE_PARAMETER name: type:.Test4 @13:12..22 BLOCK_BODY @13:12..22 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Test4' - @13:12..22 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + @13:12..22 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null @13:12..22 GET_VAR ': .Test4 declared in .Test4.' type=.Test4 origin=null @11:0..13:23 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean @11:0..13:23 VALUE_PARAMETER name: type:kotlin.Any diff --git a/compiler/testData/ir/sourceRanges/declarations/synthesizedDataClassMembers.txt b/compiler/testData/ir/sourceRanges/declarations/synthesizedDataClassMembers.txt index 2807e4e06c7..618c29f1222 100644 --- a/compiler/testData/ir/sourceRanges/declarations/synthesizedDataClassMembers.txt +++ b/compiler/testData/ir/sourceRanges/declarations/synthesizedDataClassMembers.txt @@ -9,34 +9,34 @@ @0:0..4:1 DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' @0:0..4:1 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' @1:8..18 PROPERTY name:x visibility:public modality:FINAL [val] - @1:8..18 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] + @1:8..18 FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final] @1:8..18 EXPRESSION_BODY @1:8..18 GET_VAR 'x: kotlin.Int declared in .C.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER @1:8..18 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @1:8..18 VALUE_PARAMETER name: type:.C @1:8..18 BLOCK_BODY @1:8..18 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - @1:8..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final]' type=kotlin.Int origin=null + @1:8..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null @1:8..18 GET_VAR ': .C declared in .C.' type=.C origin=null @2:8..21 PROPERTY name:y visibility:public modality:FINAL [val] - @2:8..21 FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:public [final] + @2:8..21 FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final] @2:8..21 EXPRESSION_BODY @2:8..21 GET_VAR 'y: kotlin.String declared in .C.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER @2:8..21 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.String @2:8..21 VALUE_PARAMETER name: type:.C @2:8..21 BLOCK_BODY @2:8..21 RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .C' - @2:8..21 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:public [final]' type=kotlin.String origin=null + @2:8..21 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final]' type=kotlin.String origin=null @2:8..21 GET_VAR ': .C declared in .C.' type=.C origin=null @3:8..18 PROPERTY name:z visibility:public modality:FINAL [val] - @3:8..18 FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:public [final] + @3:8..18 FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:private [final] @3:8..18 EXPRESSION_BODY @3:8..18 GET_VAR 'z: kotlin.Any declared in .C.' type=kotlin.Any origin=INITIALIZE_PROPERTY_FROM_PARAMETER @3:8..18 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Any @3:8..18 VALUE_PARAMETER name: type:.C @3:8..18 BLOCK_BODY @3:8..18 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in .C' - @3:8..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:public [final]' type=kotlin.Any origin=null + @3:8..18 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null @3:8..18 GET_VAR ': .C declared in .C.' type=.C origin=null @1:8..18 FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @1:8..18 VALUE_PARAMETER name: type:.C diff --git a/compiler/testData/ir/sourceRanges/declarations/topLevelProperties.txt b/compiler/testData/ir/sourceRanges/declarations/topLevelProperties.txt index b1e871683bd..d66574efab6 100644 --- a/compiler/testData/ir/sourceRanges/declarations/topLevelProperties.txt +++ b/compiler/testData/ir/sourceRanges/declarations/topLevelProperties.txt @@ -1,28 +1,28 @@ @0:0..68:32 FILE fqName:test fileName:/topLevelProperties.kt @3:0..14 PROPERTY name:test0 visibility:public modality:FINAL [val] - @3:0..14 FIELD PROPERTY_BACKING_FIELD name:test0 type:kotlin.Int visibility:public [final,static] + @3:0..14 FIELD PROPERTY_BACKING_FIELD name:test0 type:kotlin.Int visibility:private [final,static] @3:12..14 EXPRESSION_BODY @3:12..14 CONST Int type=kotlin.Int value=42 @3:0..14 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int @3:0..14 BLOCK_BODY @3:0..14 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test' - @3:0..14 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test0 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + @3:0..14 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test0 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null @9:0..14 PROPERTY name:test1 visibility:public modality:FINAL [val] - @9:0..14 FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final,static] + @9:0..14 FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static] @9:12..14 EXPRESSION_BODY @9:12..14 CONST Int type=kotlin.Int value=42 @9:0..14 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int @9:0..14 BLOCK_BODY @9:0..14 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test' - @9:0..14 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + @9:0..14 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null @12:0..15:14 PROPERTY name:test2 visibility:public modality:FINAL [val] - @12:0..15:14 FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [final,static] + @12:0..15:14 FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [final,static] @15:12..14 EXPRESSION_BODY @15:12..14 CONST Int type=kotlin.Int value=42 @15:0..14 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int @15:0..14 BLOCK_BODY @15:0..14 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test' - @15:0..14 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [final,static]' type=kotlin.Int origin=null + @15:0..14 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null @18:0..19:14 PROPERTY name:test3 visibility:private modality:FINAL [val] @18:0..19:14 FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:private [final,static] @19:12..14 EXPRESSION_BODY @@ -52,80 +52,80 @@ @40:12..14 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test' @40:12..14 CONST Int type=kotlin.Int value=42 @43:0..14 PROPERTY name:test8 visibility:public modality:FINAL [var] - @43:0..14 FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Int visibility:public [static] + @43:0..14 FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Int visibility:private [static] @43:12..14 EXPRESSION_BODY @43:12..14 CONST Int type=kotlin.Int value=42 @43:0..14 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int @43:0..14 BLOCK_BODY @43:0..14 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test' - @43:0..14 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + @43:0..14 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null @43:0..14 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.Int) returnType:kotlin.Unit @43:0..14 VALUE_PARAMETER name: index:0 type:kotlin.Int @43:0..14 BLOCK_BODY - @43:0..14 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null + @43:0..14 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null @43:0..14 GET_VAR ': kotlin.Int declared in test.' type=kotlin.Int origin=null @46:0..27 PROPERTY name:test9 visibility:public modality:FINAL [var] - @46:0..27 FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Int visibility:public [static] + @46:0..27 FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Int visibility:private [static] @46:12..14 EXPRESSION_BODY @46:12..14 CONST Int type=kotlin.Int value=42 @46:0..27 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int @46:0..27 BLOCK_BODY @46:0..27 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test' - @46:0..27 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + @46:0..27 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null @46:24..27 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> (:kotlin.Int) returnType:kotlin.Unit @46:24..27 VALUE_PARAMETER name: index:0 type:kotlin.Int @46:24..27 BLOCK_BODY - @46:24..27 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null + @46:24..27 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null @46:24..27 GET_VAR ': kotlin.Int declared in test.' type=kotlin.Int origin=null @49:0..50:15 PROPERTY name:test10 visibility:public modality:FINAL [var] - @49:0..50:15 FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Int visibility:public [static] + @49:0..50:15 FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Int visibility:private [static] @49:13..15 EXPRESSION_BODY @49:13..15 CONST Int type=kotlin.Int value=42 @49:0..50:15 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int @49:0..50:15 BLOCK_BODY @49:0..50:15 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test' - @49:0..50:15 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + @49:0..50:15 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null @50:12..15 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> (:kotlin.Int) returnType:kotlin.Unit @50:12..15 VALUE_PARAMETER name: index:0 type:kotlin.Int @50:12..15 BLOCK_BODY - @50:12..15 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=null + @50:12..15 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null @50:12..15 GET_VAR ': kotlin.Int declared in test.' type=kotlin.Int origin=null @53:0..54:32 PROPERTY name:test11 visibility:public modality:FINAL [var] - @53:0..54:32 FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Int visibility:public [static] + @53:0..54:32 FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Int visibility:private [static] @53:13..15 EXPRESSION_BODY @53:13..15 CONST Int type=kotlin.Int value=42 @53:0..54:32 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int @53:0..54:32 BLOCK_BODY @53:0..54:32 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test' - @53:0..54:32 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + @53:0..54:32 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null @54:4..32 FUN name: visibility:public modality:FINAL <> (value:kotlin.Int) returnType:kotlin.Unit @54:8..13 VALUE_PARAMETER name:value index:0 type:kotlin.Int @54:15..32 BLOCK_BODY - @54:17..22 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=EQ + @54:17..22 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=EQ @54:25..30 GET_VAR 'value: kotlin.Int declared in test.' type=kotlin.Int origin=null @57:0..61:32 PROPERTY name:test12 visibility:public modality:FINAL [var] - @57:0..61:32 FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Int visibility:public [static] + @57:0..61:32 FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Int visibility:private [static] @57:13..15 EXPRESSION_BODY @57:13..15 CONST Int type=kotlin.Int value=42 @57:0..61:32 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int @57:0..61:32 BLOCK_BODY @57:0..61:32 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test' - @57:0..61:32 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + @57:0..61:32 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null @61:4..32 FUN name: visibility:public modality:FINAL <> (value:kotlin.Int) returnType:kotlin.Unit @61:8..13 VALUE_PARAMETER name:value index:0 type:kotlin.Int @61:15..32 BLOCK_BODY - @61:17..22 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=EQ + @61:17..22 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=EQ @61:25..30 GET_VAR 'value: kotlin.Int declared in test.' type=kotlin.Int origin=null @64:0..68:32 PROPERTY name:test13 visibility:public modality:FINAL [var] - @64:0..68:32 FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Int visibility:public [static] + @64:0..68:32 FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Int visibility:private [static] @64:13..15 EXPRESSION_BODY @64:13..15 CONST Int type=kotlin.Int value=42 @64:0..68:32 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int @64:0..68:32 BLOCK_BODY @64:0..68:32 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in test' - @64:0..68:32 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Int visibility:public [static]' type=kotlin.Int origin=null + @64:0..68:32 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null @68:4..32 FUN name: visibility:public modality:FINAL <> (value:kotlin.Int) returnType:kotlin.Unit @68:8..13 VALUE_PARAMETER name:value index:0 type:kotlin.Int @68:15..32 BLOCK_BODY - @68:17..22 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Int visibility:public [static]' type=kotlin.Unit origin=EQ + @68:17..22 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test13 type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=EQ @68:25..30 GET_VAR 'value: kotlin.Int declared in test.' type=kotlin.Int origin=null diff --git a/compiler/testData/writeFlags/lateinit/lateinitProperty.kt b/compiler/testData/writeFlags/lateinit/lateinitProperty.kt index 6d9cfdfe94d..11a00b4b81d 100644 --- a/compiler/testData/writeFlags/lateinit/lateinitProperty.kt +++ b/compiler/testData/writeFlags/lateinit/lateinitProperty.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR class My { lateinit var s: String private set diff --git a/compiler/testData/writeFlags/property/classObject/class/internalVar.kt b/compiler/testData/writeFlags/property/classObject/class/internalVar.kt index 679381db6b2..a514b0db9e3 100644 --- a/compiler/testData/writeFlags/property/classObject/class/internalVar.kt +++ b/compiler/testData/writeFlags/property/classObject/class/internalVar.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR class Test { companion object { var prop: Int = 0; diff --git a/compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt b/compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt index 9567595ad3c..5eb2e7e2702 100644 --- a/compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt +++ b/compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR class Test { companion object { var prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt b/compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt index 433ba5780d9..bab2cc582d1 100644 --- a/compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt +++ b/compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR class Test { companion object { protected var prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt b/compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt index 751d48e7ab0..a80356683c0 100644 --- a/compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt +++ b/compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR class Test { companion object { public val prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/class/publicVar.kt b/compiler/testData/writeFlags/property/classObject/class/publicVar.kt index ea5fb4798e2..83fac291ee4 100644 --- a/compiler/testData/writeFlags/property/classObject/class/publicVar.kt +++ b/compiler/testData/writeFlags/property/classObject/class/publicVar.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR class Test { companion object { public var prop: Int = 0; diff --git a/compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt b/compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt index 2b20a6f99ba..d24eea7a620 100644 --- a/compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt +++ b/compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR class Test { companion object { public var prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt b/compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt index dc585cc65e6..4e4da195e44 100644 --- a/compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt +++ b/compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR class Test { companion object { public var prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt b/compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt index 0e694b25157..02434006d7f 100644 --- a/compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt +++ b/compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR class Test { companion object { public var prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt b/compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt index 4f508b56f72..e10ae4251cb 100644 --- a/compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt +++ b/compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR class Test { companion object { public var prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt b/compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt index 2ed92b841ae..4198a24aa82 100644 --- a/compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt +++ b/compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR class Test(val prop: String) { companion object { diff --git a/compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt b/compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt index 8c3ee6c1e8a..6a641ff54a9 100644 --- a/compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt +++ b/compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR import kotlin.reflect.KProperty public open class TestDelegate(private val initializer: () -> T) { diff --git a/compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt b/compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt index ebe75c31d87..b39996d6753 100644 --- a/compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt +++ b/compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR class Test { public var prop: Int = 0; diff --git a/compiler/testData/writeFlags/property/classObject/trait/internalVal.kt b/compiler/testData/writeFlags/property/classObject/trait/internalVal.kt index 6fc089afbd6..9d1fc3de087 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/internalVal.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/internalVal.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR interface Test { companion object { internal val prop: Int = 0; diff --git a/compiler/testData/writeFlags/property/classObject/trait/internalVar.kt b/compiler/testData/writeFlags/property/classObject/trait/internalVar.kt index ad44e055626..61589802929 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/internalVar.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/internalVar.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR interface Test { companion object { internal var prop: Int = 0; diff --git a/compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt b/compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt index e13fe2c65b7..4f16053d69a 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR interface Test { companion object { internal var prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt b/compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt index 0b1992c3656..5187c7818df 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR interface Test { companion object { protected val prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt b/compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt index 18c232aa841..3741b313b45 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR interface Test { companion object { protected var prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVal.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVal.kt index 17644f139f9..f87cadd1322 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVal.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVal.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR interface Test { companion object { public val prop: Int = 0; diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt b/compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt index bec0210e96d..c785d044a62 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR interface Test { companion object { public val prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVar.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVar.kt index 337ccb183fd..1e024c71530 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVar.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVar.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR interface Test { companion object { public var prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt index 0a922adcd08..68be7cdffc0 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR interface Test { companion object { public var prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt index a5789de060f..a880caa6076 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR interface Test { companion object { public var prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt index b8d4d43d11d..327755430c6 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR interface Test { companion object { public var prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt index e338e606961..a362660a830 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR interface Test { companion object { public var prop: Int = 0 diff --git a/compiler/testData/writeFlags/property/syntheticAnnotationsMethod/withGetterJvmName.kt b/compiler/testData/writeFlags/property/syntheticAnnotationsMethod/withGetterJvmName.kt index 9dfacdd8b1c..d476f5e77e4 100644 --- a/compiler/testData/writeFlags/property/syntheticAnnotationsMethod/withGetterJvmName.kt +++ b/compiler/testData/writeFlags/property/syntheticAnnotationsMethod/withGetterJvmName.kt @@ -1,6 +1,5 @@ // !LANGUAGE: +UseGetterNameForPropertyAnnotationsMethodOnJvm // WITH_RUNTIME -// IGNORE_BACKEND: JVM_IR class Foo { annotation class Anno diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt index e9ec78af12f..fc2ef26c8fa 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.codegen.CodegenTestCase import org.jetbrains.kotlin.config.languageVersionSettings +import org.jetbrains.kotlin.ir.backend.js.JsGeneratorExtensions import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.ir.declarations.IrModuleFragment import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS @@ -124,7 +125,7 @@ abstract class AbstractIrGeneratorTestCase : CodegenTestCase() { moduleDescriptors = emptyList(), friendModuleDescriptors = emptyList() ), - psi2ir, ktFilesToAnalyze, GeneratorExtensions() + psi2ir, ktFilesToAnalyze, JsGeneratorExtensions() ) fun generateIrModuleWithJvmResolve(