From b174bb88448dcd6ebaa02015cf5f9147352f7146 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 9 Dec 2022 12:59:13 +0200 Subject: [PATCH] [FIR] Update testdata after introducing FirResolvedErrorReference --- .../innerDeclarationsResolve/class.fir.txt | 2 +- .../arguments/ambiguityOnJavaOverride.fir.txt | 2 +- .../arguments/argParamTypeMismatch.fir.txt | 10 +-- .../resolve/arguments/default.fir.txt | 8 +-- .../arguments/defaultFromOverrides.fir.txt | 4 +- .../resolve/arguments/destructuring.fir.txt | 16 ++--- .../arguments/integerLiteralTypes.fir.txt | 8 +-- .../arguments/javaArrayVariance.fir.txt | 2 +- .../testData/resolve/arguments/lambda.fir.txt | 14 ++-- .../arguments/noParameterForName.fir.txt | 2 +- .../arguments/operatorsOverLiterals.fir.txt | 36 +++++----- .../testData/resolve/arguments/simple.fir.txt | 12 ++-- .../testData/resolve/arguments/vararg.fir.txt | 10 +-- .../callResolution/errorCandidates.fir.txt | 2 +- .../callResolution/lambdaAsReceiver.fir.txt | 2 +- .../resolve/cfg/flowFromInplaceLambda2.dot | 20 +++--- .../cfg/flowFromInplaceLambda2.fir.txt | 20 +++--- .../resolve/cfg/flowFromTwoInplaceLambdas.dot | 12 ++-- .../cfg/flowFromTwoInplaceLambdas.fir.txt | 12 ++-- .../cfg/inlineLambdasAreInplace.fir.txt | 6 +- .../testData/resolve/cfg/jumps.dot | 2 +- .../testData/resolve/cfg/jumps.fir.txt | 2 +- .../resolve/cfg/postponedLambdaInReturn.dot | 2 +- .../cfg/postponedLambdaInReturn.fir.txt | 2 +- .../diagnostics/conflictingProjection.fir.txt | 4 +- .../diagnostics/multipleBounds.fir.txt | 8 +-- .../returnTypeMismatchOnOverride.fir.txt | 2 +- .../sealedClassConstructorCall.fir.txt | 2 +- .../typeArgumentsNotAllowed.fir.txt | 4 +- .../diagnostics/upperBoundViolated.fir.txt | 20 +++--- .../resolve/expresssions/enumEntryUse.fir.txt | 2 +- .../inference/typeParameters.fir.txt | 2 +- .../inference/typeParameters2.fir.txt | 2 +- .../invoke/implicitTypeOrder.fir.txt | 2 +- .../expresssions/nestedVisibility.fir.txt | 12 ++-- .../expresssions/privateVisibility.fir.txt | 18 ++--- .../expresssions/protectedVisibility.fir.txt | 6 +- .../expresssions/syntheticSmartCast.fir.txt | 2 +- .../mutableList.fir.txt | 2 +- .../nullableIntegerLiteralType.fir.txt | 4 +- .../receiverWithCapturedType.fir.txt | 2 +- .../resolve/innerClasses/innerTypes.fir.txt | 6 +- .../resolve/lambdaArgInScopeFunction.fir.txt | 4 +- .../lambdaPropertyTypeInference.fir.txt | 8 +-- .../supertypeGenericsComplex.fir.txt | 2 +- .../definitelyNotNullAndOriginalType.fir.txt | 2 +- .../resolve/qualifierWithCompanion.fir.txt | 2 +- .../samConstructors/genericSam.fir.txt | 2 +- .../genericSamInferenceFromExpectType.fir.txt | 2 +- .../realConstructorFunction.fir.txt | 6 +- .../resolve/samConversions/genericSam.fir.txt | 2 +- .../resolve/samConversions/kotlinSam.fir.txt | 8 +-- .../notSamBecauseOfSupertype.fir.txt | 6 +- .../scopes/specialFunctionInJava_2.fir.txt | 8 +-- ...sToMemberAfterReceiverReassignment.fir.txt | 10 +-- .../testData/resolve/smartcasts/bangbang.dot | 6 +- .../resolve/smartcasts/bangbang.fir.txt | 6 +- .../booleanElvisBoundSmartcast.fir.txt | 4 +- .../smartcasts/booleans/equalsToBoolean.dot | 16 ++--- .../booleans/equalsToBoolean.fir.txt | 16 ++--- .../booleans/jumpFromRhsOfOperator.dot | 12 ++-- .../booleans/jumpFromRhsOfOperator.fir.txt | 12 ++-- .../boundSmartcastsInBranches.dot | 34 ++++----- .../boundSmartcastsInBranches.fir.txt | 34 ++++----- .../resolve/smartcasts/equalsAndIdentity.dot | 8 +-- .../smartcasts/equalsAndIdentity.fir.txt | 8 +-- .../resolve/smartcasts/nullability.dot | 70 +++++++++---------- .../resolve/smartcasts/nullability.fir.txt | 58 +++++++-------- .../resolve/smartcasts/orInWhenBranch.fir.txt | 8 +-- .../safeCalls/safeCallAndEqualityToBool.dot | 8 +-- .../safeCallAndEqualityToBool.fir.txt | 8 +-- .../smartcasts/safeCalls/safeCalls.dot | 6 +- .../smartcasts/safeCalls/safeCalls.fir.txt | 6 +- ...nstableSmartCastOnSafeCallArgument.fir.txt | 2 +- ...artcastsFromEquals_differentModule.fir.txt | 4 +- .../smartcastsFromEquals_sameModule.fir.txt | 4 +- .../variables/delayedAssignment.dot | 2 +- .../variables/delayedAssignment.fir.txt | 2 +- .../variables/smartcastAfterReassignment.dot | 2 +- .../smartcastAfterReassignment.fir.txt | 2 +- .../resolve/suppress/singleError.fir.txt | 2 +- .../testData/resolve/tryInference.fir.txt | 2 +- .../typeAliasWithTypeArguments.fir.txt | 2 +- .../visibility/singletonConstructors.fir.txt | 4 +- .../visibilityWithOverrides.fir.txt | 2 +- .../resolve/whenExpressionType.fir.txt | 2 +- .../callableReferences/companions.fir.txt | 4 +- ...plicableCallableReferenceCandidate.fir.txt | 2 +- ...ferenceDependingOnInferredReceiver.fir.txt | 2 +- ...agerAndPostponedCallableReferences.fir.txt | 2 +- ...eReferencesAfterAllSimpleArguments.fir.txt | 4 +- .../callableReferences/implicitTypes.fir.txt | 2 +- .../fromLibrary/notIsNullOrEmpty.fir.txt | 2 +- .../good/returnsImplies/eqNotEq.fir.txt | 2 +- .../good/returnsImplies/receivers.fir.txt | 2 +- .../basic.fir.txt | 2 +- .../intellij/FieldVsSyntheticAccessor.fir.txt | 2 +- .../j+k/JavaVisibility2.fir.txt | 14 ++-- .../j+k/KJKComplexHierarchyWithNested.fir.txt | 4 +- .../j+k/KotlinClassParameter.fir.txt | 2 +- .../j+k/KotlinClassParameterGeneric.fir.txt | 4 +- .../problems/argumentTypeMismatch.fir.txt | 2 +- .../boxError/semantic/catchErrorType.kt | 3 +- .../boxError/semantic/evaluationOrder.kt | 3 +- .../semantic/unresolvedFunctionReferece.kt | 3 +- .../boxError/syntax/evaluationOrder.kt | 3 +- .../codegen/boxWasmJsInterop/externals.kt | 3 +- .../diagnostics/tests/ResolveToJava.fir.kt | 2 +- .../tests/annotations/ConstructorCall.fir.kt | 2 +- .../tests/evaluate/divisionByZero.fir.kt | 2 +- ...nVariableHasComplexIntersectionType.fir.kt | 4 +- .../constantUnaryOperators.fir.txt | 4 +- .../intToLongConversion.fir.txt | 12 ++-- .../nullabilityAndSmartCasts/kt362.fir.kt | 4 +- .../resolveModIfRemIsHidden.fir.kt | 2 +- .../tests/privateInFile/visibility.fir.kt | 2 +- ...ectedWithGenericsInDifferentPackage.fir.kt | 2 +- .../tests/resolve/HiddenDeclarations.fir.kt | 2 +- .../tests/resolve/dslMarker/properties.fir.kt | 4 +- .../diagnostics/tests/scopes/kt1244.fir.kt | 2 +- .../diagnostics/tests/scopes/kt1738.fir.kt | 2 +- .../protectedVisibility/withSmartcast.fir.kt | 2 +- .../tests/scopes/visibility.fir.kt | 2 +- .../tests/scopes/visibility3.fir.kt | 2 +- .../unitConversionCompatibility.fir.kt | 2 +- .../conversionOfSignedToUnsigned.fir.kt | 2 +- ...oUnsignedConversionWithExpectedType.fir.kt | 2 +- .../variance/privateToThis/SetVar.fir.kt | 10 +-- .../tests/visibility/privateToThis.fir.txt | 4 +- ...avaImplementationFromDifferentClass.fir.kt | 50 ------------- ...endJavaImplementationFromDifferentClass.kt | 1 + .../inference/delegates/kt50994.fir.txt | 2 +- .../p-5/neg/4.2.fir.kt | 2 +- .../operator-call/p-1/neg/2.1.fir.kt | 4 +- .../operator-call/p-1/neg/2.2.fir.kt | 4 +- .../operator-call/p-1/pos/2.3.fir.kt | 6 +- .../analysis/smartcasts/neg/7.fir.kt | 22 +++--- .../diagnostics/notLinked/dfa/neg/36.fir.kt | 8 +-- .../receivers/receiverInjection.fir.txt | 2 +- 139 files changed, 454 insertions(+), 508 deletions(-) delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.fir.kt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.fir.txt index df37eea52fd..132e20ae587 100644 --- a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.fir.txt +++ b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.fir.txt @@ -11,7 +11,7 @@ FILE: class.kt private [BODY_RESOLVE] get(): public final [BODY_RESOLVE] fun foo([BODY_RESOLVE] a: ): { - ^foo #(R|/a|, = [BODY_RESOLVE] with@fun .(): { + ^foo R|kotlin/with#|(R|/a|, = [BODY_RESOLVE] with@fun .(): { ^ #(String(a), this@R|/B|.R|/B.y|) } ) diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/ambiguityOnJavaOverride.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/ambiguityOnJavaOverride.fir.txt index b47c31fb4d1..b04129109f2 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/ambiguityOnJavaOverride.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/ambiguityOnJavaOverride.fir.txt @@ -10,5 +10,5 @@ FILE: main.kt } public final fun test(b: R|B|): R|kotlin/Unit| { - R|/b|.#(String()) + R|/b|.R|/B.foo#|(String()) } diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/argParamTypeMismatch.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/argParamTypeMismatch.fir.txt index a5f0a67c993..510b860832d 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/argParamTypeMismatch.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/argParamTypeMismatch.fir.txt @@ -5,13 +5,13 @@ FILE: argParamTypeMismatch.kt } public final fun test(): R|kotlin/Unit| { lval int: R|kotlin/Int| = Int(1) - #(R|/int|) - #(Int(2)) - #(R|kotlin/run|( = run@fun (): R|kotlin/Int| { + R|/foo#|(R|/int|) + R|/foo#|(Int(2)) + R|/foo#|(R|kotlin/run|( = run@fun (): R|kotlin/Int| { ^ Int(20) } )) R|/foo2|(String(asdf), Int(3)) - #(Int(4), String(asdf)) - #(Int(5), Int(6)) + R|/foo2#|(Int(4), String(asdf)) + R|/foo2#|(Int(5), Int(6)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/default.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/default.fir.txt index 8f93c90c4d0..1071ef74cd6 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/default.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/default.fir.txt @@ -10,14 +10,14 @@ FILE: default.kt R|/foo|(Int(1), Double(2.0)) R|/foo|(Int(1), Double(2.0), Boolean(true)) R|/foo|(Int(1), third = Boolean(true)) - #() - #(Int(0), Double(0.0), Boolean(false), String()) + R|/foo#|() + R|/foo#|(Int(0), Double(0.0), Boolean(false), String()) R|/bar|(Int(1), third = Boolean(true)) R|/bar|(Int(1), Double(2.0), Boolean(true)) R|/bar|(Int(1), Double(2.0), Boolean(true), String(my)) - #(Int(1), Boolean(true)) + R|/bar#|(Int(1), Boolean(true)) R|/baz|(Int(1)) R|/baz|(Int(1), vararg(String(my), String(yours))) R|/baz|(Int(1), z = Boolean(true)) - #(Int(0), String(), Boolean(false)) + R|/baz#|(Int(0), String(), Boolean(false)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.fir.txt index d8f7c71c9ed..0b2a46219fa 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.fir.txt @@ -22,8 +22,8 @@ FILE: defaultFromOverrides.kt public final fun foo(a: R|A|): R|kotlin/Unit| { R|/a|.R|/A.foo|() R|/a|.R|/A.foo|(Int(1)) - R|/a|.#() - R|/a|.#(String()) + R|/a|.R|/A.bar#|() + R|/a|.R|/A.bar#|(String()) R|/a|.R|/A.bar|(y = Int(1)) R|/a|.R|/A.bar|(String(), Int(2)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/destructuring.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/destructuring.fir.txt index 6a3ad07d1b3..3d2f7967602 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/destructuring.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/destructuring.fir.txt @@ -37,9 +37,9 @@ FILE: destructuring.kt } ) R|/foo1|( = foo1@fun (: R|C|): R|kotlin/Unit| { - lval x: R|kotlin/String| = R|/|.#() - lval y: R|kotlin/Int| = R|/|.#() - #(R|/x|, R|/y|) + lval x: R|kotlin/String| = R|/|.R|/C.component1#|() + lval y: R|kotlin/Int| = R|/|.R|/C.component2#|() + R|/C.C#|(R|/x|, R|/y|) } ) R|/foo2|( = foo2@fun (: R|C|, : R|C|): R|kotlin/Unit| { @@ -59,11 +59,11 @@ FILE: destructuring.kt } ) R|/foo2|( = foo2@fun (: R|C|, : R|C|): R|kotlin/Unit| { - lval x: R|kotlin/String| = R|/|.#() - lval y: R|kotlin/Int| = R|/|.#() - lval z: R|kotlin/String| = R|/|.#() - lval w: R|kotlin/Int| = R|/|.#() - #(R|/x|.R|kotlin/String.plus|(R|/z|), R|/y|.R|kotlin/Int.plus|(R|/w|)) + lval x: R|kotlin/String| = R|/|.R|/C.component1#|() + lval y: R|kotlin/Int| = R|/|.R|/C.component2#|() + lval z: R|kotlin/String| = R|/|.R|/C.component1#|() + lval w: R|kotlin/Int| = R|/|.R|/C.component2#|() + R|/C.C#|(R|/x|.R|kotlin/String.plus|(R|/z|), R|/y|.R|kotlin/Int.plus|(R|/w|)) } ) } diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/integerLiteralTypes.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/integerLiteralTypes.fir.txt index 92eef93c4db..04f1e7d7407 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/integerLiteralTypes.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/integerLiteralTypes.fir.txt @@ -20,9 +20,9 @@ FILE: integerLiteralTypes.kt R|/takeLong|(Long(1)) } public final fun test_2(): R|kotlin/Unit| { - #(Long(10000000000)) + R|/takeInt#|(Long(10000000000)) R|/takeLong|(Long(10000000000)) - #(Int(1000)) + R|/takeByte#|(Int(1000)) } public final fun test_3(): R|kotlin/Unit| { R|/takeInt|(R|kotlin/run|( = run@fun (): R|kotlin/Int| { @@ -46,8 +46,8 @@ FILE: integerLiteralTypes.kt )) } public final fun test_5(): R|kotlin/Unit| { - #(Int(1)) - #(R|kotlin/run|( = run@fun (): R|kotlin/Int| { + R|/takeString#|(Int(1)) + R|/takeString#|(R|kotlin/run|( = run@fun (): R|kotlin/Int| { ^ Int(1) } )) diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/javaArrayVariance.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/javaArrayVariance.fir.txt index da1cddf6a54..74f13e87025 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/javaArrayVariance.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/javaArrayVariance.fir.txt @@ -5,6 +5,6 @@ FILE: main.kt } public final fun test(array: R|kotlin/Array|): R|kotlin/Unit| { Q|A|.R|/A.take|(R|/array|) - #(R|/array|) + R|/takeA#|(R|/array|) R|/takeOutA|(R|/array|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.fir.txt index 136f4895655..7220b69c0a0 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.fir.txt @@ -18,11 +18,11 @@ FILE: lambda.kt ^@foo Unit } ) - #(Int(1), = foo@fun (): R|kotlin/Unit| { + R|/foo#|(Int(1), = foo@fun (): R|kotlin/Unit| { ^@foo Unit } ) - #(f = foo@fun (): R|kotlin/Unit| { + R|/foo#|(f = foo@fun (): R|kotlin/Unit| { ^@foo Unit } , = foo@fun (): R|kotlin/Unit| { @@ -45,11 +45,11 @@ FILE: lambda.kt ^@bar Unit } ) - #( = bar@fun (): R|kotlin/Unit| { + R|/bar#|( = bar@fun (): R|kotlin/Unit| { ^@bar Unit } ) - #(bar@fun (): R|kotlin/Unit| { + R|/bar#|(bar@fun (): R|kotlin/Unit| { ^@bar Unit } ) @@ -61,15 +61,15 @@ FILE: lambda.kt ^@baz Unit } , Boolean(false)) - #( = baz@fun (): R|kotlin/Unit| { + R|/baz#|( = baz@fun (): R|kotlin/Unit| { ^@baz Unit } ) - #( = baz@fun (): R|kotlin/Unit| { + R|/baz#|( = baz@fun (): R|kotlin/Unit| { ^@baz Unit } ) - #(other = Boolean(false), = baz@fun (): R|kotlin/Unit| { + R|/baz#|(other = Boolean(false), = baz@fun (): R|kotlin/Unit| { ^@baz Unit } ) diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/noParameterForName.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/noParameterForName.fir.txt index d93c624c082..a8e9fcc795e 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/noParameterForName.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/noParameterForName.fir.txt @@ -2,5 +2,5 @@ FILE: noParameterForName.kt public final fun foo(x: R|kotlin/Int|): R|kotlin/Unit| { } public final fun bar(): R|kotlin/Unit| { - #(y = Int(1)) + R|/foo#|(y = Int(1)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/operatorsOverLiterals.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/operatorsOverLiterals.fir.txt index 487aa64e4d2..9f948f93d95 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/operatorsOverLiterals.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/operatorsOverLiterals.fir.txt @@ -30,37 +30,37 @@ FILE: operatorsOverLiterals.kt public final fun takeByte(b: R|kotlin/Byte|): R|kotlin/Unit| { } public final fun test_4(): R|kotlin/Unit| { - #(Int(1).R|kotlin/Int.plus|(Int(1))) - #(Int(1).R|kotlin/Int.plus|(Int(127))) - #(Int(1).R|kotlin/Int.minus|(Int(1))) - #(Int(-100).R|kotlin/Int.minus|(Int(100))) - #(Int(10).R|kotlin/Int.times|(Int(10))) - #(Int(100).R|kotlin/Int.times|(Int(100))) + R|/takeByte#|(Int(1).R|kotlin/Int.plus|(Int(1))) + R|/takeByte#|(Int(1).R|kotlin/Int.plus|(Int(127))) + R|/takeByte#|(Int(1).R|kotlin/Int.minus|(Int(1))) + R|/takeByte#|(Int(-100).R|kotlin/Int.minus|(Int(100))) + R|/takeByte#|(Int(10).R|kotlin/Int.times|(Int(10))) + R|/takeByte#|(Int(100).R|kotlin/Int.times|(Int(100))) #(Int(10).R|kotlin/Int.div|(Int(10))) - #(Int(100).R|kotlin/Int.rem|(Int(10))) - #(Int(1000).R|kotlin/Int.rem|(Int(10))) - #(Int(1000).R|kotlin/Int.and|(Int(100))) - #(Int(128).R|kotlin/Int.and|(Int(511))) - #(Int(100).R|kotlin/Int.or|(Int(100))) - #(Int(1000).R|kotlin/Int.or|(Int(0))) - #(Int(511).R|kotlin/Int.xor|(Int(511))) - #(Int(512).R|kotlin/Int.xor|(Int(511))) + R|/takeByte#|(Int(100).R|kotlin/Int.rem|(Int(10))) + R|/takeByte#|(Int(1000).R|kotlin/Int.rem|(Int(10))) + R|/takeByte#|(Int(1000).R|kotlin/Int.and|(Int(100))) + R|/takeByte#|(Int(128).R|kotlin/Int.and|(Int(511))) + R|/takeByte#|(Int(100).R|kotlin/Int.or|(Int(100))) + R|/takeByte#|(Int(1000).R|kotlin/Int.or|(Int(0))) + R|/takeByte#|(Int(511).R|kotlin/Int.xor|(Int(511))) + R|/takeByte#|(Int(512).R|kotlin/Int.xor|(Int(511))) } public final fun test_5(): R|kotlin/Unit| { R|/takeByte|(Byte(-1)) R|/takeByte|(Byte(1)) - #(Int(1).R|kotlin/Int.inv|()) + R|/takeByte#|(Int(1).R|kotlin/Int.inv|()) } public final fun test_6(): R|kotlin/Unit| { - #(R|kotlin/run|( = run@fun (): R|kotlin/Int| { + R|/takeByte#|(R|kotlin/run|( = run@fun (): R|kotlin/Int| { ^ Int(127).R|kotlin/Int.plus|(Int(1)) } )) - #(Int(1).R|kotlin/Int.plus|(R|kotlin/run|( = run@fun (): R|kotlin/Int| { + R|/takeByte#|(Int(1).R|kotlin/Int.plus|(R|kotlin/run|( = run@fun (): R|kotlin/Int| { ^ Int(1) } ))) - #(R|kotlin/run|( = run@fun (): R|kotlin/Int| { + R|/takeByte#|(R|kotlin/run|( = run@fun (): R|kotlin/Int| { ^ Int(1).R|kotlin/Int.plus|(Int(1)) } )) diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/simple.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/simple.fir.txt index 73eab07c921..d5382ef2028 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/simple.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/simple.fir.txt @@ -7,11 +7,11 @@ FILE: simple.kt R|/foo|(Int(1), Double(2.0), fourth = String(???), third = Boolean(false)) R|/foo|(Int(1), second = Double(3.14), third = Boolean(false), fourth = String(!?)) R|/foo|(third = Boolean(false), second = Double(2.71), fourth = String(?!), first = Int(0)) - #() - #(Double(0.0), Boolean(false), Int(0), String()) + R|/foo#|() + R|/foo#|(Double(0.0), Boolean(false), Int(0), String()) R|/foo|(Int(1), Double(2.0), third = Boolean(true), String()) - #(second = Double(0.0), first = Int(0), fourth = String()) - #(first = Double(0.0), second = Int(0), third = String(), fourth = Boolean(false)) - #(first = Int(0), second = Double(0.0), third = Boolean(false), fourth = String(), first = Int(1)) - #(Int(0), Double(0.0), Boolean(false), foth = String()) + R|/foo#|(second = Double(0.0), first = Int(0), fourth = String()) + R|/foo#|(first = Double(0.0), second = Int(0), third = String(), fourth = Boolean(false)) + R|/foo#|(first = Int(0), second = Double(0.0), third = Boolean(false), fourth = String(), first = Int(1)) + R|/foo#|(Int(0), Double(0.0), Boolean(false), foth = String()) } diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/vararg.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/vararg.fir.txt index ecf6da3fde5..242b4d5c7ae 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/vararg.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/vararg.fir.txt @@ -8,10 +8,10 @@ FILE: vararg.kt R|/foo|(Int(1), vararg(String())) R|/foo|(Int(1), vararg(String(my), String(yours))) R|/foo|(Int(1), vararg(*R|kotlin/arrayOf|(vararg(String(my), String(yours))))) - #(String()) - #(Int(1), Int(2)) + R|/foo#|(String()) + R|/foo#|(Int(1), Int(2)) R|/bar|(Int(1), z = Boolean(true), vararg(y = *R|kotlin/arrayOf|(vararg(String(my), String(yours))))) - #(Int(0), z = Boolean(false), y = String(), y = String(other)) - #(Int(0), String(), Boolean(true)) - #(Int(0), z = Boolean(false), y = String(), y = String(other), y = String(yet other)) + R|/bar#|(Int(0), z = Boolean(false), y = String(), y = String(other)) + R|/bar#|(Int(0), String(), Boolean(true)) + R|/bar#|(Int(0), z = Boolean(false), y = String(), y = String(other), y = String(yet other)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/errorCandidates.fir.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/errorCandidates.fir.txt index 123bc54e370..c8463114081 100644 --- a/compiler/fir/analysis-tests/testData/resolve/callResolution/errorCandidates.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/callResolution/errorCandidates.fir.txt @@ -12,7 +12,7 @@ FILE: errorCandidates.kt public final fun bar(x: R|B|): R|kotlin/Unit| { } public final fun test(c: R|C|): R|kotlin/Unit| { - #(String()) + R|/foo#|(String()) #(R|/c|) #() } diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.fir.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.fir.txt index 17d13aad240..0fb9b6bb756 100644 --- a/compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.fir.txt @@ -16,6 +16,6 @@ FILE: lambdaAsReceiver.kt fun (): R|kotlin/String| { ^ String() } - .#() + .R|/bar#|() String().R|/bar|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda2.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda2.dot index 94aefedf769..02d7fa2eb12 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda2.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda2.dot @@ -112,7 +112,7 @@ digraph flowFromInplaceLambda2_kt { color=blue 49 [label="Enter block"]; 50 [label="Access variable R|/x|"]; - 51 [label="Access variable #"]; + 51 [label="Access variable R|kotlin/String.length#|"]; 52 [label="Const: Int(123)"]; 53 [label="Exit block"]; } @@ -197,7 +197,7 @@ digraph flowFromInplaceLambda2_kt { color=blue 80 [label="Enter block"]; 81 [label="Access variable R|/x|"]; - 82 [label="Access variable #"]; + 82 [label="Access variable R|kotlin/String.length#|"]; 83 [label="Const: Int(123)"]; 84 [label="Exit block"]; } @@ -313,7 +313,7 @@ digraph flowFromInplaceLambda2_kt { color=blue 126 [label="Enter block"]; 127 [label="Access variable R|/x|"]; - 128 [label="Access variable #"]; + 128 [label="Access variable R|kotlin/String.length#|"]; 129 [label="Const: Int(123)"]; 130 [label="Exit block"]; } @@ -476,7 +476,7 @@ digraph flowFromInplaceLambda2_kt { 193 [label="Enter block"]; 194 [label="Access variable R|/p|"]; 195 [label="Smart cast: R|/p|"]; - 196 [label="Access variable #"]; + 196 [label="Access variable R|kotlin/String.length#|"]; 197 [label="Const: Int(123)"]; 198 [label="Exit block"]; } @@ -487,7 +487,7 @@ digraph flowFromInplaceLambda2_kt { 171 [label="Merge postponed lambda exits"]; 172 [label="Function call: R|/foo|(...)" style="filled" fillcolor=yellow]; 173 [label="Access variable R|/p|"]; - 174 [label="Access variable #"]; + 174 [label="Access variable R|kotlin/String.length#|"]; 175 [label="Exit block"]; } 176 [label="Exit when branch result"]; @@ -617,7 +617,7 @@ digraph flowFromInplaceLambda2_kt { 212 [label="Merge postponed lambda exits"]; 213 [label="Function call: R|/foo|(...)" style="filled" fillcolor=yellow]; 214 [label="Access variable R|/x|"]; - 215 [label="Access variable #"]; + 215 [label="Access variable R|kotlin/String.length#|"]; 216 [label="Exit block"]; } 217 [label="Exit function test5" style="filled" fillcolor=red]; @@ -736,7 +736,7 @@ digraph flowFromInplaceLambda2_kt { color=blue 279 [label="Enter block"]; 280 [label="Access variable R|/x|"]; - 281 [label="Access variable #"]; + 281 [label="Access variable R|kotlin/String.length#|"]; 282 [label="Const: Int(123)"]; 283 [label="Exit block"]; } @@ -747,7 +747,7 @@ digraph flowFromInplaceLambda2_kt { 258 [label="Merge postponed lambda exits"]; 259 [label="Function call: R|/foo|(...)" style="filled" fillcolor=yellow]; 260 [label="Access variable R|/x|"]; - 261 [label="Access variable #"]; + 261 [label="Access variable R|kotlin/String.length#|"]; 262 [label="Exit block"]; } 263 [label="Exit function test6" style="filled" fillcolor=red]; @@ -867,7 +867,7 @@ digraph flowFromInplaceLambda2_kt { 323 [label="Enter block"]; 324 [label="Access variable R|/p|"]; 325 [label="Smart cast: R|/p|"]; - 326 [label="Access variable #"]; + 326 [label="Access variable R|kotlin/String.length#|"]; 327 [label="Const: Int(123)"]; 328 [label="Exit block"]; } @@ -878,7 +878,7 @@ digraph flowFromInplaceLambda2_kt { 306 [label="Function call: R|/foo|(...)" style="filled" fillcolor=yellow]; 307 [label="Access variable R|/p|"]; 308 [label="Smart cast: R|/p|"]; - 309 [label="Access variable #"]; + 309 [label="Access variable R|kotlin/String.length#|"]; 310 [label="Exit block"]; } 311 [label="Exit when branch result"]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda2.fir.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda2.fir.txt index c9ab498e681..a81173a7b44 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda2.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda2.fir.txt @@ -16,7 +16,7 @@ FILE: flowFromInplaceLambda2.kt ^ R|/n|() } )), Int(1), R|kotlin/run|( = run@fun (): R|kotlin/Int| { - R|/x|.# + R|/x|.R|kotlin/String.length#| ^ Int(123) } )) @@ -28,7 +28,7 @@ FILE: flowFromInplaceLambda2.kt ^ R|/n|() } )), R|/someCompletedCall|(Int(1)), R|kotlin/run|( = run@fun (): R|kotlin/Int| { - R|/x|.# + R|/x|.R|kotlin/String.length#| ^ Int(123) } )) @@ -48,7 +48,7 @@ FILE: flowFromInplaceLambda2.kt } } , R|kotlin/run|( = run@fun (): R|kotlin/Int| { - R|/x|.# + R|/x|.R|kotlin/String.length#| ^ Int(123) } )) @@ -74,11 +74,11 @@ FILE: flowFromInplaceLambda2.kt } } ), Int(1), R|kotlin/run|( = run@fun (): R|kotlin/Int| { - R|/p|.# + R|/p|.R|kotlin/String.length#| ^ Int(123) } )) - R|/p|.# + R|/p|.R|kotlin/String.length#| } } @@ -92,7 +92,7 @@ FILE: flowFromInplaceLambda2.kt ^ String() } )) - R|/x|.# + R|/x|.R|kotlin/String.length#| } public final fun test6(x: R|kotlin/String?|): R|kotlin/Unit| { R|/foo|(R|/id|(when () { @@ -112,11 +112,11 @@ FILE: flowFromInplaceLambda2.kt } } ), Int(1), R|kotlin/run|( = run@fun (): R|kotlin/Int| { - R|/x|.# + R|/x|.R|kotlin/String.length#| ^ Int(123) } )) - R|/x|.# + R|/x|.R|kotlin/String.length#| } public final fun test7(x: R|kotlin/String?|): R|kotlin/Unit| { lvar p: R|kotlin/String?| = R|/x| @@ -127,11 +127,11 @@ FILE: flowFromInplaceLambda2.kt ^ R|/n|() } )), Int(1), R|kotlin/run|( = run@fun (): R|kotlin/Int| { - R|/p|.# + R|/p|.R|kotlin/String.length#| ^ Int(123) } )) - R|/p|.# + R|/p|.R|kotlin/String.length#| } } diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromTwoInplaceLambdas.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromTwoInplaceLambdas.dot index 05d53bb4fec..05beb351a20 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromTwoInplaceLambdas.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromTwoInplaceLambdas.dot @@ -75,7 +75,7 @@ digraph flowFromTwoInplaceLambdas_kt { 46 [label="Enter block"]; 47 [label="Access variable R|/p|"]; 48 [label="Smart cast: R|/p|"]; - 49 [label="Access variable #"]; + 49 [label="Access variable R|kotlin/String.length#|"]; 50 [label="Const: Int(123)"]; 51 [label="Exit block"]; } @@ -99,7 +99,7 @@ digraph flowFromTwoInplaceLambdas_kt { 29 [label="Function call: R|/run2|(...)" style="filled" fillcolor=yellow]; 30 [label="Access variable R|/p|"]; 31 [label="Smart cast: R|/p|"]; - 32 [label="Access variable #"]; + 32 [label="Access variable R|kotlin/String.length#|"]; 33 [label="Exit block"]; } 34 [label="Exit when branch result"]; @@ -184,7 +184,7 @@ digraph flowFromTwoInplaceLambdas_kt { 86 [label="Enter block"]; 87 [label="Access variable R|/p|"]; 88 [label="Smart cast: R|/p|"]; - 89 [label="Access variable #"]; + 89 [label="Access variable R|kotlin/String.length#|"]; 90 [label="Const: Int(123)"]; 91 [label="Exit block"]; } @@ -208,7 +208,7 @@ digraph flowFromTwoInplaceLambdas_kt { 69 [label="Function call: R|/run2|(...)" style="filled" fillcolor=yellow]; 70 [label="Access variable R|/p|"]; 71 [label="Smart cast: R|/p|"]; - 72 [label="Access variable #"]; + 72 [label="Access variable R|kotlin/String.length#|"]; 73 [label="Exit block"]; } 74 [label="Exit when branch result"]; @@ -390,7 +390,7 @@ digraph flowFromTwoInplaceLambdas_kt { 136 [label="Function call: R|/run2|(...)" style="filled" fillcolor=yellow]; 137 [label="Access variable R|/p|"]; 138 [label="Smart cast: R|/p|"]; - 139 [label="Access variable #"]; + 139 [label="Access variable R|kotlin/String.length#|"]; 140 [label="Access variable R|/p|"]; 141 [label="Smart cast: R|/p|"]; 142 [label="Enter safe call"]; @@ -588,7 +588,7 @@ digraph flowFromTwoInplaceLambdas_kt { 212 [label="Function call: R|/run2|(...)" style="filled" fillcolor=yellow]; 213 [label="Access variable R|/p|"]; 214 [label="Smart cast: R|/p|"]; - 215 [label="Access variable #"]; + 215 [label="Access variable R|kotlin/String.length#|"]; 216 [label="Access variable R|/p|"]; 217 [label="Smart cast: R|/p|"]; 218 [label="Enter safe call"]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromTwoInplaceLambdas.fir.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromTwoInplaceLambdas.fir.txt index 940bd1f1f13..bc662ef8277 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromTwoInplaceLambdas.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromTwoInplaceLambdas.fir.txt @@ -22,11 +22,11 @@ FILE: flowFromTwoInplaceLambdas.kt ^ R|/n|() } , run2@fun (): R|kotlin/Int?| { - R|/p|.# + R|/p|.R|kotlin/String.length#| ^ Int(123) } ) - R|/p|.# + R|/p|.R|kotlin/String.length#| } } @@ -40,11 +40,11 @@ FILE: flowFromTwoInplaceLambdas.kt ^ R|/n|() } , = run2@fun (): R|kotlin/Int?| { - R|/p|.# + R|/p|.R|kotlin/String.length#| ^ Int(123) } ) - R|/p|.# + R|/p|.R|kotlin/String.length#| } } @@ -76,7 +76,7 @@ FILE: flowFromTwoInplaceLambdas.kt ^ Int(123) } ) - R|/p|.# + R|/p|.R|kotlin/String.length#| R|/p|?.{ $subj$.R|kotlin/String.length| } } public abstract interface I1 : R|kotlin/Any| { @@ -118,7 +118,7 @@ FILE: flowFromTwoInplaceLambdas.kt ^ R|/n|() } ) - R|/p|.# + R|/p|.R|kotlin/String.length#| R|/p|?.{ $subj$.R|kotlin/String.length| } } public final fun test6(): R|kotlin/Unit| { diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/inlineLambdasAreInplace.fir.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/inlineLambdasAreInplace.fir.txt index 7a8b42d1a95..61e25883f6e 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/inlineLambdasAreInplace.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/inlineLambdasAreInplace.fir.txt @@ -31,7 +31,7 @@ FILE: inlineLambdasAreInplace.kt ) R|/x| = String() R|/lambda|.R|SubstitutionOverride|() - R|/x|.# + R|/x|.R|kotlin/String.length#| } public final fun testNoinline(): R|kotlin/Unit| { lvar x: R|kotlin/String?| = String() @@ -41,7 +41,7 @@ FILE: inlineLambdasAreInplace.kt ) R|/x| = String() R|/lambda|.R|SubstitutionOverride|() - R|/x|.# + R|/x|.R|kotlin/String.length#| } public final fun testCrossinline(): R|kotlin/Unit| { lvar x: R|kotlin/String?| = String() @@ -51,5 +51,5 @@ FILE: inlineLambdasAreInplace.kt ) R|/x| = String() R|/lambda|.R|SubstitutionOverride|() - R|/x|.# + R|/x|.R|kotlin/String.length#| } diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot index c5c4f529a12..3663b23d717 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot @@ -133,7 +133,7 @@ digraph jumps_kt { } 55 [label="Variable declaration: lval y: R|kotlin/Int?|"]; 56 [label="Access variable R|/y|"]; - 57 [label="Function call: R|/y|.#()" style="filled" fillcolor=yellow]; + 57 [label="Function call: R|/y|.R|kotlin/Int.inc#|()" style="filled" fillcolor=yellow]; 58 [label="Exit block"]; } 59 [label="Exit function test_2" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.fir.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.fir.txt index 9ab907ad6ef..fe466cf26ad 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.fir.txt @@ -22,7 +22,7 @@ FILE: jumps.kt } } - R|/y|.#() + R|/y|.R|kotlin/Int.inc#|() } public final fun test_3(x: R|kotlin/Int?|): R|kotlin/Unit| { while(Boolean(true)) { diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInReturn.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInReturn.dot index 6bcd09443c9..0a0fc13f387 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInReturn.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInReturn.dot @@ -134,7 +134,7 @@ digraph postponedLambdaInReturn_kt { 24 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; 25 [label="Variable declaration: lval x: R|kotlin/String|"]; 26 [label="Access variable R|/y|"]; - 27 [label="Access variable #"]; + 27 [label="Access variable R|kotlin/String.length#|"]; 28 [label="Exit block"]; } 29 [label="Exit function test1" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInReturn.fir.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInReturn.fir.txt index c4dc566a0e1..18334c4109d 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInReturn.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInReturn.fir.txt @@ -38,7 +38,7 @@ FILE: postponedLambdaInReturn.kt } ) - R|/y|.# + R|/y|.R|kotlin/String.length#| } public final fun test2(): R|kotlin/Unit| { lval x: R|kotlin/String| = R|kotlin/run|( = run@fun (): R|kotlin/String| { diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.fir.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.fir.txt index 197d8b9c63e..7d142e58db8 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.fir.txt @@ -148,13 +148,13 @@ FILE: conflictingProjection.kt ^test15 R|/InOuter.InOuter|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test16(): R|InOuter.OutIntermediate.InInner| { - ^test16 R|/InOuter.InOuter|().R|SubstitutionOverride|().#() + ^test16 R|/InOuter.InOuter|().R|SubstitutionOverride|().R|SubstitutionOverride#|() } public final fun test17(): R|InOuter.OutIntermediate.InInner| { ^test17 R|/InOuter.InOuter|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test18(): R|InOuter.OutIntermediate.InInner| { - ^test18 R|/InOuter.InOuter|().R|SubstitutionOverride|().#() + ^test18 R|/InOuter.InOuter|().R|SubstitutionOverride|().R|SubstitutionOverride#|() } public final class TwoParametersOuter : R|kotlin/Any| { public constructor(): R|TwoParametersOuter| { diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/multipleBounds.fir.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/multipleBounds.fir.txt index 8c982970fd0..ff8d6ca3944 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/multipleBounds.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/multipleBounds.fir.txt @@ -61,8 +61,8 @@ FILE: multipleBounds.kt } public final fun test(): R|kotlin/Unit| { - #() - #() + R|Jet87/Test1.Test1#|() + R|Jet87/Test1.Test1#|() R|Jet87/Test1.Test1|() } public final class Foo : R|kotlin/Any| { @@ -101,9 +101,9 @@ FILE: multipleBounds.kt R|/t|.R|Jet87/A.foo|() R|/t|.R|Jet87/B.bar|() } - public final val t1: R|kotlin/Unit| = #(R|Jet87/A.A|()) + public final val t1: R|kotlin/Unit| = R|Jet87/test2#|(R|Jet87/A.A|()) public get(): R|kotlin/Unit| - public final val t2: R|kotlin/Unit| = #(R|Jet87/C.C|()) + public final val t2: R|kotlin/Unit| = R|Jet87/test2#|(R|Jet87/C.C|()) public get(): R|kotlin/Unit| public final val t3: R|kotlin/Unit| = R|Jet87/test2|(R|Jet87/C.C|()) public get(): R|kotlin/Unit| diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/returnTypeMismatchOnOverride.fir.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/returnTypeMismatchOnOverride.fir.txt index 8d55d265635..13af537c076 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/returnTypeMismatchOnOverride.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/returnTypeMismatchOnOverride.fir.txt @@ -180,7 +180,7 @@ FILE: returnTypeMismatchOnOverride.kt } public open fun kek(): R|Z| { - ^kek #() + ^kek R|/Z.Z#|() } } diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/sealedClassConstructorCall.fir.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/sealedClassConstructorCall.fir.txt index b6381cfa192..afaa188313c 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/sealedClassConstructorCall.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/sealedClassConstructorCall.fir.txt @@ -5,5 +5,5 @@ FILE: sealedClassConstructorCall.kt } } - public final val b: R|A| = #() + public final val b: R|A| = R|/A.A#|() public get(): R|A| diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.fir.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.fir.txt index e2452cf929d..d65d2596596 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.fir.txt @@ -13,7 +13,7 @@ FILE: typeArgumentsNotAllowed.kt } public final fun foo(): R|kotlin/Unit| { - #<>() + R|rest/bar#|<>() R|rest/bar|>|>() } public final fun bar(): R|kotlin/Unit| { @@ -44,7 +44,7 @@ FILE: typeArgumentsNotAllowed.kt } public final fun fest(): R|kotlin/Unit| { lval b: R|kotlin/collections/List| - #<>() + R|rest/gest#|<>() R|rest/gest|() lval c: R|kotlin/collections/List>>| R|rest/gest|>|>() diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.fir.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.fir.txt index 92e0319b43f..dbbe3596f46 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.fir.txt @@ -19,15 +19,15 @@ FILE: upperBoundViolated.kt public final fun fest(): R|kotlin/Unit| { } public final fun test(): R|kotlin/Unit| { - lval b1: R|B| = #() + lval b1: R|B| = R|/B.B#|() lval b2: R|B| = R|/B.B|() - lval b3: R|B| = #() - lval b4: = #<>().#(ERROR_EXPR(No right operand)).#(#()).#(ERROR_EXPR(No right operand)) - lval b5: R|B>| = #|>() - #() + lval b3: R|B| = R|/B.B#|() + lval b4: = R|/B.B#|<>().#(ERROR_EXPR(No right operand)).#(#()).#(ERROR_EXPR(No right operand)) + lval b5: R|B>| = R|/B.B#||>() + R|/fest#|() R|/fest|() R|/fest|() - #|>() + R|/fest#||>() } public open class S : R|kotlin/Any| { public constructor(): R|S| { @@ -58,11 +58,11 @@ FILE: upperBoundViolated.kt lval o2: R|S| = R|/S.S|() lval o3: R|S| = R|/S.S|() lval o4: R|S, T>| = R|/S.S||, R|T|>() - lval o5: R|S, T>| = #|, R|T|>() - lval o5: R|S, T>| = #|, R|T|>() + lval o5: R|S, T>| = R|/S.S#||, R|T|>() + lval o5: R|S, T>| = R|/S.S#||, R|T|>() lval o6: R|S, kotlin/String>>| = R|/S.S|, kotlin/String>|>() lval o7: R|S, kotlin/Nothing>>| = R|/S.S|, kotlin/Nothing>|>() - lval o8: R|P>| = #|>() + lval o8: R|P>| = R|/P.P#||>() } public final class NumColl|> : R|kotlin/Any| { public constructor|>(): R|NumColl| { @@ -83,7 +83,7 @@ FILE: upperBoundViolated.kt } public final val np1: R|NumberPhile| = R|/NumberPhile.NumberPhile|(Int(10)) public get(): R|NumberPhile| - public final val np2: R|NumberPhile| = #(String(Test)) + public final val np2: R|NumberPhile| = R|/NumberPhile.NumberPhile#|(String(Test)) public get(): R|NumberPhile| public final class Test1|, K : R|kotlin/Any|> : R|kotlin/Any| { public constructor|, K : R|kotlin/Any|>(): R|Test1| { diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.fir.txt index 9e92478105e..6e0af2925b3 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.fir.txt @@ -37,5 +37,5 @@ FILE: enumEntryUse.kt R|/useEnum|(Q|TestEnum|.R|/TestEnum.SECOND|) R|/useEnum|(Q|TestEnum|.R|/TestEnum.THIRD|) R|/useVararg|(vararg(Q|TestEnum|.R|/TestEnum.FIRST|, Q|TestEnum|.R|/TestEnum.SECOND|)) - #(Int(1), Int(2), Int(3), Int(4), Int(5)) + R|/useVararg#|(Int(1), Int(2), Int(3), Int(4), Int(5)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters.fir.txt index 26f274150ad..134e3029584 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters.fir.txt @@ -18,5 +18,5 @@ FILE: typeParameters.kt } public final fun main(fooImpl: R|FooImpl|, bar: R|Bar|): R|kotlin/Unit| { lval a: R|FooImpl| = R|/foo|(R|/fooImpl|) - lval b: = #(R|/bar|) + lval b: = R|/foo#|(R|/bar|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters2.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters2.fir.txt index 0a968e9238f..4642c1a85bc 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters2.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters2.fir.txt @@ -17,6 +17,6 @@ FILE: typeParameters2.kt ^foo R|/t| } public final fun main(fooImpl: R|FooImpl|, fooBarImpl: R|FooBarImpl|): R|kotlin/Unit| { - lval a: R|FooImpl| = #(R|/fooBarImpl|) + lval a: R|FooImpl| = R|/foo#|(R|/fooBarImpl|) lval b: R|Foo| = R|/foo|(R|/fooImpl|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/implicitTypeOrder.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/implicitTypeOrder.fir.txt index 91953901e91..d936e161912 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/implicitTypeOrder.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/implicitTypeOrder.fir.txt @@ -5,7 +5,7 @@ FILE: implicitTypeOrder.kt } public final fun bar(): R|A| { - ^bar R|/foo|.#() + ^bar R|/foo|.R|/A.invoke#|() } public final fun invoke(): R|A| { diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.fir.txt index cb412c045e2..3492407bc80 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.fir.txt @@ -53,8 +53,8 @@ FILE: nestedVisibility.kt } public final fun foo(): R|kotlin/Unit| { - Q|Outer|.#() - this@R|/Derived|.super.#() + Q|Outer|.R|/Outer.PrivateNested.PrivateNested#|() + this@R|/Derived|.super.R|/Outer.PrivateInner.PrivateInner#|() Q|Outer|.R|/Outer.ProtectedNested.ProtectedNested|() this@R|/Derived|.super.R|/Outer.ProtectedInner.ProtectedInner|() Q|Outer|.R|/Outer.PublicNested.PublicNested|() @@ -63,10 +63,10 @@ FILE: nestedVisibility.kt } public final fun foo(): R|kotlin/Unit| { - Q|Outer|.#() - R|/Outer.Outer|().#() - Q|Outer|.#() - R|/Outer.Outer|().#() + Q|Outer|.R|/Outer.PrivateNested.PrivateNested#|() + R|/Outer.Outer|().R|/Outer.PrivateInner.PrivateInner#|() + Q|Outer|.R|/Outer.ProtectedNested.ProtectedNested#|() + R|/Outer.Outer|().R|/Outer.ProtectedInner.ProtectedInner#|() Q|Outer|.R|/Outer.PublicNested.PublicNested|() R|/Outer.Outer|().R|/Outer.PublicInner.PublicInner|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.fir.txt index 89613c4bc8a..159512e8807 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.fir.txt @@ -13,7 +13,7 @@ FILE: first.kt this@R|/Private|.R|/Private.bar|() R|/Private.Nested.Nested|() this@R|/Private.Companion|.R|/Private.Companion.fromCompanion|() - Q|Private.NotCompanion|.#() + Q|Private.NotCompanion|.R|/Private.NotCompanion.foo#|() } public final inner class Inner : R|kotlin/Any| { @@ -24,7 +24,7 @@ FILE: first.kt public final fun foo(): R|kotlin/Unit| { this@R|/Private|.R|/Private.bar|() this@R|/Private.Companion|.R|/Private.Companion.fromCompanion|() - Q|Private.NotCompanion|.#() + Q|Private.NotCompanion|.R|/Private.NotCompanion.foo#|() } } @@ -36,7 +36,7 @@ FILE: first.kt public final fun foo(): R|kotlin/Unit| { this@R|/Private.Companion|.R|/Private.Companion.fromCompanion|() - Q|Private.NotCompanion|.#() + Q|Private.NotCompanion|.R|/Private.NotCompanion.foo#|() } } @@ -89,18 +89,18 @@ FILE: first.kt } R|/Local.Local|().R|/baz|() - R|/Local.Local|()./bar is invisible>#() + R|/Local.Local|().R|/bar/bar is invisible>#|() } public final fun test(): R|kotlin/Unit| { R|/foo|() R|/Private.Private|().R|/Private.baz|() R|/Private.Private|().R|/Private.Inner.Inner|() - R|/Private.Private|().#() - Q|Private|.#() - Q|Private|.#() + R|/Private.Private|().R|/Private.bar#|() + Q|Private|.R|/Private.Nested.Nested#|() + Q|Private|.R|/Private.Companion.fromCompanion#|() } FILE: second.kt public final fun secondTest(): R|kotlin/Unit| { - #() - #() + R|/foo#|() + R|/Private.Private#|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.fir.txt index 5814935e529..3276fe4acec 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.fir.txt @@ -59,7 +59,7 @@ FILE: protectedVisibility.kt public final fun foo(): R|kotlin/Unit| { this@R|/Derived|.R|/Protected.bar|() R|/Protected.Nested.Nested|().R|/Protected.Nested.foo|() - R|/Protected.Nested.Nested|().#() + R|/Protected.Nested.Nested|().R|/Protected.Nested.bar#|() this@R|/Protected.Companion|.R|/Protected.Companion.fromCompanion|() this@R|/Protected.Companion|.R|/Protected.Companion.protectedFromCompanion|() } @@ -79,8 +79,8 @@ FILE: protectedVisibility.kt public final fun test(): R|kotlin/Unit| { R|/Protected.Protected|().R|/Protected.baz|() R|/Protected.Protected|().R|/Protected.Inner.Inner|() - R|/Protected.Protected|().#() - Q|Protected|.#() + R|/Protected.Protected|().R|/Protected.bar#|() + Q|Protected|.R|/Protected.Nested.Nested#|() } public open class Generic : R|kotlin/Any| { public constructor(x: R|T|): R|Generic| { diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.fir.txt index 491bc7d870b..ef38a93a869 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.fir.txt @@ -36,7 +36,7 @@ FILE: test.kt lval bar: R|kotlin/CharSequence?| = R|/x|?.{ $subj$.R|/SomeClass.bar| } when () { !=(R|/bar|, Null(null)) -> { - R|/x|.R|/SomeClass.bar|.# + R|/x|.R|/SomeClass.bar|.R|kotlin/CharSequence.length#| } } diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.fir.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.fir.txt index aa26237421d..ddbd58be026 100644 --- a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.fir.txt @@ -1,5 +1,5 @@ FILE: mutableList.kt public final fun foo(): R|kotlin/Unit| { lvar listVar: R|kotlin/collections/MutableList| = R|kotlin/collections/mutableListOf|(vararg(Int(1), Int(2), Int(3))) - R|/listVar| = R|/listVar|.#(Int(4)) + R|/listVar| = R|/listVar|.R|kotlin/collections/plus#|(Int(4)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/nullableIntegerLiteralType.fir.txt b/compiler/fir/analysis-tests/testData/resolve/inference/nullableIntegerLiteralType.fir.txt index 5c4218a0dd5..25a18c84955 100644 --- a/compiler/fir/analysis-tests/testData/resolve/inference/nullableIntegerLiteralType.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/inference/nullableIntegerLiteralType.fir.txt @@ -11,7 +11,7 @@ FILE: nullableIntegerLiteralType.kt } } - #(R|/x|) + R|/takeInt#|(R|/x|) } public final fun test_2(b: R|kotlin/Boolean|, y: R|kotlin/Int|): R|kotlin/Unit| { lval x: R|kotlin/Int?| = when () { @@ -23,5 +23,5 @@ FILE: nullableIntegerLiteralType.kt } } - #(R|/x|) + R|/takeInt#|(R|/x|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.fir.txt b/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.fir.txt index ada3dba49ae..22815009789 100644 --- a/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.fir.txt @@ -24,7 +24,7 @@ FILE: receiverWithCapturedType.kt R|/resolvedCall|.R|/getParameterForArgument|() } public final fun test_2_1(resolvedCall: R|ResolvedCall|, d: R|CallableDescriptor|): R|kotlin/Unit| { - lval x: R|CallableDescriptor| = R|/resolvedCall|.#(R|/d|) + lval x: R|CallableDescriptor| = R|/resolvedCall|.R|/updateD#|(R|/d|) } public final fun test_2_2(resolvedCall: R|ResolvedCall|, d: R|CallableDescriptor|): R|kotlin/Unit| { lval x: R|CallableDescriptor| = R|/resolvedCall|.R|/updateD|(R|/d|) diff --git a/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.fir.txt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.fir.txt index 1ea13151de6..f76469e9fb4 100644 --- a/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.fir.txt @@ -29,9 +29,9 @@ FILE: innerTypes.kt public final val rrq: R|Outer.Inner| = R|/Boxed.Boxed|().R|SubstitutionOverride|>|() public get(): R|Outer.Inner| public final fun check(): R|kotlin/Unit| { - #(R|/Outer.Outer|().R|SubstitutionOverride|()) - #(R|/Outer.Outer|().R|SubstitutionOverride|()) + R|/accept#|(R|/Outer.Outer|().R|SubstitutionOverride|()) + R|/accept#|(R|/Outer.Outer|().R|SubstitutionOverride|()) R|/accept|(R|/Outer.Outer|().R|SubstitutionOverride|()) - #(R|/Boxed.Boxed|().R|SubstitutionOverride|>|()) + R|/accept#|(R|/Boxed.Boxed|().R|SubstitutionOverride|>|()) R|/accept|(R|/Boxed.Boxed|().R|SubstitutionOverride|>|()) } diff --git a/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.fir.txt b/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.fir.txt index 83eafccfca0..b4c04edf80e 100644 --- a/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.fir.txt @@ -29,7 +29,7 @@ FILE: lambdaArgInScopeFunction.kt } ) } R|/lambda|.R|/checkType| KotlinClass)?|>( = checkType@fun R|CheckTypeInv?>|.(): R|kotlin/Unit| { - this@R|special/anonymous|.# KotlinClass?|>() + this@R|special/anonymous|.R|/_#| KotlinClass?|>() } ) } @@ -50,7 +50,7 @@ FILE: lambdaArgInScopeFunction.kt } ) R|/lambda|.R|/checkType| KotlinClass|>( = checkType@fun R|CheckTypeInv>|.(): R|kotlin/Unit| { - this@R|special/anonymous|.# KotlinClass?|>() + this@R|special/anonymous|.R|/_#| KotlinClass?|>() } ) } diff --git a/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.fir.txt b/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.fir.txt index 1911e20cf08..7046577b1c5 100644 --- a/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.fir.txt @@ -29,11 +29,11 @@ FILE: KotlinClass.kt } ) R|/invalidType|.R|/checkType| kotlin/Boolean|>( = checkType@fun R|CheckTypeInv>|.(): R|kotlin/Unit| { - this@R|special/anonymous|.# kotlin/Boolean|>() + this@R|special/anonymous|.R|/_#| kotlin/Boolean|>() } ) R|/Case1.Case1|(R|/javaClass|).R|/Case1.x|.R|/checkType| kotlin/Boolean|>( = checkType@fun R|CheckTypeInv>|.(): R|kotlin/Unit| { - this@R|special/anonymous|.# kotlin/Boolean|>() + this@R|special/anonymous|.R|/_#| kotlin/Boolean|>() } ) } @@ -122,11 +122,11 @@ FILE: KotlinClass.kt } ) R|/invalidType|.R|/checkType| kotlin/Boolean|>( = checkType@fun R|CheckTypeInv>|.(): R|kotlin/Unit| { - this@R|special/anonymous|.# kotlin/Boolean|>() + this@R|special/anonymous|.R|/_#| kotlin/Boolean|>() } ) R|/Case2.Case2|(R|/kotlinClass|).R|/Case2.x|.R|/checkType| kotlin/Boolean|>( = checkType@fun R|CheckTypeInv>|.(): R|kotlin/Unit| { - this@R|special/anonymous|.# kotlin/Boolean|>() + this@R|special/anonymous|.R|/_#| kotlin/Boolean|>() } ) } diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.fir.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.fir.txt index 3be1d1c96d7..89bcd7ab288 100644 --- a/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.fir.txt @@ -24,5 +24,5 @@ FILE: supertypeGenericsComplex.kt } public final fun f(list: R|kotlin/collections/MutableList|, s: R|kotlin/collections/MutableList|): R|kotlin/Unit| { R|/C.C|().R|SubstitutionOverride|(R|/list|, R|/s|) - R|/C.C|().#(R|/s|, R|/list|) + R|/C.C|().R|SubstitutionOverride#|(R|/s|, R|/list|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.fir.txt b/compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.fir.txt index 3b082dd4a0d..32d85815d5d 100644 --- a/compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.fir.txt @@ -1,4 +1,4 @@ FILE: main.kt public final fun R|SLRUMap|.getOrPut(value: R|V|): R|kotlin/Unit| { - this@R|/getOrPut|.#(R|/value|) + this@R|/getOrPut|.R|SubstitutionOverride#|(R|/value|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/qualifierWithCompanion.fir.txt b/compiler/fir/analysis-tests/testData/resolve/qualifierWithCompanion.fir.txt index 4548fe91bc7..eeccb6f4199 100644 --- a/compiler/fir/analysis-tests/testData/resolve/qualifierWithCompanion.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/qualifierWithCompanion.fir.txt @@ -26,5 +26,5 @@ FILE: qualifierWithCompanion.kt local final fun R|my/A|.invoke(): R|kotlin/Unit| { } - Q|my|.R|my/xx|./invoke>#() + Q|my|.R|my/xx|.R|/invoke/invoke>#|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt index 8836513bbe9..6032bdacfca 100644 --- a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt @@ -8,7 +8,7 @@ FILE: main.kt ^ R|/x|.R|kotlin/Int.toString|() } ) - #( = MyFunction@fun (x: ): { + R|/MyFunction#|( = MyFunction@fun (x: ): { ^ String() } ) diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt index 704256949e8..fd77ca28951 100644 --- a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt @@ -14,7 +14,7 @@ FILE: main.kt ^ R|/x|.R|kotlin/Number.toInt|().R|kotlin/Int.toString|() } )) - #(R|/MyFunction|( = MyFunction@fun (x: R|kotlin/Int|): R|kotlin/String!| { + R|/foo2#|(R|/MyFunction|( = MyFunction@fun (x: R|kotlin/Int|): R|kotlin/String!| { ^ R|/x|.R|kotlin/Int.toString|() } )) diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/realConstructorFunction.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/realConstructorFunction.fir.txt index 4851fe2ded1..9755f5c360d 100644 --- a/compiler/fir/analysis-tests/testData/resolve/samConstructors/realConstructorFunction.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/samConstructors/realConstructorFunction.fir.txt @@ -5,11 +5,11 @@ FILE: main.kt ^MyRunnable Int(1) } public final fun main(): R|kotlin/Unit| { - #(R|/MyRunnable|( = MyRunnable@fun (x: R|kotlin/Int|): R|kotlin/Boolean| { + R|/foo#|(R|/MyRunnable|( = MyRunnable@fun (x: R|kotlin/Int|): R|kotlin/Boolean| { ^ CMP(>, R|/x|.R|kotlin/Int.compareTo|(Int(1))) } )) - #(R|/MyRunnable|(MyRunnable@fun (it: R|kotlin/Int|): R|kotlin/Boolean| { + R|/foo#|(R|/MyRunnable|(MyRunnable@fun (it: R|kotlin/Int|): R|kotlin/Boolean| { ^ CMP(>, R|/it|.R|kotlin/Int.compareTo|(Int(1))) } )) @@ -17,5 +17,5 @@ FILE: main.kt ^ CMP(>, R|/x|.R|kotlin/Int.compareTo|(Int(1))) } - #(R|/MyRunnable|(R|/x|)) + R|/foo#|(R|/MyRunnable|(R|/x|)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt index 14d02f74c70..6af7371c73c 100644 --- a/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt @@ -8,7 +8,7 @@ FILE: main.kt ^ R|/x|.R|kotlin/Number.toInt|().R|kotlin/Int.toString|() } ) - Q|JavaUsage|.#( = foo2@fun (x: R|kotlin/Int|): R|kotlin/CharSequence!| { + Q|JavaUsage|.R|/JavaUsage.foo2#|( = foo2@fun (x: R|kotlin/Int|): R|kotlin/CharSequence!| { ^ R|/x|.R|kotlin/Int.toString|() } ) diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/kotlinSam.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/kotlinSam.fir.txt index f4049bcc241..23728e4b8d3 100644 --- a/compiler/fir/analysis-tests/testData/resolve/samConversions/kotlinSam.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/kotlinSam.fir.txt @@ -38,16 +38,16 @@ FILE: kotlinSam.kt } ) R|/foo1|(R|/f|) - #( = foo2@fun (x: R|kotlin/Nothing|): R|kotlin/Boolean| { + R|/foo2#|( = foo2@fun (x: R|kotlin/Nothing|): R|kotlin/Boolean| { ^ CMP(>, R|/x|.#(Int(1))) } ) - #(R|/f|) - #( = foo3@fun (x: R|kotlin/Nothing|): R|kotlin/Boolean| { + R|/foo2#|(R|/f|) + R|/foo3#|( = foo3@fun (x: R|kotlin/Nothing|): R|kotlin/Boolean| { ^ CMP(>, R|/x|.#(Int(1))) } ) - #(R|/f|) + R|/foo3#|(R|/f|) R|/foo4|( = foo4@fun (x: R|kotlin/Int|): R|kotlin/Boolean| { ^ CMP(>, R|/x|.R|kotlin/Int.compareTo|(Int(1))) } diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/notSamBecauseOfSupertype.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/notSamBecauseOfSupertype.fir.txt index aac658e208a..a19f679bfc4 100644 --- a/compiler/fir/analysis-tests/testData/resolve/samConversions/notSamBecauseOfSupertype.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/notSamBecauseOfSupertype.fir.txt @@ -2,11 +2,11 @@ FILE: main.kt public final fun foo(m: R|MyRunnable|): R|kotlin/Unit| { } public final fun main(): R|kotlin/Unit| { - Q|JavaUsage|.#( = foo@fun (x: R|kotlin/Nothing|): R|kotlin/Boolean| { + Q|JavaUsage|.R|/JavaUsage.foo#|( = foo@fun (x: R|kotlin/Nothing|): R|kotlin/Boolean| { ^ CMP(>, R|/x|.#(Int(1))) } ) - Q|JavaUsage|.#(foo@fun (): R|kotlin/Boolean| { + Q|JavaUsage|.R|/JavaUsage.foo#|(foo@fun (): R|kotlin/Boolean| { ^ CMP(>, #.#(Int(1))) } ) @@ -14,5 +14,5 @@ FILE: main.kt ^ CMP(>, R|/x|.R|kotlin/Int.compareTo|(Int(1))) } - Q|JavaUsage|.#(R|/x|) + Q|JavaUsage|.R|/JavaUsage.foo#|(R|/x|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_2.fir.txt b/compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_2.fir.txt index c492de0465d..72d07288642 100644 --- a/compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_2.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_2.fir.txt @@ -1,11 +1,11 @@ FILE: main.kt public final fun test(map: R|SomeMap|): R|kotlin/Unit| { R|/map|.R|SubstitutionOverride|(Int(1)) - R|/map|.#(String()) + R|/map|.R|SubstitutionOverride#|(String()) R|/map|.R|SubstitutionOverride|(String()) - R|/map|.#(Int(1)) + R|/map|.R|SubstitutionOverride#|(Int(1)) R|/map|.R|SubstitutionOverride|(Int(1)) - R|/map|.#(String()) + R|/map|.R|SubstitutionOverride#|(String()) R|/map|.R|SubstitutionOverride|(Int(1)) - R|/map|.#(String()) + R|/map|.R|SubstitutionOverride#|(String()) } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/accessToMemberAfterReceiverReassignment.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/accessToMemberAfterReceiverReassignment.fir.txt index 0fb82d67237..a5f992a92f2 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/accessToMemberAfterReceiverReassignment.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/accessToMemberAfterReceiverReassignment.fir.txt @@ -17,7 +17,7 @@ FILE: accessToMemberAfterReceiverReassignment.kt !=(R|/y|?.{ $subj$.R|/My.x| }, Null(null)) -> { R|/y|.R|/My.x|.R|/My.x| R|/y| = R|/My.My|(Null(null)) - R|/y|.R|/My.x|.# + R|/y|.R|/My.x|.R|/My.x#| } } @@ -28,7 +28,7 @@ FILE: accessToMemberAfterReceiverReassignment.kt !=(R|/y|?.{ $subj$.R|/My.x| }?.{ $subj$.R|/My.x| }, Null(null)) -> { R|/y|.R|/My.x|.R|/My.x|.R|/My.x| R|/y| = R|/My.My|(Null(null)) - R|/y|.R|/My.x|.#.# + R|/y|.R|/My.x|.R|/My.x#|.R|/My.x#| } } @@ -39,7 +39,7 @@ FILE: accessToMemberAfterReceiverReassignment.kt !=(R|/y|.R|/My.x|, Null(null)) -> { R|/y|.R|/My.x|.R|/My.x| R|/y| = R|/My.My|(Null(null)) - R|/y|.R|/My.x|.# + R|/y|.R|/My.x|.R|/My.x#| } } @@ -53,8 +53,8 @@ FILE: accessToMemberAfterReceiverReassignment.kt R|/y|.R|/My.x|.R|/My.x| R|/y|.R|/My.z|.R|/My.z| R|/y| = R|/My.My|(Null(null)) - R|/y|.R|/My.x|.# - R|/y|.R|/My.z|.# + R|/y|.R|/My.x|.R|/My.x#| + R|/y|.R|/My.z|.R|/My.z#| } } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.dot index 8eadcad5e42..27fef6ccfb7 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.dot @@ -213,7 +213,7 @@ digraph bangbang_kt { 84 [label="Exit when"]; } 85 [label="Access variable R|/a|"]; - 86 [label="Function call: R|/a|.#()" style="filled" fillcolor=yellow]; + 86 [label="Function call: R|/a|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 87 [label="Exit block"]; } 88 [label="Exit function test_3" style="filled" fillcolor=red]; @@ -347,14 +347,14 @@ digraph bangbang_kt { color=blue 131 [label="Enter block"]; 132 [label="Access variable R|/a|"]; - 133 [label="Function call: R|/a|.#()" style="filled" fillcolor=yellow]; + 133 [label="Function call: R|/a|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 134 [label="Exit block"]; } 135 [label="Exit when branch result"]; 136 [label="Exit when"]; } 137 [label="Access variable R|/a|"]; - 138 [label="Function call: R|/a|.#()" style="filled" fillcolor=yellow]; + 138 [label="Function call: R|/a|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 139 [label="Exit block"]; } 140 [label="Exit function test_5" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.fir.txt index 369063f6f10..1e6c78179a0 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.fir.txt @@ -32,7 +32,7 @@ FILE: bangbang.kt } } - R|/a|.#() + R|/a|.R|/A.foo#|() } public final fun test_4(a: R|A?|, b: R|kotlin/Boolean|): R|kotlin/Unit| { when () { @@ -46,11 +46,11 @@ FILE: bangbang.kt public final fun test_5(a: R|A?|, b: R|kotlin/Boolean|): R|kotlin/Unit| { when () { R|/b| || R|/a|!!.R|/A.foo|() -> { - R|/a|.#() + R|/a|.R|/A.foo#|() } } - R|/a|.#() + R|/a|.R|/A.foo#|() } public final fun test_6(x: R|X|): R|kotlin/Unit| { R|/x|!!.R|/A.foo|() diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/booleanElvisBoundSmartcast.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/booleanElvisBoundSmartcast.fir.txt index f01f7c29253..3e9dff8c421 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/booleanElvisBoundSmartcast.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/booleanElvisBoundSmartcast.fir.txt @@ -17,7 +17,7 @@ FILE: booleanElvisBoundSmartcast.kt R|/a|.R|/A.foo|() } else -> { - R|/a|.#() + R|/a|.R|/A.foo#|() } } @@ -25,7 +25,7 @@ FILE: booleanElvisBoundSmartcast.kt public final fun test_2(a: R|A?|): R|kotlin/Unit| { when () { R|/a|?.{ $subj$.R|/A.b| } ?: Boolean(true) -> { - R|/a|.#() + R|/a|.R|/A.foo#|() } else -> { R|/a|.R|/A.foo|() diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.dot index 561c0e31959..8aa58c1a52d 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.dot @@ -46,7 +46,7 @@ digraph equalsToBoolean_kt { color=blue 17 [label="Enter block"]; 18 [label="Access variable R|/b|"]; - 19 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 19 [label="Function call: R|/b|.R|kotlin/Boolean.not#|()" style="filled" fillcolor=yellow]; 20 [label="Exit block"]; } 21 [label="Exit when branch result"]; @@ -133,7 +133,7 @@ digraph equalsToBoolean_kt { color=blue 52 [label="Enter block"]; 53 [label="Access variable R|/b|"]; - 54 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 54 [label="Function call: R|/b|.R|kotlin/Boolean.not#|()" style="filled" fillcolor=yellow]; 55 [label="Exit block"]; } 56 [label="Exit when branch result"]; @@ -210,7 +210,7 @@ digraph equalsToBoolean_kt { color=blue 80 [label="Enter block"]; 81 [label="Access variable R|/b|"]; - 82 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 82 [label="Function call: R|/b|.R|kotlin/Boolean.not#|()" style="filled" fillcolor=yellow]; 83 [label="Exit block"]; } 84 [label="Exit when branch result"]; @@ -277,7 +277,7 @@ digraph equalsToBoolean_kt { color=blue 101 [label="Enter block"]; 102 [label="Access variable R|/b|"]; - 103 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 103 [label="Function call: R|/b|.R|kotlin/Boolean.not#|()" style="filled" fillcolor=yellow]; 104 [label="Exit block"]; } 105 [label="Exit when branch result"]; @@ -364,7 +364,7 @@ digraph equalsToBoolean_kt { color=blue 136 [label="Enter block"]; 137 [label="Access variable R|/b|"]; - 138 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 138 [label="Function call: R|/b|.R|kotlin/Boolean.not#|()" style="filled" fillcolor=yellow]; 139 [label="Exit block"]; } 140 [label="Exit when branch result"]; @@ -431,7 +431,7 @@ digraph equalsToBoolean_kt { color=blue 157 [label="Enter block"]; 158 [label="Access variable R|/b|"]; - 159 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 159 [label="Function call: R|/b|.R|kotlin/Boolean.not#|()" style="filled" fillcolor=yellow]; 160 [label="Exit block"]; } 161 [label="Exit when branch result"]; @@ -508,7 +508,7 @@ digraph equalsToBoolean_kt { color=blue 185 [label="Enter block"]; 186 [label="Access variable R|/b|"]; - 187 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 187 [label="Function call: R|/b|.R|kotlin/Boolean.not#|()" style="filled" fillcolor=yellow]; 188 [label="Exit block"]; } 189 [label="Exit when branch result"]; @@ -595,7 +595,7 @@ digraph equalsToBoolean_kt { color=blue 220 [label="Enter block"]; 221 [label="Access variable R|/b|"]; - 222 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 222 [label="Function call: R|/b|.R|kotlin/Boolean.not#|()" style="filled" fillcolor=yellow]; 223 [label="Exit block"]; } 224 [label="Exit when branch result"]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.fir.txt index d3cf7547700..eafd32f61d1 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.fir.txt @@ -12,7 +12,7 @@ FILE: equalsToBoolean.kt R|/b|.R|kotlin/Boolean.not|() } else -> { - R|/b|.#() + R|/b|.R|kotlin/Boolean.not#|() } } @@ -20,7 +20,7 @@ FILE: equalsToBoolean.kt public final fun test_2(b: R|kotlin/Boolean?|): R|kotlin/Unit| { when () { !=(==(R|/b|, Boolean(true)), Boolean(true)) -> { - R|/b|.#() + R|/b|.R|kotlin/Boolean.not#|() } else -> { R|/b|.R|kotlin/Boolean.not|() @@ -31,7 +31,7 @@ FILE: equalsToBoolean.kt public final fun test_3(b: R|kotlin/Boolean?|): R|kotlin/Unit| { when () { ==(==(R|/b|, Boolean(true)), Boolean(false)) -> { - R|/b|.#() + R|/b|.R|kotlin/Boolean.not#|() } else -> { R|/b|.R|kotlin/Boolean.not|() @@ -45,7 +45,7 @@ FILE: equalsToBoolean.kt R|/b|.R|kotlin/Boolean.not|() } else -> { - R|/b|.#() + R|/b|.R|kotlin/Boolean.not#|() } } @@ -53,7 +53,7 @@ FILE: equalsToBoolean.kt public final fun test_5(b: R|kotlin/Boolean?|): R|kotlin/Unit| { when () { ==(!=(R|/b|, Boolean(true)), Boolean(true)) -> { - R|/b|.#() + R|/b|.R|kotlin/Boolean.not#|() } else -> { R|/b|.R|kotlin/Boolean.not|() @@ -67,7 +67,7 @@ FILE: equalsToBoolean.kt R|/b|.R|kotlin/Boolean.not|() } else -> { - R|/b|.#() + R|/b|.R|kotlin/Boolean.not#|() } } @@ -78,7 +78,7 @@ FILE: equalsToBoolean.kt R|/b|.R|kotlin/Boolean.not|() } else -> { - R|/b|.#() + R|/b|.R|kotlin/Boolean.not#|() } } @@ -86,7 +86,7 @@ FILE: equalsToBoolean.kt public final fun test_8(b: R|kotlin/Boolean?|): R|kotlin/Unit| { when () { !=(!=(R|/b|, Boolean(true)), Boolean(false)) -> { - R|/b|.#() + R|/b|.R|kotlin/Boolean.not#|() } else -> { R|/b|.R|kotlin/Boolean.not|() diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.dot index 19c19b1d481..345495b1e56 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.dot @@ -280,7 +280,7 @@ digraph jumpFromRhsOfOperator_kt { } 108 [label="Access variable R|/a|"]; 109 [label="Smart cast: R|/a|"]; - 110 [label="Function call: R|/a|.#()" style="filled" fillcolor=yellow]; + 110 [label="Function call: R|/a|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 111 [label="Exit block"]; } 112 [label="Exit function test_5" style="filled" fillcolor=red]; @@ -324,7 +324,7 @@ digraph jumpFromRhsOfOperator_kt { } 125 [label="Access variable R|/a|"]; 126 [label="Smart cast: R|/a|"]; - 127 [label="Function call: R|/a|.#()" style="filled" fillcolor=yellow]; + 127 [label="Function call: R|/a|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 128 [label="Exit block"]; } 129 [label="Exit function teat_6" style="filled" fillcolor=red]; @@ -381,7 +381,7 @@ digraph jumpFromRhsOfOperator_kt { 147 [label="Enter block"]; 148 [label="Access variable R|/a|"]; 149 [label="Smart cast: R|/a|"]; - 150 [label="Function call: R|/a|.#()" style="filled" fillcolor=yellow]; + 150 [label="Function call: R|/a|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 151 [label="Exit block"]; } 152 [label="Exit when branch result"]; @@ -389,7 +389,7 @@ digraph jumpFromRhsOfOperator_kt { } 154 [label="Access variable R|/a|"]; 155 [label="Smart cast: R|/a|"]; - 156 [label="Function call: R|/a|.#()" style="filled" fillcolor=yellow]; + 156 [label="Function call: R|/a|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 157 [label="Exit block"]; } 158 [label="Exit function test_7" style="filled" fillcolor=red]; @@ -458,7 +458,7 @@ digraph jumpFromRhsOfOperator_kt { 176 [label="Enter block"]; 177 [label="Access variable R|/a|"]; 178 [label="Smart cast: R|/a|"]; - 179 [label="Function call: R|/a|.#()" style="filled" fillcolor=yellow]; + 179 [label="Function call: R|/a|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 180 [label="Exit block"]; } 181 [label="Exit when branch result"]; @@ -466,7 +466,7 @@ digraph jumpFromRhsOfOperator_kt { } 183 [label="Access variable R|/a|"]; 184 [label="Smart cast: R|/a|"]; - 185 [label="Function call: R|/a|.#()" style="filled" fillcolor=yellow]; + 185 [label="Function call: R|/a|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 186 [label="Exit block"]; } 187 [label="Exit function test_8" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.fir.txt index f0c7ae99b40..bfffc4dba72 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.fir.txt @@ -31,27 +31,27 @@ FILE: jumpFromRhsOfOperator.kt } public final fun test_5(a: R|A?|): R|kotlin/Unit| { ==(R|/a|, Null(null)) || throw R|java/lang/Exception.Exception|() - R|/a|.#() + R|/a|.R|/A.foo#|() } public final fun teat_6(a: R|A?|): R|kotlin/Unit| { !=(R|/a|, Null(null)) && throw R|java/lang/Exception.Exception|() - R|/a|.#() + R|/a|.R|/A.foo#|() } public final fun test_7(a: R|A?|): R|kotlin/Unit| { when () { ==(R|/a|, Null(null)) || throw R|java/lang/Exception.Exception|() -> { - R|/a|.#() + R|/a|.R|/A.foo#|() } } - R|/a|.#() + R|/a|.R|/A.foo#|() } public final fun test_8(a: R|A?|): R|kotlin/Unit| { when () { !=(R|/a|, Null(null)) && throw R|java/lang/Exception.Exception|() -> { - R|/a|.#() + R|/a|.R|/A.foo#|() } } - R|/a|.#() + R|/a|.R|/A.foo#|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot index 903bb64296b..ce142efb11f 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot @@ -613,9 +613,9 @@ digraph boundSmartcastsInBranches_kt { 230 [label="Smart cast: R|/x|"]; 231 [label="Access variable R|kotlin/String.length|"]; 232 [label="Access variable R|/y|"]; - 233 [label="Access variable #"]; + 233 [label="Access variable R|kotlin/String.length#|"]; 234 [label="Access variable R|/z|"]; - 235 [label="Access variable #"]; + 235 [label="Access variable R|kotlin/String.length#|"]; 236 [label="Exit block"]; } 237 [label="Exit when branch result"]; @@ -638,12 +638,12 @@ digraph boundSmartcastsInBranches_kt { color=blue 247 [label="Enter block"]; 248 [label="Access variable R|/x|"]; - 249 [label="Access variable #"]; + 249 [label="Access variable R|kotlin/String.length#|"]; 250 [label="Access variable R|/y|"]; 251 [label="Smart cast: R|/y|"]; 252 [label="Access variable R|kotlin/String.length|"]; 253 [label="Access variable R|/z|"]; - 254 [label="Access variable #"]; + 254 [label="Access variable R|kotlin/String.length#|"]; 255 [label="Exit block"]; } 256 [label="Exit when branch result"]; @@ -666,9 +666,9 @@ digraph boundSmartcastsInBranches_kt { color=blue 266 [label="Enter block"]; 267 [label="Access variable R|/x|"]; - 268 [label="Access variable #"]; + 268 [label="Access variable R|kotlin/String.length#|"]; 269 [label="Access variable R|/y|"]; - 270 [label="Access variable #"]; + 270 [label="Access variable R|kotlin/String.length#|"]; 271 [label="Access variable R|/z|"]; 272 [label="Smart cast: R|/z|"]; 273 [label="Access variable R|kotlin/String.length|"]; @@ -700,9 +700,9 @@ digraph boundSmartcastsInBranches_kt { 290 [label="Access variable R|kotlin/String.length|"]; 291 [label="Access variable R|/y|"]; 292 [label="Smart cast: R|/y|"]; - 293 [label="Access variable #"]; + 293 [label="Access variable R|kotlin/String.length#|"]; 294 [label="Access variable R|/z|"]; - 295 [label="Access variable #"]; + 295 [label="Access variable R|kotlin/String.length#|"]; 296 [label="Exit block"]; } 297 [label="Exit when branch result"]; @@ -726,13 +726,13 @@ digraph boundSmartcastsInBranches_kt { color=blue 308 [label="Enter block"]; 309 [label="Access variable R|/x|"]; - 310 [label="Access variable #"]; + 310 [label="Access variable R|kotlin/String.length#|"]; 311 [label="Access variable R|/y|"]; 312 [label="Smart cast: R|/y|"]; 313 [label="Stub" style="filled" fillcolor=gray]; 314 [label="Access variable R|kotlin/String.length|" style="filled" fillcolor=gray]; 315 [label="Access variable R|/z|" style="filled" fillcolor=gray]; - 316 [label="Access variable #" style="filled" fillcolor=gray]; + 316 [label="Access variable R|kotlin/String.length#|" style="filled" fillcolor=gray]; 317 [label="Exit block" style="filled" fillcolor=gray]; } 318 [label="Exit when branch result" style="filled" fillcolor=gray]; @@ -755,10 +755,10 @@ digraph boundSmartcastsInBranches_kt { color=blue 328 [label="Enter block"]; 329 [label="Access variable R|/x|"]; - 330 [label="Access variable #"]; + 330 [label="Access variable R|kotlin/String.length#|"]; 331 [label="Access variable R|/y|"]; 332 [label="Smart cast: R|/y|"]; - 333 [label="Access variable #"]; + 333 [label="Access variable R|kotlin/String.length#|"]; 334 [label="Access variable R|/z|"]; 335 [label="Smart cast: R|/z|"]; 336 [label="Access variable R|kotlin/String.length|"]; @@ -1027,7 +1027,7 @@ digraph boundSmartcastsInBranches_kt { 426 [label="Access variable R|kotlin/String.length|"]; 427 [label="Access variable R|/y|"]; 428 [label="Smart cast: R|/y|"]; - 429 [label="Access variable #"]; + 429 [label="Access variable R|kotlin/String.length#|"]; 430 [label="Access variable R|/z|"]; 431 [label="Smart cast: R|/z|"]; 432 [label="Access variable R|kotlin/String.length|"]; @@ -1054,13 +1054,13 @@ digraph boundSmartcastsInBranches_kt { color=blue 445 [label="Enter block"]; 446 [label="Access variable R|/x|"]; - 447 [label="Access variable #"]; + 447 [label="Access variable R|kotlin/String.length#|"]; 448 [label="Access variable R|/y|"]; 449 [label="Smart cast: R|/y|"]; 450 [label="Stub" style="filled" fillcolor=gray]; 451 [label="Access variable R|kotlin/String.length|" style="filled" fillcolor=gray]; 452 [label="Access variable R|/z|" style="filled" fillcolor=gray]; - 453 [label="Access variable #" style="filled" fillcolor=gray]; + 453 [label="Access variable R|kotlin/String.length#|" style="filled" fillcolor=gray]; 454 [label="Exit block" style="filled" fillcolor=gray]; } 455 [label="Exit when branch result" style="filled" fillcolor=gray]; @@ -1087,7 +1087,7 @@ digraph boundSmartcastsInBranches_kt { 468 [label="Access variable R|kotlin/String.length|"]; 469 [label="Access variable R|/y|"]; 470 [label="Smart cast: R|/y|"]; - 471 [label="Access variable #"]; + 471 [label="Access variable R|kotlin/String.length#|"]; 472 [label="Access variable R|/z|"]; 473 [label="Smart cast: R|/z|"]; 474 [label="Access variable R|kotlin/String.length|"]; @@ -1287,7 +1287,7 @@ digraph boundSmartcastsInBranches_kt { 507 [label="Exit when"]; } 508 [label="Access variable R|/b|"]; - 509 [label="Access variable #"]; + 509 [label="Access variable R|kotlin/String.length#|"]; subgraph cluster_97 { color=blue 510 [label="Enter when"]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.fir.txt index 835a38e5978..16774238358 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.fir.txt @@ -110,23 +110,23 @@ FILE: boundSmartcastsInBranches.kt when () { !=(R|/x|, Null(null)) -> { R|/x|.R|kotlin/String.length| - R|/y|.# - R|/z|.# + R|/y|.R|kotlin/String.length#| + R|/z|.R|kotlin/String.length#| } } when () { !=(R|/y|, Null(null)) -> { - R|/x|.# + R|/x|.R|kotlin/String.length#| R|/y|.R|kotlin/String.length| - R|/z|.# + R|/z|.R|kotlin/String.length#| } } when () { !=(R|/z|, Null(null)) -> { - R|/x|.# - R|/y|.# + R|/x|.R|kotlin/String.length#| + R|/y|.R|kotlin/String.length#| R|/z|.R|kotlin/String.length| } } @@ -135,23 +135,23 @@ FILE: boundSmartcastsInBranches.kt when () { !=(R|/x|, Null(null)) -> { R|/x|.R|kotlin/String.length| - R|/y|.# - R|/z|.# + R|/y|.R|kotlin/String.length#| + R|/z|.R|kotlin/String.length#| } } when () { !=(R|/y|, Null(null)) -> { - R|/x|.# + R|/x|.R|kotlin/String.length#| R|/y|.R|kotlin/String.length| - R|/z|.# + R|/z|.R|kotlin/String.length#| } } when () { !=(R|/z|, Null(null)) -> { - R|/x|.# - R|/y|.# + R|/x|.R|kotlin/String.length#| + R|/y|.R|kotlin/String.length#| R|/z|.R|kotlin/String.length| } } @@ -189,23 +189,23 @@ FILE: boundSmartcastsInBranches.kt when () { !=(R|/x|, Null(null)) -> { R|/x|.R|kotlin/String.length| - R|/y|.# + R|/y|.R|kotlin/String.length#| R|/z|.R|kotlin/String.length| } } when () { !=(R|/y|, Null(null)) -> { - R|/x|.# + R|/x|.R|kotlin/String.length#| R|/y|.R|kotlin/String.length| - R|/z|.# + R|/z|.R|kotlin/String.length#| } } when () { !=(R|/z|, Null(null)) -> { R|/x|.R|kotlin/String.length| - R|/y|.# + R|/y|.R|kotlin/String.length#| R|/z|.R|kotlin/String.length| } } @@ -223,7 +223,7 @@ FILE: boundSmartcastsInBranches.kt } } - R|/b|.# + R|/b|.R|kotlin/String.length#| when () { !=(R|/a|, Null(null)) -> { R|/b|.R|kotlin/String.length| diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.dot index c1b01a23a58..f8eca3a08c9 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.dot @@ -140,9 +140,9 @@ digraph equalsAndIdentity_kt { color=blue 52 [label="Enter block"]; 53 [label="Access variable R|/x|"]; - 54 [label="Function call: R|/x|.#()" style="filled" fillcolor=yellow]; + 54 [label="Function call: R|/x|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 55 [label="Access variable R|/y|"]; - 56 [label="Function call: R|/y|.#()" style="filled" fillcolor=yellow]; + 56 [label="Function call: R|/y|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 57 [label="Exit block"]; } 58 [label="Exit when branch result"]; @@ -165,9 +165,9 @@ digraph equalsAndIdentity_kt { color=blue 68 [label="Enter block"]; 69 [label="Access variable R|/x|"]; - 70 [label="Function call: R|/x|.#()" style="filled" fillcolor=yellow]; + 70 [label="Function call: R|/x|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 71 [label="Access variable R|/y|"]; - 72 [label="Function call: R|/y|.#()" style="filled" fillcolor=yellow]; + 72 [label="Function call: R|/y|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 73 [label="Exit block"]; } 74 [label="Exit when branch result"]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.fir.txt index 90ff8875de7..20b84036954 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.fir.txt @@ -22,15 +22,15 @@ FILE: equalsAndIdentity.kt public final fun test_2(x: R|A?|, y: R|A?|): R|kotlin/Unit| { when () { ==(R|/x|, R|/y|) -> { - R|/x|.#() - R|/y|.#() + R|/x|.R|/A.foo#|() + R|/y|.R|/A.foo#|() } } when () { ===(R|/x|, R|/y|) -> { - R|/x|.#() - R|/y|.#() + R|/x|.R|/A.foo#|() + R|/y|.R|/A.foo#|() } } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.dot index b5082e1131f..89634b1177b 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.dot @@ -240,7 +240,7 @@ digraph nullability_kt { 76 [label="Enter block"]; 77 [label="Access variable R|/x|"]; 78 [label="Smart cast: R|/x|"]; - 79 [label="Function call: R|/x|.#()" style="filled" fillcolor=yellow]; + 79 [label="Function call: R|/x|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 80 [label="Exit block"]; } 81 [label="Exit when branch result"]; @@ -257,7 +257,7 @@ digraph nullability_kt { 89 [label="Exit when"]; } 90 [label="Access variable R|/x|"]; - 91 [label="Function call: R|/x|.#()" style="filled" fillcolor=yellow]; + 91 [label="Function call: R|/x|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 92 [label="Exit block"]; } 93 [label="Exit function test_1" style="filled" fillcolor=red]; @@ -329,14 +329,14 @@ digraph nullability_kt { 112 [label="Enter block"]; 113 [label="Access variable R|/x|"]; 114 [label="Smart cast: R|/x|"]; - 115 [label="Function call: R|/x|.#()" style="filled" fillcolor=yellow]; + 115 [label="Function call: R|/x|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 116 [label="Exit block"]; } 117 [label="Exit when branch result"]; 118 [label="Exit when"]; } 119 [label="Access variable R|/x|"]; - 120 [label="Function call: R|/x|.#()" style="filled" fillcolor=yellow]; + 120 [label="Function call: R|/x|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 121 [label="Exit block"]; } 122 [label="Exit function test_2" style="filled" fillcolor=red]; @@ -508,13 +508,13 @@ digraph nullability_kt { 186 [label="Smart cast: R|/q|"]; 187 [label="Access variable R|/Q.data|"]; 188 [label="Smart cast: R|/q|.R|/Q.data|"]; - 189 [label="Access variable #"]; + 189 [label="Access variable R|/MyData.s#|"]; 190 [label="Access variable R|/q|"]; 191 [label="Smart cast: R|/q|"]; 192 [label="Access variable R|/Q.data|"]; 193 [label="Smart cast: R|/q|.R|/Q.data|"]; - 194 [label="Access variable #"]; - 195 [label="Function call: R|/q|.R|/Q.data|.#.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow]; + 194 [label="Access variable R|/MyData.s#|"]; + 195 [label="Function call: R|/q|.R|/Q.data|.R|/MyData.s#|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow]; 196 [label="Exit block"]; } 197 [label="Exit when branch result"]; @@ -594,13 +594,13 @@ digraph nullability_kt { 224 [label="Smart cast: R|/q|"]; 225 [label="Access variable R|/Q.data|"]; 226 [label="Smart cast: R|/q|.R|/Q.data|"]; - 227 [label="Access variable #"]; + 227 [label="Access variable R|/MyData.s#|"]; 228 [label="Access variable R|/q|"]; 229 [label="Smart cast: R|/q|"]; 230 [label="Access variable R|/Q.data|"]; 231 [label="Smart cast: R|/q|.R|/Q.data|"]; - 232 [label="Access variable #"]; - 233 [label="Function call: R|/q|.R|/Q.data|.#.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow]; + 232 [label="Access variable R|/MyData.s#|"]; + 233 [label="Function call: R|/q|.R|/Q.data|.R|/MyData.s#|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow]; 234 [label="Exit block"]; } 235 [label="Exit function test_6" style="filled" fillcolor=red]; @@ -678,12 +678,12 @@ digraph nullability_kt { 259 [label="Access variable R|/q|"]; 260 [label="Smart cast: R|/q|"]; 261 [label="Function call: R|/q|.R|/Q.fdata|()" style="filled" fillcolor=yellow]; - 262 [label="Function call: R|/q|.R|/Q.fdata|().#()" style="filled" fillcolor=yellow]; + 262 [label="Function call: R|/q|.R|/Q.fdata|().R|/MyData.fs#|()" style="filled" fillcolor=yellow]; 263 [label="Access variable R|/q|"]; 264 [label="Smart cast: R|/q|"]; 265 [label="Function call: R|/q|.R|/Q.fdata|()" style="filled" fillcolor=yellow]; - 266 [label="Function call: R|/q|.R|/Q.fdata|().#()" style="filled" fillcolor=yellow]; - 267 [label="Function call: R|/q|.R|/Q.fdata|().#().R|kotlin/Int.inc|()" style="filled" fillcolor=yellow]; + 266 [label="Function call: R|/q|.R|/Q.fdata|().R|/MyData.fs#|()" style="filled" fillcolor=yellow]; + 267 [label="Function call: R|/q|.R|/Q.fdata|().R|/MyData.fs#|().R|kotlin/Int.inc|()" style="filled" fillcolor=yellow]; 268 [label="Exit block"]; } 269 [label="Exit when branch result"]; @@ -814,7 +814,7 @@ digraph nullability_kt { 308 [label="Exit when"]; } 309 [label="Access variable R|/b|"]; - 310 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 310 [label="Function call: R|/b|.R|kotlin/Int.inc#|()" style="filled" fillcolor=yellow]; subgraph cluster_66 { color=blue 311 [label="Enter when"]; @@ -840,7 +840,7 @@ digraph nullability_kt { 325 [label="Exit when"]; } 326 [label="Access variable R|/b|"]; - 327 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 327 [label="Function call: R|/b|.R|kotlin/Int.inc#|()" style="filled" fillcolor=yellow]; subgraph cluster_69 { color=blue 328 [label="Enter when"]; @@ -866,7 +866,7 @@ digraph nullability_kt { 342 [label="Exit when"]; } 343 [label="Access variable R|/b|"]; - 344 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 344 [label="Function call: R|/b|.R|kotlin/Int.inc#|()" style="filled" fillcolor=yellow]; subgraph cluster_72 { color=blue 345 [label="Enter when"]; @@ -892,7 +892,7 @@ digraph nullability_kt { 359 [label="Exit when"]; } 360 [label="Access variable R|/b|"]; - 361 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 361 [label="Function call: R|/b|.R|kotlin/Int.inc#|()" style="filled" fillcolor=yellow]; 362 [label="Exit block"]; } 363 [label="Exit function test_9" style="filled" fillcolor=red]; @@ -992,14 +992,14 @@ digraph nullability_kt { color=blue 374 [label="Enter block"]; 375 [label="Access variable R|/b|"]; - 376 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 376 [label="Function call: R|/b|.R|kotlin/Int.inc#|()" style="filled" fillcolor=yellow]; 377 [label="Exit block"]; } 378 [label="Exit when branch result"]; 379 [label="Exit when"]; } 380 [label="Access variable R|/b|"]; - 381 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 381 [label="Function call: R|/b|.R|kotlin/Int.inc#|()" style="filled" fillcolor=yellow]; subgraph cluster_80 { color=blue 382 [label="Enter when"]; @@ -1017,14 +1017,14 @@ digraph nullability_kt { color=blue 390 [label="Enter block"]; 391 [label="Access variable R|/b|"]; - 392 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 392 [label="Function call: R|/b|.R|kotlin/Int.inc#|()" style="filled" fillcolor=yellow]; 393 [label="Exit block"]; } 394 [label="Exit when branch result"]; 395 [label="Exit when"]; } 396 [label="Access variable R|/b|"]; - 397 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 397 [label="Function call: R|/b|.R|kotlin/Int.inc#|()" style="filled" fillcolor=yellow]; subgraph cluster_83 { color=blue 398 [label="Enter when"]; @@ -1042,14 +1042,14 @@ digraph nullability_kt { color=blue 406 [label="Enter block"]; 407 [label="Access variable R|/b|"]; - 408 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 408 [label="Function call: R|/b|.R|kotlin/Int.inc#|()" style="filled" fillcolor=yellow]; 409 [label="Exit block"]; } 410 [label="Exit when branch result"]; 411 [label="Exit when"]; } 412 [label="Access variable R|/b|"]; - 413 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 413 [label="Function call: R|/b|.R|kotlin/Int.inc#|()" style="filled" fillcolor=yellow]; subgraph cluster_86 { color=blue 414 [label="Enter when"]; @@ -1067,14 +1067,14 @@ digraph nullability_kt { color=blue 422 [label="Enter block"]; 423 [label="Access variable R|/b|"]; - 424 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 424 [label="Function call: R|/b|.R|kotlin/Int.inc#|()" style="filled" fillcolor=yellow]; 425 [label="Exit block"]; } 426 [label="Exit when branch result"]; 427 [label="Exit when"]; } 428 [label="Access variable R|/b|"]; - 429 [label="Function call: R|/b|.#()" style="filled" fillcolor=yellow]; + 429 [label="Function call: R|/b|.R|kotlin/Int.inc#|()" style="filled" fillcolor=yellow]; 430 [label="Exit block"]; } 431 [label="Exit function test_10" style="filled" fillcolor=red]; @@ -1197,11 +1197,11 @@ digraph nullability_kt { 468 [label="Access variable R|/QImpl.data|"]; 469 [label="Access variable R|/q2|"]; 470 [label="Access variable R|/QImpl.data|"]; - 471 [label="Access variable #"]; + 471 [label="Access variable R|/MyData.s#|"]; 472 [label="Access variable R|/q2|"]; 473 [label="Access variable R|/QImpl.data|"]; - 474 [label="Access variable #"]; - 475 [label="Function call: R|/q2|.R|/QImpl.data|.#.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow]; + 474 [label="Access variable R|/MyData.s#|"]; + 475 [label="Function call: R|/q2|.R|/QImpl.data|.R|/MyData.s#|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow]; subgraph cluster_94 { color=blue 476 [label="Enter when"]; @@ -1352,13 +1352,13 @@ digraph nullability_kt { 528 [label="Smart cast: R|/q|"]; 529 [label="Access variable R|/QImplWithCustomGetter.data|"]; 530 [label="Smart cast: R|/q|.R|/QImplWithCustomGetter.data|"]; - 531 [label="Access variable #"]; + 531 [label="Access variable R|/MyData.s#|"]; 532 [label="Access variable R|/q|"]; 533 [label="Smart cast: R|/q|"]; 534 [label="Access variable R|/QImplWithCustomGetter.data|"]; 535 [label="Smart cast: R|/q|.R|/QImplWithCustomGetter.data|"]; - 536 [label="Access variable #"]; - 537 [label="Function call: R|/q|.R|/QImplWithCustomGetter.data|.#.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow]; + 536 [label="Access variable R|/MyData.s#|"]; + 537 [label="Function call: R|/q|.R|/QImplWithCustomGetter.data|.R|/MyData.s#|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow]; 538 [label="Exit block"]; } 539 [label="Exit when branch result"]; @@ -1447,13 +1447,13 @@ digraph nullability_kt { 568 [label="Smart cast: R|/q|"]; 569 [label="Access variable R|/QImplMutable.data|"]; 570 [label="Smart cast: R|/q|.R|/QImplMutable.data|"]; - 571 [label="Access variable #"]; + 571 [label="Access variable R|/MyData.s#|"]; 572 [label="Access variable R|/q|"]; 573 [label="Smart cast: R|/q|"]; 574 [label="Access variable R|/QImplMutable.data|"]; 575 [label="Smart cast: R|/q|.R|/QImplMutable.data|"]; - 576 [label="Access variable #"]; - 577 [label="Function call: R|/q|.R|/QImplMutable.data|.#.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow]; + 576 [label="Access variable R|/MyData.s#|"]; + 577 [label="Function call: R|/q|.R|/QImplMutable.data|.R|/MyData.s#|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow]; 578 [label="Exit block"]; } 579 [label="Exit when branch result"]; @@ -1529,7 +1529,7 @@ digraph nullability_kt { 595 [label="Access variable R|/q|"]; 596 [label="Access variable R|/Q.data|"]; 597 [label="Smart cast: R|/q|.R|/Q.data|"]; - 598 [label="Access variable #"]; + 598 [label="Access variable R|/MyData.s#|"]; 599 [label="Exit block"]; } 600 [label="Exit when branch result"]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.fir.txt index fc232022d05..327c1e11af3 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.fir.txt @@ -67,23 +67,23 @@ FILE: nullability.kt R|/x|.R|/A.foo|() } else -> { - R|/x|.#() + R|/x|.R|/A.foo#|() } } - R|/x|.#() + R|/x|.R|/A.foo#|() } public final fun test_2(x: R|A?|): R|kotlin/Unit| { when () { ==(R|/x|, Null(null)) -> { - R|/x|.#() + R|/x|.R|/A.foo#|() } else -> { R|/x|.R|/A.foo|() } } - R|/x|.#() + R|/x|.R|/A.foo#|() } public final fun test_3(x: R|A?|): R|kotlin/Unit| { R|/x| ?: ^test_3 Unit @@ -102,8 +102,8 @@ FILE: nullability.kt when () { !=(R|/q|?.{ $subj$.R|/Q.data| }?.{ $subj$.R|/MyData.s| }?.{ $subj$.R|kotlin/Int.inc|() }, Null(null)) -> { R|/q|.R|/Q.data| - R|/q|.R|/Q.data|.# - R|/q|.R|/Q.data|.#.R|kotlin/Int.inc|() + R|/q|.R|/Q.data|.R|/MyData.s#| + R|/q|.R|/Q.data|.R|/MyData.s#|.R|kotlin/Int.inc|() } } @@ -111,15 +111,15 @@ FILE: nullability.kt public final fun test_6(q: R|Q?|): R|kotlin/Unit| { R|/q|?.{ $subj$.R|/Q.data| }?.{ $subj$.R|/MyData.s| }?.{ $subj$.R|kotlin/Int.inc|() } ?: ^test_6 Unit R|/q|.R|/Q.data| - R|/q|.R|/Q.data|.# - R|/q|.R|/Q.data|.#.R|kotlin/Int.inc|() + R|/q|.R|/Q.data|.R|/MyData.s#| + R|/q|.R|/Q.data|.R|/MyData.s#|.R|kotlin/Int.inc|() } public final fun test_7(q: R|Q?|): R|kotlin/Unit| { when () { !=(R|/q|?.{ $subj$.R|/Q.fdata|() }?.{ $subj$.R|/MyData.fs|() }?.{ $subj$.R|kotlin/Int.inc|() }, Null(null)) -> { R|/q|.R|/Q.fdata|() - R|/q|.R|/Q.fdata|().#() - R|/q|.R|/Q.fdata|().#().R|kotlin/Int.inc|() + R|/q|.R|/Q.fdata|().R|/MyData.fs#|() + R|/q|.R|/Q.fdata|().R|/MyData.fs#|().R|kotlin/Int.inc|() } } @@ -139,58 +139,58 @@ FILE: nullability.kt } } - R|/b|.#() + R|/b|.R|kotlin/Int.inc#|() when () { ===(R|/a|, R|/b|) -> { R|/b|.R|kotlin/Int.inc|() } } - R|/b|.#() + R|/b|.R|kotlin/Int.inc#|() when () { ==(R|/b|, R|/a|) -> { R|/b|.R|kotlin/Int.inc|() } } - R|/b|.#() + R|/b|.R|kotlin/Int.inc#|() when () { ===(R|/b|, R|/a|) -> { R|/b|.R|kotlin/Int.inc|() } } - R|/b|.#() + R|/b|.R|kotlin/Int.inc#|() } public final fun test_10(a: R|kotlin/Int?|, b: R|kotlin/Int?|): R|kotlin/Unit| { when () { ==(R|/a|, R|/b|) -> { - R|/b|.#() + R|/b|.R|kotlin/Int.inc#|() } } - R|/b|.#() + R|/b|.R|kotlin/Int.inc#|() when () { ===(R|/a|, R|/b|) -> { - R|/b|.#() + R|/b|.R|kotlin/Int.inc#|() } } - R|/b|.#() + R|/b|.R|kotlin/Int.inc#|() when () { ==(R|/b|, R|/a|) -> { - R|/b|.#() + R|/b|.R|kotlin/Int.inc#|() } } - R|/b|.#() + R|/b|.R|kotlin/Int.inc#|() when () { ===(R|/b|, R|/a|) -> { - R|/b|.#() + R|/b|.R|kotlin/Int.inc#|() } } - R|/b|.#() + R|/b|.R|kotlin/Int.inc#|() } public final fun test_11(q: R|QImpl?|, q2: R|QImpl|): R|kotlin/Unit| { when () { @@ -199,8 +199,8 @@ FILE: nullability.kt R|/q|.R|/QImpl.data|.R|/MyData.s| R|/q|.R|/QImpl.data|.R|/MyData.s|.R|kotlin/Int.inc|() R|/q2|.R|/QImpl.data| - R|/q2|.R|/QImpl.data|.# - R|/q2|.R|/QImpl.data|.#.R|kotlin/Int.inc|() + R|/q2|.R|/QImpl.data|.R|/MyData.s#| + R|/q2|.R|/QImpl.data|.R|/MyData.s#|.R|kotlin/Int.inc|() when () { !=(R|/q2|.R|/QImpl.data|, Null(null)) -> { R|/q2|.R|/QImpl.data|.R|/MyData.s| @@ -216,8 +216,8 @@ FILE: nullability.kt when () { !=(R|/q|?.{ $subj$.R|/QImplWithCustomGetter.data| }?.{ $subj$.R|/MyData.s| }?.{ $subj$.R|kotlin/Int.inc|() }, Null(null)) -> { R|/q|.R|/QImplWithCustomGetter.data| - R|/q|.R|/QImplWithCustomGetter.data|.# - R|/q|.R|/QImplWithCustomGetter.data|.#.R|kotlin/Int.inc|() + R|/q|.R|/QImplWithCustomGetter.data|.R|/MyData.s#| + R|/q|.R|/QImplWithCustomGetter.data|.R|/MyData.s#|.R|kotlin/Int.inc|() } } @@ -226,8 +226,8 @@ FILE: nullability.kt when () { !=(R|/q|?.{ $subj$.R|/QImplMutable.data| }?.{ $subj$.R|/MyData.s| }?.{ $subj$.R|kotlin/Int.inc|() }, Null(null)) -> { R|/q|.R|/QImplMutable.data| - R|/q|.R|/QImplMutable.data|.# - R|/q|.R|/QImplMutable.data|.#.R|kotlin/Int.inc|() + R|/q|.R|/QImplMutable.data|.R|/MyData.s#| + R|/q|.R|/QImplMutable.data|.R|/MyData.s#|.R|kotlin/Int.inc|() } } @@ -235,7 +235,7 @@ FILE: nullability.kt public final fun test_14(q: R|Q|): R|kotlin/Unit| { when () { ==(R|/q|.R|/Q.data|, Null(null)) -> { - R|/q|.R|/Q.data|.# + R|/q|.R|/Q.data|.R|/MyData.s#| } } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/orInWhenBranch.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/orInWhenBranch.fir.txt index c3c05662e60..1c18f35761c 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/orInWhenBranch.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/orInWhenBranch.fir.txt @@ -4,7 +4,7 @@ FILE: orInWhenBranch.kt public final fun test_1(a: R|kotlin/Any?|): R|kotlin/Unit| { when (R|/a|) { ($subj$ is R|kotlin/String|) || ($subj$ is R|kotlin/Any|) -> { - R|/a|.#() + R|/a|.R|/foo#|() } } @@ -12,7 +12,7 @@ FILE: orInWhenBranch.kt public final fun test_2(a: R|kotlin/Any?|): R|kotlin/Unit| { when () { (R|/a| is R|kotlin/String|) || (R|/a| is R|kotlin/Any|) -> { - R|/a|.#() + R|/a|.R|/foo#|() } } @@ -20,7 +20,7 @@ FILE: orInWhenBranch.kt public final fun test_3(a: R|kotlin/Any?|, b: R|kotlin/Boolean|): R|kotlin/Unit| { when (R|/a|) { ($subj$ is R|kotlin/String|) || ==($subj$, R|/b|) -> { - R|/a|.#() + R|/a|.R|/foo#|() } } @@ -28,7 +28,7 @@ FILE: orInWhenBranch.kt public final fun test_4(a: R|kotlin/Any?|, b: R|kotlin/Boolean|): R|kotlin/Unit| { when () { (R|/a| is R|kotlin/String|) || R|/b| -> { - R|/a|.#() + R|/a|.R|/foo#|() } } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.dot index 119f4493640..f9957a3e608 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.dot @@ -54,7 +54,7 @@ digraph safeCallAndEqualityToBool_kt { color=blue 21 [label="Enter block"]; 22 [label="Access variable R|/s|"]; - 23 [label="Access variable #"]; + 23 [label="Access variable R|kotlin/String.length#|"]; 24 [label="Exit block"]; } 25 [label="Exit when branch result"]; @@ -133,7 +133,7 @@ digraph safeCallAndEqualityToBool_kt { color=blue 50 [label="Enter block"]; 51 [label="Access variable R|/s|"]; - 52 [label="Access variable #"]; + 52 [label="Access variable R|kotlin/String.length#|"]; 53 [label="Exit block"]; } 54 [label="Exit when branch result"]; @@ -222,7 +222,7 @@ digraph safeCallAndEqualityToBool_kt { color=blue 86 [label="Enter block"]; 87 [label="Access variable R|/s|"]; - 88 [label="Access variable #"]; + 88 [label="Access variable R|kotlin/String.length#|"]; 89 [label="Exit block"]; } 90 [label="Exit when branch result"]; @@ -301,7 +301,7 @@ digraph safeCallAndEqualityToBool_kt { color=blue 115 [label="Enter block"]; 116 [label="Access variable R|/s|"]; - 117 [label="Access variable #"]; + 117 [label="Access variable R|kotlin/String.length#|"]; 118 [label="Exit block"]; } 119 [label="Exit when branch result"]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.fir.txt index b71dc4ee0aa..90a6703a14c 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.fir.txt @@ -8,7 +8,7 @@ FILE: safeCallAndEqualityToBool.kt R|/s|.R|kotlin/String.length| } else -> { - R|/s|.# + R|/s|.R|kotlin/String.length#| } } @@ -19,7 +19,7 @@ FILE: safeCallAndEqualityToBool.kt R|/s|.R|kotlin/String.length| } else -> { - R|/s|.# + R|/s|.R|kotlin/String.length#| } } @@ -27,7 +27,7 @@ FILE: safeCallAndEqualityToBool.kt public final fun test_3(s: R|kotlin/String?|): R|kotlin/Unit| { when () { !=(R|/s|?.{ $subj$.R|/check|() }, Boolean(true)) -> { - R|/s|.# + R|/s|.R|kotlin/String.length#| } else -> { R|/s|.R|kotlin/String.length| @@ -38,7 +38,7 @@ FILE: safeCallAndEqualityToBool.kt public final fun test_4(s: R|kotlin/String?|): R|kotlin/Unit| { when () { !=(R|/s|?.{ $subj$.R|/check|() }, Boolean(false)) -> { - R|/s|.# + R|/s|.R|kotlin/String.length#| } else -> { R|/s|.R|kotlin/String.length| diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.dot index 6296d3dbd9b..7fd1b4dfa1e 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.dot @@ -54,7 +54,7 @@ digraph safeCalls_kt { 20 [label="Function call: $subj$.R|/foo|(...)" style="filled" fillcolor=yellow]; 21 [label="Exit safe call"]; 22 [label="Access variable R|/x|"]; - 23 [label="Access variable #"]; + 23 [label="Access variable R|kotlin/String.length#|"]; 24 [label="Exit block"]; } 25 [label="Exit function test" style="filled" fillcolor=red]; @@ -218,7 +218,7 @@ digraph safeCalls_kt { 83 [label="Exit safe call"]; 84 [label="Exit safe call"]; 85 [label="Access variable R|/x|"]; - 86 [label="Function call: R|/x|.#()" style="filled" fillcolor=yellow]; + 86 [label="Function call: R|/x|.R|/A.id#|()" style="filled" fillcolor=yellow]; 87 [label="Exit block"]; } 88 [label="Exit function test_4" style="filled" fillcolor=red]; @@ -282,7 +282,7 @@ digraph safeCalls_kt { 106 [label="Exit safe call"]; 107 [label="Exit safe call"]; 108 [label="Access variable R|/x|"]; - 109 [label="Function call: R|/x|.#()" style="filled" fillcolor=yellow]; + 109 [label="Function call: R|/x|.R|/A.id#|()" style="filled" fillcolor=yellow]; 110 [label="Exit block"]; } 111 [label="Exit function test_5" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.fir.txt index 6c8bfc399ee..3958bfbc87b 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.fir.txt @@ -6,7 +6,7 @@ FILE: safeCalls.kt } public final fun test(x: R|kotlin/String?|): R|kotlin/Unit| { R|/x|?.{ $subj$.R|/foo|(==(R|/x|.R|kotlin/String.length|, Int(1))) } - R|/x|.# + R|/x|.R|kotlin/String.length#| } public abstract interface A : R|kotlin/Any| { public abstract fun bar(a: R|A|): R|kotlin/String| @@ -28,7 +28,7 @@ FILE: safeCalls.kt } public final fun test_4(x: R|A?|): R|kotlin/Unit| { R|/x|?.{ $subj$.R|/A.id|() }?.{ $subj$.R|/A.bool|() } - R|/x|.#() + R|/x|.R|/A.id#|() } public final fun R|kotlin/Any?|.boo(b: R|kotlin/Boolean|): R|kotlin/Unit| { } @@ -37,5 +37,5 @@ FILE: safeCalls.kt ^test_5 Unit } ) }?.{ $subj$.R|/boo|(R|/x|.R|/A.bool|()) } - R|/x|.#() + R|/x|.R|/A.id#|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/unstableSmartCastOnSafeCallArgument.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/unstableSmartCastOnSafeCallArgument.fir.txt index 3f9b7f15305..3699cc4a00f 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/unstableSmartCastOnSafeCallArgument.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/unstableSmartCastOnSafeCallArgument.fir.txt @@ -31,7 +31,7 @@ FILE: unstableSmartCastOnSafeCallArgument.kt when () { !=(R|/foo|.R|/Foo.bar|?.{ $subj$.R|/Bar.buz| }, Null(null)) -> { R|/takesNullable|(R|/foo|.R|/Foo.bar|?.{ $subj$.R|/Bar.buz| }) - #(R|/foo|.R|/Foo.bar|?.{ $subj$.R|/Bar.buz| }) + R|/takesNonNull#|(R|/foo|.R|/Foo.bar|?.{ $subj$.R|/Bar.buz| }) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastsFromEquals_differentModule.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastsFromEquals_differentModule.fir.txt index 5af431b2903..de0366b1bd6 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastsFromEquals_differentModule.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastsFromEquals_differentModule.fir.txt @@ -47,7 +47,7 @@ FILE: module_main_smartcastsFromEquals_differentModule.kt public final fun testBase(x: R|Base<*>|, y: R|Base|): R|kotlin/Unit| { when () { ==(R|/x|, R|/y|) -> { - #(R|/x|) + R|/takeIntBase#|(R|/x|) } } @@ -75,7 +75,7 @@ FILE: module_main_smartcastsFromEquals_differentModule.kt public final fun testFinalWithOverride(x: R|FinalWithOverride<*>|, y: R|FinalWithOverride|): R|kotlin/Unit| { when () { ==(R|/x|, R|/y|) -> { - #(R|/x|) + R|/takeIntFinalWithOverride#|(R|/x|) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastsFromEquals_sameModule.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastsFromEquals_sameModule.fir.txt index d0eb9264238..f2405cf7946 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastsFromEquals_sameModule.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastsFromEquals_sameModule.fir.txt @@ -44,7 +44,7 @@ FILE: smartcastsFromEquals_sameModule.kt public final fun testBase(x: R|Base<*>|, y: R|Base|): R|kotlin/Unit| { when () { ==(R|/x|, R|/y|) -> { - #(R|/x|) + R|/takeIntBase#|(R|/x|) } } @@ -72,7 +72,7 @@ FILE: smartcastsFromEquals_sameModule.kt public final fun testFinalWithOverride(x: R|FinalWithOverride<*>|, y: R|FinalWithOverride|): R|kotlin/Unit| { when () { ==(R|/x|, R|/y|) -> { - #(R|/x|) + R|/takeIntFinalWithOverride#|(R|/x|) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.dot index a3027a33494..67df2f64ad1 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.dot @@ -78,7 +78,7 @@ digraph delayedAssignment_kt { 33 [label="Exit when"]; } 34 [label="Access variable R|/a|"]; - 35 [label="Function call: R|/a|.#()" style="filled" fillcolor=yellow]; + 35 [label="Function call: R|/a|.R|/A.foo#|()" style="filled" fillcolor=yellow]; 36 [label="Exit block"]; } 37 [label="Exit function test" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.fir.txt index 82ba2be0813..f9a1aaae288 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.fir.txt @@ -20,5 +20,5 @@ FILE: delayedAssignment.kt } } - R|/a|.#() + R|/a|.R|/A.foo#|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.dot index 37e43e8a60c..b8cb2bfc159 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.dot @@ -109,7 +109,7 @@ digraph smartcastAfterReassignment_kt { 44 [label="Assignment: R|/x|"]; 45 [label="Access variable R|/x|"]; 46 [label="Smart cast: R|/x|"]; - 47 [label="Access variable #"]; + 47 [label="Access variable R|kotlin/String.length#|"]; 48 [label="Exit block"]; } 49 [label="Exit function test_3" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.fir.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.fir.txt index 386fda33475..9aee51588d6 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.fir.txt @@ -19,5 +19,5 @@ FILE: smartcastAfterReassignment.kt R|/x| = String() R|/x|.R|kotlin/String.length| R|/x| = Null(null) - R|/x|.# + R|/x|.R|kotlin/String.length#| } diff --git a/compiler/fir/analysis-tests/testData/resolve/suppress/singleError.fir.txt b/compiler/fir/analysis-tests/testData/resolve/suppress/singleError.fir.txt index d27e5c3a9b0..7898643fe8d 100644 --- a/compiler/fir/analysis-tests/testData/resolve/suppress/singleError.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/suppress/singleError.fir.txt @@ -2,5 +2,5 @@ FILE: singleError.kt public final fun foo(x: R|kotlin/String|): R|kotlin/Unit| { } @R|kotlin/Suppress|(names = vararg(String(ARGUMENT_TYPE_MISMATCH))) public final fun bar(): R|kotlin/Unit| { - #(Int(10)) + R|/foo#|(Int(10)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/tryInference.fir.txt b/compiler/fir/analysis-tests/testData/resolve/tryInference.fir.txt index 11c04707bd0..f3410aff82e 100644 --- a/compiler/fir/analysis-tests/testData/resolve/tryInference.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/tryInference.fir.txt @@ -14,7 +14,7 @@ FILE: tryInference.kt R|/materialize|() } finally { - #() + R|/materialize#|() } ) } diff --git a/compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.fir.txt b/compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.fir.txt index 06a411730ea..a8fbfe5eed5 100644 --- a/compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.fir.txt @@ -85,5 +85,5 @@ FILE: typeAliasWithTypeArguments.kt R|/inv3|.R|SubstitutionOverride|().R|/A.foo|() R|/inv1|.R|SubstitutionOverride|(R|/a|) R|/inv2|.R|SubstitutionOverride|(R|/a|) - R|/inv3|.#(R|/a|) + R|/inv3|.R|SubstitutionOverride#|(R|/a|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.fir.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.fir.txt index 6480fe4b937..36d77421443 100644 --- a/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.fir.txt @@ -21,8 +21,8 @@ FILE: singletonConstructors.kt super() } - private final val x: R|B| = #() - private get(): R|B| + private final val x: = #() + private get(): } public final class D : R|kotlin/Any| { diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/visibilityWithOverrides.fir.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/visibilityWithOverrides.fir.txt index 5caec189cb7..21dc55c0bca 100644 --- a/compiler/fir/analysis-tests/testData/resolve/visibility/visibilityWithOverrides.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/visibility/visibilityWithOverrides.fir.txt @@ -24,5 +24,5 @@ FILE: A.kt } FILE: main.kt public final fun test(b: R|B|): R|kotlin/String| { - ^test R|/b|.#(String(hello)) + ^test R|/b|.R|/B.foo#|(String(hello)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/whenExpressionType.fir.txt b/compiler/fir/analysis-tests/testData/resolve/whenExpressionType.fir.txt index 5bc58432d8f..48b391966a8 100644 --- a/compiler/fir/analysis-tests/testData/resolve/whenExpressionType.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/whenExpressionType.fir.txt @@ -158,5 +158,5 @@ FILE: whenExpressionType.kt } } - lval x1: R|C| = #(R|/l1|) + lval x1: R|C| = R|/C.C#|(R|/l1|) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.fir.txt index c6987215e22..105b47f2b12 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.fir.txt @@ -53,10 +53,10 @@ FILE: main.kt R|/foo1|(Q|KotlinClass|::R|/KotlinClass.Companion.baz|) R|/foo2|(Q|KotlinClass|::R|/KotlinClass.baz|) #(Q|KotlinClass|::R|/KotlinClass.baz|) - #(Q|KotlinClass|::#) + R|/foo1#|(Q|KotlinClass|::#) R|/foo2|(Q|KotlinClass|::R|/JavaClass.bar|) R|/foo3|(Q|KotlinClass|::R|/JavaClass.bar|) R|/foo1|(Q|KotlinClass2|::R|/KotlinClass2.Companion.bar|) - #(Q|KotlinClass2|::#) + R|/foo2#|(Q|KotlinClass2|::#) R|/foo3|(Q|KotlinClass2|::R|/KotlinClass2.Companion.bar|) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.fir.txt index 5f1498563fa..25d0797b926 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.fir.txt @@ -6,5 +6,5 @@ FILE: ambiguityWhenNoApplicableCallableReferenceCandidate.kt public final fun bar(f: R|(T) -> kotlin/Unit|): R|kotlin/Unit| { } public final fun test(): R|kotlin/Unit| { - #(::#) + R|/bar#|(::#) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.fir.txt index 4b81d5c31ef..b1483976e0f 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.fir.txt @@ -30,7 +30,7 @@ FILE: chooseCallableReferenceDependingOnInferredReceiver.kt ^bar R|kotlin/TODO|() } public final fun test(): R|kotlin/Unit| { - #(R|/A.A|(), = myWith@fun R|A|.(): { + R|/myWith#|(R|/A.A|(), = myWith@fun R|A|.(): { lval t1: R|A| = R|/bar|(::R|/A.foo|) lval t2: R|A| = R|/bar|(::R|/A.baz|) ^ R|/myWith|(R|/B.B|(), = myWith@fun R|B|.(): { diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.fir.txt index 49a6eeb8630..d45d30f6118 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.fir.txt @@ -21,5 +21,5 @@ FILE: eagerAndPostponedCallableReferences.kt lval a4: R|B| = R|/foo|(::R|/multiple|, ::R|/singleB|) lval a5: R|A| = R|/foo|(::R|/singleA|, ::R|/singleA|) lval a6: R|it(A & B)| = R|/foo|(::R|/singleA|, ::R|/singleB|) - #(::#, ::#) + R|/foo#|(::#, ::#) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.fir.txt index e925f515712..80b1d363491 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.fir.txt @@ -10,6 +10,6 @@ FILE: resolveCallableReferencesAfterAllSimpleArguments.kt public final fun baz(e: R|T|, f: R|(T) -> kotlin/Unit|): R|kotlin/Unit| { } public final fun test(a: R|A|, b: R|B|): R|kotlin/Unit| { - #(R|/a|, ::#) - #(::#, R|/a|) + R|/baz#|(R|/a|, ::#) + R|/bar#|(::#, R|/a|) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.fir.txt index bf34bc65cf5..f3b9c39402b 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.fir.txt @@ -9,7 +9,7 @@ FILE: implicitTypes.kt ^bar Int(1) } public final fun loop1(): R|(ERROR CLASS: Cannot infer argument for type parameter T) -> ERROR CLASS: Cannot infer argument for type parameter R| { - ^loop1 #(::#) + ^loop1 R|/use#|(::#) } public final fun loop2(): { ^loop2 R|/loop1|() diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.fir.txt index 6712ba24044..78a199700eb 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.fir.txt @@ -10,7 +10,7 @@ FILE: notIsNullOrEmpty.kt public final fun test_2(s: R|kotlin/String?|): R|kotlin/Unit| { when () { R|/s|.R|kotlin/text/isNullOrEmpty|() -> { - R|/s|.# + R|/s|.R|kotlin/String.length#| } else -> { R|/s|.R|kotlin/String.length| diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/eqNotEq.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/eqNotEq.fir.txt index d0e5aab78cb..10057c52f4c 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/eqNotEq.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/eqNotEq.fir.txt @@ -29,7 +29,7 @@ FILE: eqNotEq.kt R|/x|.R|kotlin/String.length| } else -> { - R|/x|.# + R|/x|.R|kotlin/String.length#| } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/receivers.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/receivers.fir.txt index 354f0d58deb..81e985f3d35 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/receivers.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/receivers.fir.txt @@ -33,7 +33,7 @@ FILE: receivers.kt this@R|special/anonymous|.R|/myRequireNotNull|() } ) - R|/x|.#() + R|/x|.R|/foo#|() } public final fun test_4(x: R|A?|): R|kotlin/Unit| { R|kotlin/with|(R|/x|, = with@fun R|A?|.(): R|kotlin/Unit| { diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/diagnostics/functionReturnTypeMismatchChecker/basic.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/diagnostics/functionReturnTypeMismatchChecker/basic.fir.txt index 59b640f535c..1e9a515cd7b 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/diagnostics/functionReturnTypeMismatchChecker/basic.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/diagnostics/functionReturnTypeMismatchChecker/basic.fir.txt @@ -20,7 +20,7 @@ FILE: basic.kt ^okOneLineFunction Int(10).R|kotlin/Int.plus|(Int(1)) } public final fun errorOneLineFunction(): R|kotlin/String| { - ^errorOneLineFunction Int(10).#(Int(1)) + ^errorOneLineFunction Int(10).R|kotlin/Int.plus#|(Int(1)) } public final class A : R|kotlin/Any| { public constructor(): R|A| { diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/FieldVsSyntheticAccessor.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/FieldVsSyntheticAccessor.fir.txt index e0b6da48b91..06ac5e869e8 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/FieldVsSyntheticAccessor.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/FieldVsSyntheticAccessor.fir.txt @@ -7,7 +7,7 @@ FILE: User.kt } public final fun foo(tree: R|BaseClass|): R|kotlin/Unit| { - lval ui: R|kotlin/String!| = R|/tree|.# + lval ui: R|kotlin/String!| = R|/tree|.R|/BaseClass.ui#| } public final fun bar(): R|kotlin/Unit| { diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.fir.txt index 66e5aea8e21..8d33527229d 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.fir.txt @@ -6,18 +6,18 @@ FILE: k.kt super() } - public final val p1: R|kotlin/Int| = Q|j/JavaPackageLocal|.# + public final val p1: R|kotlin/Int| = Q|j/JavaPackageLocal|.R|j/JavaPackageLocal.javaPPackage#| public get(): R|kotlin/Int| - public final val p2: R|kotlin/Int| = Q|j/JavaProtected|.# + public final val p2: R|kotlin/Int| = Q|j/JavaProtected|.R|j/JavaProtected.javaPProtectedStatic#| public get(): R|kotlin/Int| - public final val p3: R|kotlin/Int| = R|j/JavaProtected.JavaProtected|().# + public final val p3: R|kotlin/Int| = R|j/JavaProtected.JavaProtected|().R|j/JavaProtected.javaPProtectedPackage#| public get(): R|kotlin/Int| public final fun test(): R|kotlin/Unit| { - Q|j/JavaProtected|.#() - Q|j/JavaPackageLocal|.#() + Q|j/JavaProtected|.R|j/JavaProtected.javaMProtectedStatic#|() + Q|j/JavaPackageLocal|.R|j/JavaPackageLocal.javaMPackage#|() } } @@ -26,7 +26,7 @@ FILE: k.kt super() } - public final val p1: R|kotlin/Int| = Q|j/JavaPackageLocal|.# + public final val p1: R|kotlin/Int| = Q|j/JavaPackageLocal|.R|j/JavaPackageLocal.javaPPackage#| public get(): R|kotlin/Int| public final val p2: R|kotlin/Int| = Q|j/JavaProtected|.R|j/JavaProtected.javaPProtectedStatic| @@ -37,7 +37,7 @@ FILE: k.kt public final fun test(): R|kotlin/Unit| { Q|j/JavaProtected|.R|j/JavaProtected.javaMProtectedStatic|() - Q|j/JavaPackageLocal|.#() + Q|j/JavaPackageLocal|.R|j/JavaPackageLocal.javaMPackage#|() } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.fir.txt index e336e41e4bc..367eb1b39c4 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.fir.txt @@ -7,9 +7,9 @@ FILE: K1.kt } public final fun main(k: R|KSub|, vString: R|SuperClass.NestedInSuperClass|, vInt: R|SuperClass.NestedInSuperClass|): R|kotlin/Unit| { R|/k|.R|/J1.getImpl|().R|SubstitutionOverride|(R|/vString|) - R|/k|.R|/J1.getImpl|().#(R|/vInt|) + R|/k|.R|/J1.getImpl|().R|SubstitutionOverride#|(R|/vInt|) R|/k|.R|/J1.getNestedSubClass|().R|SubstitutionOverride|(String()) - R|/k|.R|/J1.getNestedSubClass|().#(Int(1)) + R|/k|.R|/J1.getNestedSubClass|().R|SubstitutionOverride#|(Int(1)) } FILE: K2.kt public open class KFirst : R|SuperClass|, R|SuperI| { diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameter.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameter.fir.txt index 9befa50c611..ae854894501 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameter.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameter.fir.txt @@ -8,5 +8,5 @@ FILE: K1.kt FILE: K2.kt public final fun main(): R|kotlin/Unit| { Q|JavaClass|.R|/JavaClass.baz|(R|/KotlinClass.KotlinClass|()) - Q|JavaClass|.#(String()) + Q|JavaClass|.R|/JavaClass.baz#|(String()) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt index 6c2d29035ed..2e9c5d65eab 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt @@ -9,6 +9,6 @@ FILE: K2.kt public final fun main(): R|kotlin/Unit| { Q|JavaClass|.R|/JavaClass.baz|(R|/KotlinClass.KotlinClass|()) Q|JavaClass|.R|/JavaClass.baz|(R|/KotlinClass.KotlinClass|()) - Q|JavaClass|.#(R|/KotlinClass.KotlinClass|()) - Q|JavaClass|.#(String()) + Q|JavaClass|.R|/JavaClass.baz#|(R|/KotlinClass.KotlinClass|()) + Q|JavaClass|.R|/JavaClass.baz#|(String()) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/argumentTypeMismatch.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/argumentTypeMismatch.fir.txt index 70ca74d2ee4..00709e7ce5c 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/argumentTypeMismatch.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/argumentTypeMismatch.fir.txt @@ -1,4 +1,4 @@ FILE: test.kt public final fun main(): R|kotlin/Unit| { - Q|Sample|.#(String(123)) + Q|Sample|.R|/Sample.foo#|(String(123)) } diff --git a/compiler/testData/codegen/boxError/semantic/catchErrorType.kt b/compiler/testData/codegen/boxError/semantic/catchErrorType.kt index 2e593b182d3..897c2a7ed02 100644 --- a/compiler/testData/codegen/boxError/semantic/catchErrorType.kt +++ b/compiler/testData/codegen/boxError/semantic/catchErrorType.kt @@ -1,6 +1,5 @@ // IGNORE_ERRORS // ERROR_POLICY: SEMANTIC -// IGNORE_BACKEND_K2: JS_IR // MODULE: lib // FILE: t.kt @@ -25,4 +24,4 @@ fun box(): String { return "OK" } return "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxError/semantic/evaluationOrder.kt b/compiler/testData/codegen/boxError/semantic/evaluationOrder.kt index b82d93d324f..196cabbd844 100644 --- a/compiler/testData/codegen/boxError/semantic/evaluationOrder.kt +++ b/compiler/testData/codegen/boxError/semantic/evaluationOrder.kt @@ -1,6 +1,5 @@ // IGNORE_ERRORS // ERROR_POLICY: SEMANTIC -// IGNORE_BACKEND_K2: JS_IR // MODULE: lib // FILE: t.kt @@ -32,4 +31,4 @@ fun box(): String { return if (storage == "abc") "OK" else "FAIL ABC" return "FAIL" } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxError/semantic/unresolvedFunctionReferece.kt b/compiler/testData/codegen/boxError/semantic/unresolvedFunctionReferece.kt index 2aaa279eabc..e9835037a46 100644 --- a/compiler/testData/codegen/boxError/semantic/unresolvedFunctionReferece.kt +++ b/compiler/testData/codegen/boxError/semantic/unresolvedFunctionReferece.kt @@ -1,6 +1,5 @@ // IGNORE_ERRORS // ERROR_POLICY: SEMANTIC -// IGNORE_BACKEND_K2: JS_IR // MODULE: lib // FILE: t.kt @@ -18,4 +17,4 @@ fun box(): String { return "OK" } return "FAIL" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxError/syntax/evaluationOrder.kt b/compiler/testData/codegen/boxError/syntax/evaluationOrder.kt index 43f4f849212..9f0762f8dcf 100644 --- a/compiler/testData/codegen/boxError/syntax/evaluationOrder.kt +++ b/compiler/testData/codegen/boxError/syntax/evaluationOrder.kt @@ -1,6 +1,5 @@ // IGNORE_ERRORS // ERROR_POLICY: SYNTAX -// IGNORE_BACKEND_K2: JS_IR // MODULE: lib // FILE: t.kt @@ -34,4 +33,4 @@ fun box(): String { } catch (e: IllegalStateException) { return if (storage == "abc") "OK" else "FAIL ABC" return "FAIL" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxWasmJsInterop/externals.kt b/compiler/testData/codegen/boxWasmJsInterop/externals.kt index 0bbdc182168..36d6f30355f 100644 --- a/compiler/testData/codegen/boxWasmJsInterop/externals.kt +++ b/compiler/testData/codegen/boxWasmJsInterop/externals.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_K2: JS_IR // FILE: externals.js function createObject() { return { @@ -167,4 +166,4 @@ fun box(): String { return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt b/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt index ac1de909e49..a74c5b32336 100644 --- a/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt +++ b/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt @@ -23,7 +23,7 @@ fun test(l : java.util.List) { val f : java.io.File? = null Collections.emptyList - Collections.emptyList<Int> + Collections.emptyList<Int> Collections.emptyList() Collections.emptyList() diff --git a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.fir.kt b/compiler/testData/diagnostics/tests/annotations/ConstructorCall.fir.kt index 68436ec1f0f..9f87b899c84 100644 --- a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.fir.kt +++ b/compiler/testData/diagnostics/tests/annotations/ConstructorCall.fir.kt @@ -17,7 +17,7 @@ fun foo() { Ann() val a = Ann() - Ann1() + Ann1() Ann1(1) bar(Ann()) bar(a = Ann()) diff --git a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.fir.kt b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.fir.kt index 01cf13072a6..47b040f446f 100644 --- a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.fir.kt +++ b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.fir.kt @@ -15,7 +15,7 @@ val a10 = 1 / 0.0f val a11 = 1 / 0.0 val a12 = 1L / 0 -val b1: Byte = 1 / 0 +val b1: Byte = 1 / 0 @Ann(1 / 0) val b2 = 1 annotation class Ann(val i : Int) diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/compatibilityResolveWhenVariableHasComplexIntersectionType.fir.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/compatibilityResolveWhenVariableHasComplexIntersectionType.fir.kt index bcca7b21765..5f685277f58 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/compatibilityResolveWhenVariableHasComplexIntersectionType.fir.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/compatibilityResolveWhenVariableHasComplexIntersectionType.fir.kt @@ -20,7 +20,7 @@ object OnlyOne { fun , S : T> greater(x: Bar, t: T) {} fun test(b: Bar) { - greater(b, b) + greater(b, b) } } @@ -34,4 +34,4 @@ object GoodOldCandidate { greater(b, b) } } -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/integerLiterals/constantUnaryOperators.fir.txt b/compiler/testData/diagnostics/tests/integerLiterals/constantUnaryOperators.fir.txt index e2e0953ced0..f775f20f7ca 100644 --- a/compiler/testData/diagnostics/tests/integerLiterals/constantUnaryOperators.fir.txt +++ b/compiler/testData/diagnostics/tests/integerLiterals/constantUnaryOperators.fir.txt @@ -19,13 +19,13 @@ FILE: constantUnaryOperators.kt public get(): R|kotlin/Long| public final val i4: R|kotlin/Int| = Int(2).R|kotlin/Int.plus|(Int(2).R|kotlin/Int.times|(Int(3))).R|kotlin/Int.inc|() public get(): R|kotlin/Int| - public final val l4: R|kotlin/Long| = Int(2).R|kotlin/Int.plus|(Int(2).R|kotlin/Int.times|(Int(3))).#() + public final val l4: R|kotlin/Long| = Int(2).R|kotlin/Int.plus|(Int(2).R|kotlin/Int.times|(Int(3))).R|kotlin/Int.inc#|() public get(): R|kotlin/Long| public final val ll4: R|kotlin/Long| = Long(3000000000).R|kotlin/Long.times|(Int(2)).R|kotlin/Long.plus|(Int(1)).R|kotlin/Long.inc|() public get(): R|kotlin/Long| public final val i5: R|kotlin/Int| = Int(2).R|kotlin/Int.plus|(Int(2).R|kotlin/Int.times|(Int(3))).R|kotlin/Int.dec|() public get(): R|kotlin/Int| - public final val l5: R|kotlin/Long| = Int(2).R|kotlin/Int.plus|(Int(2).R|kotlin/Int.times|(Int(3))).#() + public final val l5: R|kotlin/Long| = Int(2).R|kotlin/Int.plus|(Int(2).R|kotlin/Int.times|(Int(3))).R|kotlin/Int.dec#|() public get(): R|kotlin/Long| public final val ll5: R|kotlin/Long| = Long(3000000000).R|kotlin/Long.times|(Int(2)).R|kotlin/Long.plus|(Int(1)).R|kotlin/Long.dec|() public get(): R|kotlin/Long| diff --git a/compiler/testData/diagnostics/tests/integerLiterals/intToLongConversion.fir.txt b/compiler/testData/diagnostics/tests/integerLiterals/intToLongConversion.fir.txt index d860e6c5045..45569981cbe 100644 --- a/compiler/testData/diagnostics/tests/integerLiterals/intToLongConversion.fir.txt +++ b/compiler/testData/diagnostics/tests/integerLiterals/intToLongConversion.fir.txt @@ -24,13 +24,13 @@ FILE: intToLongConversion.fir.kt public final fun takeB(b: R|B|): R|kotlin/Unit| { } public final fun test_constants(): R|kotlin/Unit| { - #(Int(1).R|kotlin/Int.plus|(Int(1))) + R|/takeByte#|(Int(1).R|kotlin/Int.plus|(Int(1))) R|/takeInt|(Int(1).R|kotlin/Int.plus|(Int(1)).R|kotlin/Int.plus|(Int(1))) R|/takeNullableInt|(Int(1).R|kotlin/Int.plus|(Int(1)).R|kotlin/Int.plus|(Int(1))) R|/takeLong|(Int(1).R|kotlin/Int.plus|(Int(1)).R|kotlin/Int.plus|(Int(1)).R|kotlin/Int.toLong|()) R|/takeNullableLong|(Int(1).R|kotlin/Int.plus|(Int(1)).R|kotlin/Int.plus|(Int(1)).R|kotlin/Int.toLong|()) lval x: R|B| = R|/takeOverloaded|(Long(2147483648).R|kotlin/Long.minus|(Int(1)).R|kotlin/Long.plus|(Int(1))) - #(R|/x|) + R|/takeA#|(R|/x|) R|/takeB|(R|/x|) } public final val topLevelIntProperty: R|kotlin/Int| = Int(1).R|kotlin/Int.plus|(Int(1)).R|kotlin/Int.plus|(Int(1)) @@ -46,8 +46,8 @@ FILE: intToLongConversion.fir.kt R|/takeLong|(R|/topLevelLongProperty|) R|/takeInt|(R|/topLevelImplicitIntProperty|) R|/takeLong|(R|/topLevelImplicitLongProperty|) - #(R|/topLevelIntProperty|) - #(R|/topLevelImplicitIntProperty|) + R|/takeLong#|(R|/topLevelIntProperty|) + R|/takeLong#|(R|/topLevelImplicitIntProperty|) } public final fun testLocalProperties(): R|kotlin/Unit| { lval localIntProperty: R|kotlin/Int| = Int(1).R|kotlin/Int.plus|(Int(1)) @@ -58,6 +58,6 @@ FILE: intToLongConversion.fir.kt R|/takeLong|(R|/localLongProperty|) R|/takeInt|(R|/localImplicitIntProperty|) R|/takeLong|(R|/localImplicitLongProperty|) - #(R|/localIntProperty|) - #(R|/localImplicitIntProperty|) + R|/takeLong#|(R|/localIntProperty|) + R|/takeLong#|(R|/localImplicitIntProperty|) } diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.fir.kt index 087cc6f092d..48a49ef39fa 100644 --- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.fir.kt +++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.fir.kt @@ -6,11 +6,11 @@ package example fun test() { val p = test.Public() if (p.public is Int) p.public + 1 - if (p.protected is Int) p.protected + 1 + if (p.protected is Int) p.protected + 1 if (p.internal is Int) p.internal + 1 val i = test.Internal() if (i.public is Int) i.public + 1 - if (i.protected is Int) i.protected + 1 + if (i.protected is Int) i.protected + 1 if (i.internal is Int) i.internal + 1 } diff --git a/compiler/testData/diagnostics/tests/operatorRem/resolveModIfRemIsHidden.fir.kt b/compiler/testData/diagnostics/tests/operatorRem/resolveModIfRemIsHidden.fir.kt index 153d79ccb50..008c29c703c 100644 --- a/compiler/testData/diagnostics/tests/operatorRem/resolveModIfRemIsHidden.fir.kt +++ b/compiler/testData/diagnostics/tests/operatorRem/resolveModIfRemIsHidden.fir.kt @@ -10,7 +10,7 @@ object A { } fun test() { - takeString(A % 123) + takeString(A % 123) } fun takeString(s: String) {} diff --git a/compiler/testData/diagnostics/tests/privateInFile/visibility.fir.kt b/compiler/testData/diagnostics/tests/privateInFile/visibility.fir.kt index 9fb008ec5e4..c295655fc0d 100644 --- a/compiler/testData/diagnostics/tests/privateInFile/visibility.fir.kt +++ b/compiler/testData/diagnostics/tests/privateInFile/visibility.fir.kt @@ -35,7 +35,7 @@ fun test() { val u : A = A() val z = x - x = 30 + x = 30 val po = PO diff --git a/compiler/testData/diagnostics/tests/protectedWithGenericsInDifferentPackage.fir.kt b/compiler/testData/diagnostics/tests/protectedWithGenericsInDifferentPackage.fir.kt index c8c43747ba6..184dc822495 100644 --- a/compiler/testData/diagnostics/tests/protectedWithGenericsInDifferentPackage.fir.kt +++ b/compiler/testData/diagnostics/tests/protectedWithGenericsInDifferentPackage.fir.kt @@ -27,7 +27,7 @@ package foo fun test(s: bar.Sub) { s.name - s.name = "" + s.name = "" s.name2 s.name2 = "" s.doSomething() diff --git a/compiler/testData/diagnostics/tests/resolve/HiddenDeclarations.fir.kt b/compiler/testData/diagnostics/tests/resolve/HiddenDeclarations.fir.kt index 1c92bcae17f..cfcc8567b3a 100644 --- a/compiler/testData/diagnostics/tests/resolve/HiddenDeclarations.fir.kt +++ b/compiler/testData/diagnostics/tests/resolve/HiddenDeclarations.fir.kt @@ -41,7 +41,7 @@ open class A { fun foo() { topLevelFun() topLevelFun(1) - topLevelProperty++ + topLevelProperty++ "".topLevelExtensionFun() 1.topLevelExtensionFun() "".topLevelExtensionProperty diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/properties.fir.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/properties.fir.kt index ced320b1762..2fa63805707 100644 --- a/compiler/testData/diagnostics/tests/resolve/dslMarker/properties.fir.kt +++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/properties.fir.kt @@ -35,11 +35,11 @@ fun test() { bar { a + 1 - a += a + 1 + a += a + 1 a++ a1 + 1 - a1 += a1 + 1 + a1 += a1 + 1 a1++ this@foo.a + 1 diff --git a/compiler/testData/diagnostics/tests/scopes/kt1244.fir.kt b/compiler/testData/diagnostics/tests/scopes/kt1244.fir.kt index 39b2d25e557..6d950a84b51 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt1244.fir.kt +++ b/compiler/testData/diagnostics/tests/scopes/kt1244.fir.kt @@ -8,6 +8,6 @@ class A { class B() { init { - A().a = "Hello" + A().a = "Hello" } } diff --git a/compiler/testData/diagnostics/tests/scopes/kt1738.fir.kt b/compiler/testData/diagnostics/tests/scopes/kt1738.fir.kt index 81579bd1c36..39132619682 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt1738.fir.kt +++ b/compiler/testData/diagnostics/tests/scopes/kt1738.fir.kt @@ -6,6 +6,6 @@ class A(private var i: Int, var j: Int) { } fun test(a: A) { - a.i++ + a.i++ a.j++ } diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/withSmartcast.fir.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/withSmartcast.fir.kt index d3859c5764c..b358649a964 100644 --- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/withSmartcast.fir.kt +++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/withSmartcast.fir.kt @@ -14,7 +14,7 @@ class Derived : Base() { x.foo() x.bar() - x.x = x.x + 1 + x.x = x.x + 1 x.y = x.y + 1 if (x is Derived) { diff --git a/compiler/testData/diagnostics/tests/scopes/visibility.fir.kt b/compiler/testData/diagnostics/tests/scopes/visibility.fir.kt index 75bdd14f6dc..fe7dae5c797 100644 --- a/compiler/testData/diagnostics/tests/scopes/visibility.fir.kt +++ b/compiler/testData/diagnostics/tests/scopes/visibility.fir.kt @@ -54,7 +54,7 @@ open class C : T { } fun test4(c: C) { - c.i++ + c.i++ } class D : C() { diff --git a/compiler/testData/diagnostics/tests/scopes/visibility3.fir.kt b/compiler/testData/diagnostics/tests/scopes/visibility3.fir.kt index 0b0c86b8c7c..2511df96b50 100644 --- a/compiler/testData/diagnostics/tests/scopes/visibility3.fir.kt +++ b/compiler/testData/diagnostics/tests/scopes/visibility3.fir.kt @@ -31,7 +31,7 @@ fun test() { val u : A = A() val z = x - x = 30 + x = 30 val po = PO } diff --git a/compiler/testData/diagnostics/tests/unitConversion/unitConversionCompatibility.fir.kt b/compiler/testData/diagnostics/tests/unitConversion/unitConversionCompatibility.fir.kt index ca60944607b..56e94efb353 100644 --- a/compiler/testData/diagnostics/tests/unitConversion/unitConversionCompatibility.fir.kt +++ b/compiler/testData/diagnostics/tests/unitConversion/unitConversionCompatibility.fir.kt @@ -23,7 +23,7 @@ object Test2 { fun foo(f: KRunnable) {} fun test(f: () -> Int) { - foo(f) + foo(f) } } } diff --git a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.fir.kt b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.fir.kt index 0e42d359c88..21d36c3c73f 100644 --- a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.fir.kt +++ b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.fir.kt @@ -53,7 +53,7 @@ fun test() { takeULong(IMPLICIT_INT) - takeUBytes(IMPLICIT_INT, EXPLICIT_INT, 42u) + takeUBytes(IMPLICIT_INT, EXPLICIT_INT, 42u) takeLong(IMPLICIT_INT) diff --git a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/signedToUnsignedConversionWithExpectedType.fir.kt b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/signedToUnsignedConversionWithExpectedType.fir.kt index 88ae90f41db..686785b439a 100644 --- a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/signedToUnsignedConversionWithExpectedType.fir.kt +++ b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/signedToUnsignedConversionWithExpectedType.fir.kt @@ -33,7 +33,7 @@ fun test() { takeUInt(Int.MAX_VALUE * 2) takeUInt(4294967294) - takeUBytes(1, 2, 255, 256, 0, -1, 40 + 2) + takeUBytes(1, 2, 255, 256, 0, -1, 40 + 2) takeUInt(1.myPlus(2)) diff --git a/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.fir.kt b/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.fir.kt index 1f9d8ef2c99..9b7d0d47a74 100644 --- a/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.fir.kt +++ b/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.fir.kt @@ -15,23 +15,23 @@ class Test { this.i = getT() with(Test()) { i = getT() // resolved to this@Test.i - this.i = getT() - this@with.i = getT() + this.i = getT() + this@with.i = getT() this@Test.i = getT() } } fun test(t: Test) { - t.i = getT() + t.i = getT() } companion object { fun test(t: Test) { - t.i = getT() + t.i = getT() } } } fun test(t: Test) { - t.i = getT() + t.i = getT() } diff --git a/compiler/testData/diagnostics/tests/visibility/privateToThis.fir.txt b/compiler/testData/diagnostics/tests/visibility/privateToThis.fir.txt index d28337cd2dd..1af7b8ada21 100644 --- a/compiler/testData/diagnostics/tests/visibility/privateToThis.fir.txt +++ b/compiler/testData/diagnostics/tests/visibility/privateToThis.fir.txt @@ -16,11 +16,11 @@ FILE: privateToThis.fir.kt } public final fun foo(a: R|A|): R|kotlin/Unit| { - lval x: R|kotlin/String| = R|/a|.# + lval x: R|kotlin/String| = R|/a|.R|SubstitutionOverride#| } public final fun bar(a: R|A<*>|): R|kotlin/Unit| { - R|/a|.# + R|/a|.R|SubstitutionOverride#| } public final inner class B : R|kotlin/Any| { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.fir.kt deleted file mode 100644 index cb93752ab9d..00000000000 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.fir.kt +++ /dev/null @@ -1,50 +0,0 @@ -// FILE: I.kt - -interface I { - suspend fun foo(x: Int): String -} - -// FILE: BaseJavaClass.java -public class BaseJavaClass { - public Object foo(int x, kotlin.coroutines.Continuation continuation) { - return null; - } -} - -// FILE: JavaClass.java -public class JavaClass extends BaseJavaClass implements I { -} - -// FILE: main.kt - -import kotlin.coroutines.Continuation -class K1 : JavaClass() - -class K2 : JavaClass() { - override suspend fun foo(x: Int): String = "" -} - -class K3 : JavaClass() { - override fun foo(x: Int, y: Continuation): Any? = null -} - -fun builder(block: suspend () -> Unit) {} - -fun main(x: Continuation) { - JavaClass().foo(5, x) - K1().foo(6, x) - K2().foo(7, x) - K3().foo(8, x) - - builder { - JavaClass().foo(1) - K1().foo(2) - K2().foo(3) - K3().foo(4) - - JavaClass().foo(5, x) - K1().foo(6, x) - K2().foo(7, x) - K3().foo(8, x) - } -} diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt index 9698426d293..60580f086cc 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaImplementationFromDifferentClass.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // FILE: I.kt interface I { diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt50994.fir.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt50994.fir.txt index 46cca0e6764..887a7fdce27 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt50994.fir.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt50994.fir.txt @@ -18,7 +18,7 @@ FILE: kt50994.fir.kt super() } - public final var processors: R|kotlin/collections/MutableCollection|by this@R|/ProcessorWithChildren|.#((Q|ProcessorWithParent|).R|kotlin/jvm/java|, Q|ProcessorWithParent|::#) + public final var processors: R|kotlin/collections/MutableCollection|by this@R|/ProcessorWithChildren|.R|/children#|((Q|ProcessorWithParent|).R|kotlin/jvm/java|, Q|ProcessorWithParent|::#) public get(): R|kotlin/collections/MutableCollection| { ^ this@R|/ProcessorWithChildren|.D|/ProcessorWithChildren.processors|.R|SubstitutionOverride|>|(this@R|/ProcessorWithChildren|, ::R|/ProcessorWithChildren.processors|) } diff --git a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/4.2.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/4.2.fir.kt index 4896aeb9c27..fca9358bb92 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/4.2.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/4.2.fir.kt @@ -16,7 +16,7 @@ class B : I fun case1(){ A() - A() + A() } // FILE: Lib.kt diff --git a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.1.fir.kt index 30ec549e9fb..d5c40ff6212 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.1.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.1.fir.kt @@ -18,7 +18,7 @@ fun C?.boo( c: ()->C) : String { //(2) this.boo( x )// ok to (1) this.boo( x ) - this.boo( {1}) //to (2); {1} is ()->C + this.boo( {1}) //to (2); {1} is ()->C this.boo( {1}) return "" @@ -39,7 +39,7 @@ fun C?.boo( c: ()->C, x : Int = 1) : String { //(2) this.boo( x )// ok to (1) this.boo( x ) - this.boo( {1}) //to (2); {1} is ()->C + this.boo( {1}) //to (2); {1} is ()->C this.boo( {1}) return "" diff --git a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.2.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.2.fir.kt index cd53764f4b9..50c4ebb4b36 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.2.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.2.fir.kt @@ -19,8 +19,8 @@ inline operator fun B?.plusAssign( c: ()->Any) { } //(1) @JvmName("aa") inline operator fun B?.plusAssign( c: ()->C) { //(2) - this += {1} - this += {1} + this += {1} + this += {1} } class C diff --git a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.3.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.3.fir.kt index ff2b7de2e7f..fd8fca835a4 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.3.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/pos/2.3.fir.kt @@ -7,13 +7,13 @@ package testPackCase1 fun case1(a: A, c: C) { - a?.b .plusAssign(c) + a?.b .plusAssign(c) val x = { - a?.b.plusAssign(c) + a?.b.plusAssign(c) }() - a?.b.plusAssign({ c }()) + a?.b.plusAssign({ c }()) } class A(val b: B) diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.fir.kt index c76663c1b43..185c0406eab 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.fir.kt @@ -237,9 +237,9 @@ fun case_4(value_1: Any?) { case_4_1(value_1) value_1?.toByte() case_4_2(value_1) - value_1.toByte() - case_4_3(value_1) - value_1.inv() + value_1.toByte() + case_4_3(value_1) + value_1.inv() } // TESTCASE NUMBER: 5 @@ -331,29 +331,29 @@ fun case_8(value_1: Any?) { if (case_8_1(value_1)) { value_1?.toByte() if (case_8_2(value_1)) { - value_1.toByte() - if (case_8_3(value_1)) value_1.inv() + value_1.toByte() + if (case_8_3(value_1)) value_1.inv() } } if (!case_8_4(value_1)) { value_1?.toByte() if (!case_8_5(value_1)) { - value_1.toByte() - if (!case_8_6(value_1)) value_1.inv() + value_1.toByte() + if (!case_8_6(value_1)) value_1.inv() } } if (case_8_7(value_1) == null) { value_1?.toByte() if (case_8_8(value_1) != null) { - value_1.toByte() - if (case_8_9(value_1) != null) value_1.inv() + value_1.toByte() + if (case_8_9(value_1) != null) value_1.inv() } } if (case_8_10(value_1) != null) { value_1?.toByte() if (case_8_11(value_1) == null) { - value_1.toByte() - if (case_8_12(value_1) == null) value_1.inv() + value_1.toByte() + if (case_8_12(value_1) == null) value_1.inv() } } } diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/36.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/36.fir.kt index 8bafd652a97..8021514c0f2 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/36.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/36.fir.kt @@ -49,14 +49,14 @@ fun case_4(x: Class?, y: Any) { fun case_5(x: Class?, y: String?) { x?.prop_12 = y ?: return y - y.toUpperCase() + y.toUpperCase() } // TESTCASE NUMBER: 6 fun case_6(x: Class?, y: String?) { x?.prop_9 = y !is String && throw Exception() y - y.toUpperCase() + y.toUpperCase() } /* @@ -67,7 +67,7 @@ fun case_6(x: Class?, y: String?) { fun case_7(x: Class?, y: String?) { x?.prop_12 = y!! y - y.toUpperCase() + y.toUpperCase() } /* @@ -78,5 +78,5 @@ fun case_7(x: Class?, y: String?) { fun case_8(x: Class?, y: String?) { x?.prop_12 = if (y === null) throw Exception() else "" y - y.toUpperCase() + y.toUpperCase() } diff --git a/plugins/fir-plugin-prototype/testData/diagnostics/receivers/receiverInjection.fir.txt b/plugins/fir-plugin-prototype/testData/diagnostics/receivers/receiverInjection.fir.txt index 3302786e049..1d95ce139dc 100644 --- a/plugins/fir-plugin-prototype/testData/diagnostics/receivers/receiverInjection.fir.txt +++ b/plugins/fir-plugin-prototype/testData/diagnostics/receivers/receiverInjection.fir.txt @@ -14,7 +14,7 @@ FILE: receiverInjection.kt R|/b1|.#(R|/b2|) R|/injectAlgebra|() (this@R|/test_1|, R|/a1|).R|SubstitutionOverride|(R|/a2|) - (this@R|/test_1|, R|/b1|).#(R|/b2|) + (this@R|/test_1|, R|/b1|).R|SubstitutionOverride#|(R|/b2|) R|/injectAlgebra|() (this@R|/test_1|, R|/a1|).R|SubstitutionOverride|(R|/a2|) (this@R|/test_1|, R|/b1|).R|SubstitutionOverride|(R|/b2|)