From 65119adb6a259700c84999dcf5f5c09bca6af742 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 28 Oct 2020 15:32:51 +0300 Subject: [PATCH] FIR: Adjust test data. FakeOverride -> SubssitutionOverride --- .../extendedCheckers/CanBeValChecker.txt | 32 ++++++------- .../RedundantReturnUnitTypeChecker.txt | 6 +-- .../extensionLambdaInDefaultArgument.txt | 2 +- .../resolve/arguments/tryInLambda.txt | 2 +- .../testData/resolve/arrays/arraySet.txt | 6 +-- .../resolve/arrays/arraySetWithOperation.txt | 6 +-- .../testData/resolve/bareTypes.txt | 8 ++-- .../extensionInvokeAfterSafeCall.txt | 4 +- .../invokeWithReceiverAndArgument.txt | 10 ++-- .../callResolution/safeCallOnTypeAlias.txt | 2 +- .../testData/resolve/cfg/complex.dot | 4 +- .../testData/resolve/cfg/complex.txt | 4 +- .../resolve/cfg/flowFromInplaceLambda.dot | 8 ++-- .../resolve/cfg/flowFromInplaceLambda.txt | 4 +- .../testData/resolve/cfg/jumps.dot | 2 +- .../testData/resolve/cfg/jumps.txt | 2 +- .../resolve/cfg/lambdaAsReturnOfLambda.dot | 4 +- .../resolve/cfg/lambdaAsReturnOfLambda.txt | 2 +- .../testData/resolve/cfg/lambdas.dot | 4 +- .../testData/resolve/cfg/lambdas.txt | 4 +- .../resolve/cfg/localClassesWithImplicit.dot | 4 +- .../resolve/cfg/localClassesWithImplicit.txt | 2 +- .../resolve/cfg/propertiesAndInitBlocks.dot | 2 +- .../resolve/cfg/propertiesAndInitBlocks.txt | 2 +- .../testData/resolve/constantValues.txt | 6 +-- .../resolve/delegates/delegateInference.txt | 8 ++-- .../resolve/delegates/delegateWithLambda.txt | 4 +- .../delegates/extensionGenericGetValue.txt | 2 +- ...sionGetValueWithTypeVariableAsReceiver.txt | 2 +- .../testData/resolve/delegates/kt41982.txt | 4 +- .../resolve/delegates/provideDelegate.txt | 4 +- .../diagnostics/conflictingProjection.txt | 36 +++++++-------- .../resolve/diagnostics/repeatedModifier.txt | 2 +- .../testIllegalAnnotationClass.txt | 2 +- .../diagnostics/upperBoundViolated.txt | 4 +- .../resolve/expresssions/enumValues.txt | 4 +- .../extensionPropertyInLambda.txt | 4 +- .../expresssions/genericDescriptor.txt | 4 +- .../expresssions/genericDiagnostic.txt | 2 +- .../expresssions/genericPropertyAccess.txt | 2 +- .../expresssions/genericUsedInFunction.txt | 4 +- .../resolve/expresssions/importedReceiver.txt | 2 +- .../expresssions/invoke/doubleBrackets.txt | 2 +- .../expresssions/invoke/extensionOnObject.txt | 4 +- .../expresssions/invoke/extensionSafeCall.txt | 2 +- .../expresssions/invoke/inBrackets.txt | 4 +- .../invoke/propertyFromParameter.txt | 2 +- .../invoke/propertyWithExtensionType.txt | 4 +- .../invoke/threeReceiversCorrect.txt | 8 ++-- .../testData/resolve/expresssions/lambda.txt | 4 +- .../expresssions/lambdaWithReceiver.txt | 4 +- .../expresssions/protectedVisibility.txt | 2 +- .../expresssions/typeAliasConstructor.txt | 2 +- .../testData/resolve/functionTypeAlias.txt | 2 +- .../testData/resolve/functionTypes.txt | 4 +- .../testData/resolve/genericConstructors.txt | 2 +- .../resolve/implicitTypeInFakeOverride.txt | 2 +- .../lambdaAsReturnStatementOfLambda.txt | 2 +- .../resolve/inference/lambdaInElvis.txt | 4 +- .../inference/nestedExtensionFunctionType.txt | 14 +++--- .../inference/receiverWithCapturedType.txt | 2 +- .../resolve/inference/simpleCapturedTypes.txt | 6 +-- ...invokeInWhenSubjectVariableInitializer.txt | 2 +- .../resolve/invokeOfLambdaWithReceiver.txt | 6 +-- .../testData/resolve/kt41984.txt | 4 +- .../testData/resolve/kt41990.txt | 4 +- .../resolve/lambdaInLhsOfTypeOperatorCall.txt | 2 +- .../testData/resolve/localObject.txt | 2 +- .../testData/resolve/nested/innerTypes.txt | 16 +++---- .../resolve/overrides/protobufExt.txt | 4 +- .../resolve/overrides/simpleFakeOverride.txt | 2 +- .../resolve/overrides/supertypeGenerics.txt | 2 +- .../overrides/supertypeGenericsComplex.txt | 2 +- .../problems/flexibleTypeVarAgainstNull.txt | 2 +- .../resolve/problems/safeCallInvoke.txt | 2 +- .../recursiveCallOnWhenWithSealedClass.txt | 2 +- .../references/referenceToExtension.txt | 12 ++--- .../boundSmartcastsInBranches.dot | 4 +- .../boundSmartcastsInBranches.txt | 4 +- .../smartcasts/controlStructures/returns.dot | 4 +- .../smartcasts/controlStructures/returns.txt | 2 +- .../testData/resolve/smartcasts/kt10240.txt | 2 +- .../smartcasts/lambdas/smartcastOnLambda.dot | 2 +- .../smartcasts/lambdas/smartcastOnLambda.txt | 2 +- .../resolve/smartcasts/problems/invoke.txt | 4 +- .../resolve/smartcasts/smartcastToNothing.dot | 4 +- .../resolve/smartcasts/smartcastToNothing.txt | 4 +- .../stdlib/j+k/ArrayInGenericArguments.txt | 2 +- .../resolve/stdlib/j+k/flexibleWildcard.txt | 2 +- .../resolve/typeAliasWithTypeArguments.txt | 46 +++++++++---------- .../types/bareWithSubjectTypeAlias.txt | 2 +- .../resolve/varargInPrimaryConstructor.txt | 8 ++-- .../intersectionOverrideWithImplicitTypes.txt | 2 +- .../addAllOnJavaCollection.txt | 10 ++-- .../resolveWithStdlib/arrayFirstOrNull.txt | 2 +- .../withGenericFun.txt | 2 +- .../callableReferences/ifWithCR.txt | 2 +- .../testData/resolveWithStdlib/cloneArray.txt | 2 +- .../resolveWithStdlib/complexPostponedCfg.dot | 6 +-- .../resolveWithStdlib/complexPostponedCfg.txt | 6 +-- .../testData/resolveWithStdlib/components.txt | 4 +- .../concurrentMapOfAliases.txt | 2 +- .../contracts/fromLibrary/callsInPlace.dot | 6 +-- .../contracts/fromLibrary/callsInPlace.txt | 6 +-- .../bad/callsInPlace/inAnonymousObject.dot | 4 +- .../bad/callsInPlace/inAnonymousObject.txt | 4 +- .../bad/callsInPlace/inLocalClass.dot | 6 +-- .../bad/callsInPlace/inLocalClass.txt | 6 +-- .../bad/callsInPlace/inLocalFunction.dot | 6 +-- .../bad/callsInPlace/inLocalFunction.txt | 6 +-- .../bad/callsInPlace/toLocalVariables.dot | 4 +- .../bad/callsInPlace/toLocalVariables.txt | 4 +- .../good/callsInPlace/atLeastOnce.dot | 4 +- .../good/callsInPlace/atLeastOnce.txt | 4 +- .../good/callsInPlace/atMostOnce.dot | 4 +- .../good/callsInPlace/atMostOnce.txt | 4 +- .../good/callsInPlace/contractsUsage.dot | 6 +-- .../good/callsInPlace/contractsUsage.txt | 6 +-- .../good/callsInPlace/exactlyOnce.dot | 4 +- .../good/callsInPlace/exactlyOnce.txt | 4 +- .../fromSource/good/callsInPlace/flow.dot | 12 ++--- .../fromSource/good/callsInPlace/flow.txt | 12 ++--- .../good/callsInPlace/inPlaceLambda.dot | 6 +-- .../good/callsInPlace/inPlaceLambda.txt | 6 +-- .../fromSource/good/callsInPlace/simple.dot | 6 +-- .../fromSource/good/callsInPlace/simple.txt | 6 +-- .../fromSource/good/callsInPlace/unknown.dot | 4 +- .../fromSource/good/callsInPlace/unknown.txt | 4 +- .../newSyntax/functionsWithContract.txt | 2 +- .../delegates/delegateTypeMismatch.txt | 8 ++-- .../delegates/delegateWithAnonymousObject.dot | 6 +-- .../delegates/delegateWithAnonymousObject.txt | 4 +- .../delegates/propertyWithFunctionalType.txt | 8 ++-- .../resolveWithStdlib/getOnKProperty.txt | 4 +- .../resolveWithStdlib/hashMapTypeAlias.txt | 2 +- .../hashTableWithForEach.txt | 2 +- .../inference/builderInference.txt | 2 +- .../builderInferenceAndCoercionToUnit.txt | 2 +- .../inference/builderInferenceFromStdlib.txt | 6 +-- .../inference/complexConstraintSystem.txt | 2 +- .../inference/plusAssignWithLambdaInRhs.dot | 6 +-- .../inference/plusAssignWithLambdaInRhs.txt | 2 +- .../j+k/BasicWithJavaFakeOverride.txt | 2 +- .../j+k/FieldSubstitution.txt | 2 +- .../j+k/KJKComplexHierarchyWithNested.txt | 4 +- .../j+k/KJKInheritanceGeneric.txt | 2 +- .../resolveWithStdlib/j+k/MapCompute.txt | 4 +- .../resolveWithStdlib/j+k/MyIterable.txt | 8 ++-- .../testData/resolveWithStdlib/j+k/MyMap.txt | 12 ++--- .../j+k/SyntheticWithForEach.txt | 6 +-- .../j+k/flexibleTypeAliases.txt | 2 +- .../resolveWithStdlib/j+k/mapMerge.txt | 2 +- .../resolveWithStdlib/j+k/smartSet.txt | 2 +- .../kotlinComparatorAlias.txt | 4 +- .../testData/resolveWithStdlib/mapList.txt | 4 +- .../multiModule/FakeOverrides.txt | 4 +- .../resolveWithStdlib/noneWithForEach.txt | 4 +- .../testData/resolveWithStdlib/problems.txt | 2 +- .../problems/DeepCopyIrTree.txt | 10 ++-- .../resolveWithStdlib/problems/EnumMapGet.txt | 2 +- .../problems/receiverResolutionInLambda.txt | 16 +++---- .../problems/weakHashMap.txt | 2 +- .../resolveWithStdlib/recursiveBug.txt | 4 +- .../testData/resolveWithStdlib/removeIf.txt | 2 +- .../resolveWithStdlib/removeOnAbstractMap.txt | 4 +- .../typeAliasDeserialization.txt | 4 +- .../typeAliasWithForEach.txt | 2 +- .../typeParameterDerived.txt | 8 ++-- .../testdata/lazyResolve/delegates.txt | 6 +-- 169 files changed, 408 insertions(+), 408 deletions(-) diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.txt b/compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.txt index 99c24ccda3c..d11a97c7a6e 100644 --- a/compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.txt +++ b/compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.txt @@ -37,31 +37,31 @@ FILE: CanBeValChecker.kt } public final fun destructuringDeclaration(): R|kotlin/Unit| { lval : R|kotlin/Pair| = R|/getPair|() - lvar v1: R|kotlin/Int| = R|/|.R|FakeOverride|() - lvar v2: R|kotlin/String| = R|/|.R|FakeOverride|() + lvar v1: R|kotlin/Int| = R|/|.R|SubstitutionOverride|() + lvar v2: R|kotlin/String| = R|/|.R|SubstitutionOverride|() R|kotlin/io/print|(R|/v1|) lval : R|kotlin/Pair| = R|/getPair|() - lvar v3: R|kotlin/Int| = R|/|.R|FakeOverride|() - lvar v4: R|kotlin/String| = R|/|.R|FakeOverride|() + lvar v3: R|kotlin/Int| = R|/|.R|SubstitutionOverride|() + lvar v4: R|kotlin/String| = R|/|.R|SubstitutionOverride|() R|kotlin/io/print|(R|/v3|) R|/v4| = String() lval : R|kotlin/Pair| = R|/getPair|() - lvar v5: R|kotlin/Int| = R|/|.R|FakeOverride|() - lvar v6: R|kotlin/String| = R|/|.R|FakeOverride|() + lvar v5: R|kotlin/Int| = R|/|.R|SubstitutionOverride|() + lvar v6: R|kotlin/String| = R|/|.R|SubstitutionOverride|() R|/v5| = Int(1) lval : R|kotlin/Pair| = R|/getPair|() - lvar v7: R|kotlin/Int| = R|/|.R|FakeOverride|() - lvar v8: R|kotlin/String| = R|/|.R|FakeOverride|() + lvar v7: R|kotlin/Int| = R|/|.R|SubstitutionOverride|() + lvar v8: R|kotlin/String| = R|/|.R|SubstitutionOverride|() R|/v7| = Int(2) R|/v8| = String(42) lval : R|kotlin/Triple| = R|kotlin/Triple.Triple|(Int(1), Int(1), Int(1)) - lval a: R|kotlin/Int| = R|/|.R|FakeOverride|() - lval b: R|kotlin/Int| = R|/|.R|FakeOverride|() - lval c: R|kotlin/Int| = R|/|.R|FakeOverride|() + lval a: R|kotlin/Int| = R|/|.R|SubstitutionOverride|() + lval b: R|kotlin/Int| = R|/|.R|SubstitutionOverride|() + lval c: R|kotlin/Int| = R|/|.R|SubstitutionOverride|() lval : R|kotlin/Triple| = R|kotlin/Triple.Triple|(Int(1), Int(1), Int(1)) - lvar x: R|kotlin/Int| = R|/|.R|FakeOverride|() - lvar y: R|kotlin/Int| = R|/|.R|FakeOverride|() - lvar z: R|kotlin/Int| = R|/|.R|FakeOverride|() + lvar x: R|kotlin/Int| = R|/|.R|SubstitutionOverride|() + lvar y: R|kotlin/Int| = R|/|.R|SubstitutionOverride|() + lvar z: R|kotlin/Int| = R|/|.R|SubstitutionOverride|() } public final fun stackOverflowBug(): R|kotlin/Unit| { lvar a: R|kotlin/Int| @@ -169,7 +169,7 @@ FILE: CanBeValChecker.kt lval unused: R|kotlin/Int| = Int(0) when () { ==(R|/args|.R|kotlin/Array.size|, Int(1)) -> { - R|/a| = R|/args|.R|FakeOverride|(Int(0)) + R|/a| = R|/args|.R|SubstitutionOverride|(Int(0)) } else -> { R|/a| = R|/args|.R|kotlin/Any.toString|() @@ -184,7 +184,7 @@ FILE: CanBeValChecker.kt } public final fun run(f: R|() -> kotlin/Unit|): R|kotlin/Unit| { - ^run R|/f|.R|FakeOverride|() + ^run R|/f|.R|SubstitutionOverride|() } public final fun lambda(): R|kotlin/Unit| { lvar a: R|kotlin/Int| diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantReturnUnitTypeChecker.txt b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantReturnUnitTypeChecker.txt index 2aefb692f05..ede0c8c0e4e 100644 --- a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantReturnUnitTypeChecker.txt +++ b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantReturnUnitTypeChecker.txt @@ -55,7 +55,7 @@ FILE: RedundantReturnUnitTypeChecker.kt } public final fun run(f: R|() -> T|): R|T| { - ^run R|/f|.R|FakeOverride|() + ^run R|/f|.R|SubstitutionOverride|() } public final fun foo(): R|kotlin/Unit| { @@ -70,7 +70,7 @@ FILE: RedundantReturnUnitTypeChecker.kt } public final fun call(f: R|() -> kotlin/Unit|): R|kotlin/Unit| { - ^call R|/f|.R|FakeOverride|() + ^call R|/f|.R|SubstitutionOverride|() } public final fun boo(): R|kotlin/Unit| { @@ -84,7 +84,7 @@ FILE: RedundantReturnUnitTypeChecker.kt } public final fun R|T|.let(f: R|(T) -> R|): R|R| { - ^let R|/f|.R|FakeOverride|(this@R|/B.let|) + ^let R|/f|.R|SubstitutionOverride|(this@R|/B.let|) } public final fun goo(): R|kotlin/Unit| { diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/extensionLambdaInDefaultArgument.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/extensionLambdaInDefaultArgument.txt index 7c42da7e6a0..3dea6735b4a 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/extensionLambdaInDefaultArgument.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/extensionLambdaInDefaultArgument.txt @@ -3,5 +3,5 @@ FILE: extensionLambdaInDefaultArgument.kt ^ this@R|special/anonymous|.R|kotlin/String.length| } ): R|kotlin/Int| { - ^test R|/f|.R|FakeOverride|(String()) + ^test R|/f|.R|SubstitutionOverride|(String()) } diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/tryInLambda.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/tryInLambda.txt index 706ab6d2439..cc8dc269bc0 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arguments/tryInLambda.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arguments/tryInLambda.txt @@ -1,6 +1,6 @@ FILE: tryInLambda.kt public final fun myRun(block: R|() -> T|): R|T| { - ^myRun R|/block|.R|FakeOverride|() + ^myRun R|/block|.R|SubstitutionOverride|() } public final fun foo(): R|kotlin/Unit| { } diff --git a/compiler/fir/analysis-tests/testData/resolve/arrays/arraySet.txt b/compiler/fir/analysis-tests/testData/resolve/arrays/arraySet.txt index cdfb6761a7b..c97776166dc 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arrays/arraySet.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arrays/arraySet.txt @@ -45,11 +45,11 @@ FILE: arraySet.kt } public final fun test_1(a: R|A|): R|kotlin/Unit| { - R|/a|.R|FakeOverride|(Int(0), R|/B.B|()) + R|/a|.R|SubstitutionOverride|(Int(0), R|/B.B|()) } public final fun test_2(a: R|A|): R|kotlin/Unit| { - R|/a|.R|FakeOverride|(Int(0), R|/C.C|()) + R|/a|.R|SubstitutionOverride|(Int(0), R|/C.C|()) } public final fun test_3(a: R|A|): R|kotlin/Unit| { - R|/a|.R|FakeOverride|(Int(0), R|/D.D|()) + R|/a|.R|SubstitutionOverride|(Int(0), R|/D.D|()) } diff --git a/compiler/fir/analysis-tests/testData/resolve/arrays/arraySetWithOperation.txt b/compiler/fir/analysis-tests/testData/resolve/arrays/arraySetWithOperation.txt index 12e34b5f38f..63d6038e171 100644 --- a/compiler/fir/analysis-tests/testData/resolve/arrays/arraySetWithOperation.txt +++ b/compiler/fir/analysis-tests/testData/resolve/arrays/arraySetWithOperation.txt @@ -45,18 +45,18 @@ FILE: arraySetWithOperation.kt } public final fun test_1(a: R|A|): R|kotlin/Unit| { - R|/a|.R|FakeOverride|(Int(0)).R|/B.plusAssign|(R|/B.B|()) + R|/a|.R|SubstitutionOverride|(Int(0)).R|/B.plusAssign|(R|/B.B|()) } public final fun test_2(a: R|A|): R|kotlin/Unit| { { lval <>: R|A| = R|/a| lval <>: R|kotlin/Int| = Int(0) - R|/<>|.R|FakeOverride|(R|/<>|, R|/<>|.R|FakeOverride|(R|/<>|).R|/C.plus|(R|/C.C|())) + R|/<>|.R|SubstitutionOverride|(R|/<>|, R|/<>|.R|SubstitutionOverride|(R|/<>|).R|/C.plus|(R|/C.C|())) } } public final fun test_3(a: R|A|): R|kotlin/Unit| { - ArraySet:[R|/a|.R|FakeOverride|(Int(0)).R|/D.plusAssign|(R|/D.D|())] + ArraySet:[R|/a|.R|SubstitutionOverride|(Int(0)).R|/D.plusAssign|(R|/D.D|())] } public final fun test_4(b: R|B|): R|kotlin/Unit| { ArraySet:[R|/b|.#(Int(0)).#(R|/B.B|())] diff --git a/compiler/fir/analysis-tests/testData/resolve/bareTypes.txt b/compiler/fir/analysis-tests/testData/resolve/bareTypes.txt index ff938aa3861..bafd0824c34 100644 --- a/compiler/fir/analysis-tests/testData/resolve/bareTypes.txt +++ b/compiler/fir/analysis-tests/testData/resolve/bareTypes.txt @@ -8,17 +8,17 @@ FILE: bareTypes.kt public abstract interface MutableString : R|MutableA| { } public final fun test(a: R|A|): R|kotlin/Unit| { - (R|/a| as? R|MutableA|)?.{ $subj$.R|FakeOverride|(String()) } - (R|/a| as R|MutableA|).R|FakeOverride|(String()) + (R|/a| as? R|MutableA|)?.{ $subj$.R|SubstitutionOverride|(String()) } + (R|/a| as R|MutableA|).R|SubstitutionOverride|(String()) } public final fun test2(a: R|A|): R|kotlin/Unit| { lval b: R|MutableString| = (R|/a| as R|MutableString|) - R|/b|.R|FakeOverride|(String()) + R|/b|.R|SubstitutionOverride|(String()) } public final fun test3(a: R|A|): R|kotlin/Unit| { when () { (R|/a| is R|MutableA|) -> { - R|/a|.R|FakeOverride|(String()) + R|/a|.R|SubstitutionOverride|(String()) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/extensionInvokeAfterSafeCall.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/extensionInvokeAfterSafeCall.txt index 0b651079380..d474407501f 100644 --- a/compiler/fir/analysis-tests/testData/resolve/callResolution/extensionInvokeAfterSafeCall.txt +++ b/compiler/fir/analysis-tests/testData/resolve/callResolution/extensionInvokeAfterSafeCall.txt @@ -2,8 +2,8 @@ FILE: extensionInvokeAfterSafeCall.kt public abstract interface A : R|kotlin/Any| { } public final fun test_1(a: R|A?|, convert: R|A.() -> kotlin/String|): R|kotlin/Unit| { - lval s: R|kotlin/String?| = R|/a|?.{ R|/convert|.R|FakeOverride|($subj$) } + lval s: R|kotlin/String?| = R|/a|?.{ R|/convert|.R|SubstitutionOverride|($subj$) } } public final fun test_2(a: R|A|, convert: R|A.() -> kotlin/String|): R|kotlin/Unit| { - lval s: R|kotlin/String| = R|/convert|.R|FakeOverride|(R|/a|) + lval s: R|kotlin/String| = R|/convert|.R|SubstitutionOverride|(R|/a|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.txt index ce527faf1de..a5fe0f925bb 100644 --- a/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.txt +++ b/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.txt @@ -33,8 +33,8 @@ FILE: invokeWithReceiverAndArgument.kt } public final fun test(func: R|(AbstractBuilderConfigurator.LeafBuilderConfigurationContext) -> kotlin/Unit|): R|kotlin/Unit| { - lval context: R|AbstractBuilderConfigurator.LeafBuilderConfigurationContext| = this@R|/BuilderConfigurator|.R|/AbstractBuilderConfigurator.LeafBuilderConfigurationContext.LeafBuilderConfigurationContext|() - R|/func|.R|FakeOverride|(R|/context|) + lval context: R|AbstractBuilderConfigurator.LeafBuilderConfigurationContext| = this@R|/BuilderConfigurator|.R|SubstitutionOverride|() + R|/func|.R|SubstitutionOverride|(R|/context|) } } @@ -51,9 +51,9 @@ FILE: invokeWithReceiverAndArgument.kt } public final fun foo(x: R|(Outer.Inner) -> kotlin/Unit|, y: R|Outer.Inner.() -> kotlin/Unit|): R|kotlin/Unit| { - this@R|/Outer|.R|/Outer.bar|(this@R|/Outer|.R|/Outer.Inner.Inner|()) - R|/x|.R|FakeOverride|(this@R|/Outer|.R|/Outer.Inner.Inner|()) - R|/y|.R|FakeOverride|(this@R|/Outer|.R|/Outer.Inner.Inner|()) + this@R|/Outer|.R|/Outer.bar|(this@R|/Outer|.R|SubstitutionOverride|()) + R|/x|.R|SubstitutionOverride|(this@R|/Outer|.R|SubstitutionOverride|()) + R|/y|.R|SubstitutionOverride|(this@R|/Outer|.R|SubstitutionOverride|()) } public final fun bar(i: R|Outer.Inner|): R|kotlin/Unit| { diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/safeCallOnTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/safeCallOnTypeAlias.txt index 6857a6129fe..23cb5301cc6 100644 --- a/compiler/fir/analysis-tests/testData/resolve/callResolution/safeCallOnTypeAlias.txt +++ b/compiler/fir/analysis-tests/testData/resolve/callResolution/safeCallOnTypeAlias.txt @@ -2,7 +2,7 @@ FILE: safeCallOnTypeAlias.kt public final typealias MyTypeAlias = R|() -> kotlin/String?| public final fun foo(x: R|MyTypeAlias|): R|kotlin/Unit| { R|/x|?.{ $subj$.R|kotlin/let| kotlin/String?|, R|kotlin/String|>( = let@fun (y: R|() -> kotlin/String?|): R|kotlin/String| { - ^ R|/y|.R|FakeOverride|()?.{ $subj$.R|kotlin/let|( = let@fun (result: R|kotlin/String|): R|kotlin/String| { + ^ R|/y|.R|SubstitutionOverride|()?.{ $subj$.R|kotlin/let|( = let@fun (result: R|kotlin/String|): R|kotlin/String| { ^ R|/bar|(R|/result|) } ) } diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot index 3a5a412948d..b8f895f5301 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot @@ -191,7 +191,7 @@ digraph complex_kt { color=blue 56 [label="Enter block"]; 57 [label="Access variable this@R|/firstIsInstanceOrNull|"]; - 58 [label="Function call: this@R|/firstIsInstanceOrNull|.R|FakeOverride|>|()"]; + 58 [label="Function call: this@R|/firstIsInstanceOrNull|.R|SubstitutionOverride|>|()"]; 59 [label="Variable declaration: lval : R|kotlin/collections/Iterator|"]; subgraph cluster_20 { color=blue @@ -210,7 +210,7 @@ digraph complex_kt { color=blue 66 [label="Enter block"]; 67 [label="Access variable R|/|"]; - 68 [label="Function call: R|/|.R|FakeOverride|()"]; + 68 [label="Function call: R|/|.R|SubstitutionOverride|()"]; 69 [label="Variable declaration: lval element: R|kotlin/Any?|"]; subgraph cluster_24 { color=blue diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/complex.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/complex.txt index a2016e5403d..306f1dcf7cc 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/complex.txt +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/complex.txt @@ -25,9 +25,9 @@ FILE: complex.kt } public final inline fun R|kotlin/collections/List<*>|.firstIsInstanceOrNull(): R|T?| { - lval : R|kotlin/collections/Iterator| = this@R|/firstIsInstanceOrNull|.R|FakeOverride|>|() + lval : R|kotlin/collections/Iterator| = this@R|/firstIsInstanceOrNull|.R|SubstitutionOverride|>|() while(R|/|.R|kotlin/collections/Iterator.hasNext|()) { - lval element: R|kotlin/Any?| = R|/|.R|FakeOverride|() + lval element: R|kotlin/Any?| = R|/|.R|SubstitutionOverride|() when () { (R|/element| is R|T|) -> { ^firstIsInstanceOrNull R|/element| diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot index 83866f3eaad..d6567a732ae 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot @@ -25,8 +25,8 @@ digraph flowFromInplaceLambda_kt { 5 [label="Enter block"]; 6 [label="Access variable R|/x|"]; 7 [label="Const: Int(0)"]; - 8 [label="Function call: R|/x|.R|FakeOverride|(...)"]; - 9 [label="Jump: ^select R|/x|.R|FakeOverride|(Int(0))"]; + 8 [label="Function call: R|/x|.R|SubstitutionOverride|(...)"]; + 9 [label="Jump: ^select R|/x|.R|SubstitutionOverride|(Int(0))"]; 10 [label="Stub" style="filled" fillcolor=gray]; 11 [label="Exit block" style="filled" fillcolor=gray]; } @@ -92,8 +92,8 @@ digraph flowFromInplaceLambda_kt { subgraph cluster_9 { color=blue 29 [label="Enter block"]; - 30 [label="Function call: R|/block|.R|FakeOverride|()"]; - 31 [label="Jump: ^myRun R|/block|.R|FakeOverride|()"]; + 30 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; + 31 [label="Jump: ^myRun R|/block|.R|SubstitutionOverride|()"]; 32 [label="Stub" style="filled" fillcolor=gray]; 33 [label="Exit block" style="filled" fillcolor=gray]; } diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.txt index b32220c0e42..153057e60ca 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.txt +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.txt @@ -2,7 +2,7 @@ FILE: flowFromInplaceLambda.kt public final fun takeInt(x: R|kotlin/Int|): R|kotlin/Unit| { } public final fun select(vararg x: R|kotlin/Array|): R|K| { - ^select R|/x|.R|FakeOverride|(Int(0)) + ^select R|/x|.R|SubstitutionOverride|(Int(0)) } public final fun id(x: R|T|): R|T| { ^id R|/x| @@ -11,7 +11,7 @@ FILE: flowFromInplaceLambda.kt ^materialize Null(null)!! } public final fun myRun(block: R|() -> R|): R|R| { - ^myRun R|/block|.R|FakeOverride|() + ^myRun R|/block|.R|SubstitutionOverride|() } public final fun test_1(x: R|kotlin/Any|): R|kotlin/Unit| { R|kotlin/run|( = run@fun (): R|kotlin/Int| { diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot index b47aa41cfbe..eaa243f263c 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot @@ -358,7 +358,7 @@ digraph jumps_kt { subgraph cluster_36 { color=blue 120 [label="Enter block"]; - 121 [label="Function call: R|/block|.R|FakeOverride|()"]; + 121 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; 122 [label="Exit block"]; } 123 [label="Exit function run" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.txt index 407edd0f5a1..70b306b1ba8 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.txt +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.txt @@ -52,7 +52,7 @@ FILE: jumps.kt } public final inline fun run(block: R|() -> kotlin/Unit|): R|kotlin/Unit| { - R|/block|.R|FakeOverride|() + R|/block|.R|SubstitutionOverride|() } public final fun test_6(): R|kotlin/Unit| { R|/run|( = run@fun (): R|kotlin/Unit| { diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.dot index 57acba80ead..ba85a36cc4b 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.dot @@ -94,8 +94,8 @@ digraph lambdaAsReturnOfLambda_kt { subgraph cluster_10 { color=blue 28 [label="Enter block"]; - 29 [label="Function call: R|/block|.R|FakeOverride|()"]; - 30 [label="Jump: ^run R|/block|.R|FakeOverride|()"]; + 29 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; + 30 [label="Jump: ^run R|/block|.R|SubstitutionOverride|()"]; 31 [label="Stub" style="filled" fillcolor=gray]; 32 [label="Exit block" style="filled" fillcolor=gray]; } diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.txt index de61711d288..69310a90f05 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.txt +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.txt @@ -10,5 +10,5 @@ FILE: lambdaAsReturnOfLambda.kt public final fun bar(s: R|kotlin/String|): R|kotlin/Unit| { } public final fun run(block: R|() -> R|): R|R| { - ^run R|/block|.R|FakeOverride|() + ^run R|/block|.R|SubstitutionOverride|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.dot index 2d4159aa89d..8c9a84341e4 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.dot @@ -9,7 +9,7 @@ digraph lambdas_kt { subgraph cluster_1 { color=blue 1 [label="Enter block"]; - 2 [label="Function call: R|/block|.R|FakeOverride|()"]; + 2 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; 3 [label="Exit block"]; } 4 [label="Exit function run" style="filled" fillcolor=red]; @@ -166,7 +166,7 @@ digraph lambdas_kt { subgraph cluster_17 { color=blue 54 [label="Enter block"]; - 55 [label="Function call: R|/block|.R|FakeOverride|()"]; + 55 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; 56 [label="Const: Int(1)"]; 57 [label="Jump: ^getInt Int(1)"]; 58 [label="Stub" style="filled" fillcolor=gray]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.txt index d3cd05f2903..602beccfbad 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.txt +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.txt @@ -1,6 +1,6 @@ FILE: lambdas.kt public final inline fun run(block: R|() -> kotlin/Unit|): R|kotlin/Unit| { - R|/block|.R|FakeOverride|() + R|/block|.R|SubstitutionOverride|() } public final fun test_1(x: R|kotlin/Any?|): R|kotlin/Unit| { when () { @@ -25,7 +25,7 @@ FILE: lambdas.kt } public final inline fun getInt(block: R|() -> kotlin/Unit|): R|kotlin/Int| { - R|/block|.R|FakeOverride|() + R|/block|.R|SubstitutionOverride|() ^getInt Int(1) } public final fun test_3(): R|kotlin/Int| { diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot index 48c18690863..a74efc7b0e4 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot @@ -9,8 +9,8 @@ digraph localClassesWithImplicit_kt { subgraph cluster_1 { color=blue 1 [label="Enter block"]; - 2 [label="Function call: R|/block|.R|FakeOverride|()"]; - 3 [label="Jump: ^myRun R|/block|.R|FakeOverride|()"]; + 2 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; + 3 [label="Jump: ^myRun R|/block|.R|SubstitutionOverride|()"]; 4 [label="Stub" style="filled" fillcolor=gray]; 5 [label="Exit block" style="filled" fillcolor=gray]; } diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.txt index ff1a208629b..3e229b140ad 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.txt +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.txt @@ -1,6 +1,6 @@ FILE: localClassesWithImplicit.kt public final inline fun myRun(block: R|() -> T|): R|T| { - ^myRun R|/block|.R|FakeOverride|() + ^myRun R|/block|.R|SubstitutionOverride|() } public final fun test(a: R|kotlin/Any|, b: R|kotlin/Any|): R|kotlin/Unit| { when () { diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot index dcb5e82787b..5979ab952e7 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot @@ -9,7 +9,7 @@ digraph propertiesAndInitBlocks_kt { subgraph cluster_1 { color=blue 1 [label="Enter block"]; - 2 [label="Function call: R|/block|.R|FakeOverride|()"]; + 2 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; 3 [label="Exit block"]; } 4 [label="Exit function run" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.txt index 392deb388ef..6f5c52dafee 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.txt +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.txt @@ -1,6 +1,6 @@ FILE: propertiesAndInitBlocks.kt public final inline fun run(block: R|() -> kotlin/Unit|): R|kotlin/Unit| { - R|/block|.R|FakeOverride|() + R|/block|.R|SubstitutionOverride|() } public final val x1: R|kotlin/Int| = Int(1) public get(): R|kotlin/Int| diff --git a/compiler/fir/analysis-tests/testData/resolve/constantValues.txt b/compiler/fir/analysis-tests/testData/resolve/constantValues.txt index 9eb98c7d42e..d4ece21144a 100644 --- a/compiler/fir/analysis-tests/testData/resolve/constantValues.txt +++ b/compiler/fir/analysis-tests/testData/resolve/constantValues.txt @@ -85,12 +85,12 @@ FILE: constantValues.kt } public final fun getArgumentType(): R|KotlinType| { - when (this@R|/KClassValue|.R|FakeOverride|) { + when (this@R|/KClassValue|.R|SubstitutionOverride|) { ($subj$ is R|KClassValue.Value.LocalClass|) -> { - ^getArgumentType this@R|/KClassValue|.R|FakeOverride|.R|/KClassValue.Value.LocalClass.type| + ^getArgumentType this@R|/KClassValue|.R|SubstitutionOverride|.R|/KClassValue.Value.LocalClass.type| } ($subj$ is R|KClassValue.Value.NormalClass|) -> { - lval : R|ClassLiteralValue| = this@R|/KClassValue|.R|FakeOverride|.R|/KClassValue.Value.NormalClass.value| + lval : R|ClassLiteralValue| = this@R|/KClassValue|.R|SubstitutionOverride|.R|/KClassValue.Value.NormalClass.value| lval classId: R|ClassId| = R|/|.R|/ClassLiteralValue.component1|() lval arrayDimensions: R|kotlin/Int| = R|/|.R|/ClassLiteralValue.component2|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.txt index 3ade51617c5..03d12b5be37 100644 --- a/compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.txt +++ b/compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.txt @@ -42,18 +42,18 @@ FILE: delegateInference.kt public final var x: R|kotlin/Boolean|by R|/FreezableVar.FreezableVar|(Boolean(true)) public get(): R|kotlin/Boolean| { - ^ this@R|/Test|.D|/Test.x|.R|FakeOverride|(this@R|/Test|, ::R|/Test.x|) + ^ this@R|/Test|.D|/Test.x|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.x|) } public set(: R|kotlin/Boolean|): R|kotlin/Unit| { - this@R|/Test|.D|/Test.x|.R|FakeOverride|(this@R|/Test|, ::R|/Test.x|, R|/x|) + this@R|/Test|.D|/Test.x|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.x|, R|/x|) } public final var y: R|kotlin/String|by R|/FreezableVar.FreezableVar|(String()) public get(): R|kotlin/String| { - ^ this@R|/Test|.D|/Test.y|.R|FakeOverride|(this@R|/Test|, ::R|/Test.y|) + ^ this@R|/Test|.D|/Test.y|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.y|) } public set(: R|kotlin/String|): R|kotlin/Unit| { - this@R|/Test|.D|/Test.y|.R|FakeOverride|(this@R|/Test|, ::R|/Test.y|, R|/y|) + this@R|/Test|.D|/Test.y|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.y|, R|/y|) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.txt index 3ef531fe1e7..53dcfa22d92 100644 --- a/compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.txt +++ b/compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.txt @@ -13,7 +13,7 @@ FILE: delegateWithLambda.kt } public final fun lazy(block: R|() -> T|): R|LazyDelegate| { - ^lazy R|/LazyDelegate.LazyDelegate|(R|/block|.R|FakeOverride|()) + ^lazy R|/LazyDelegate.LazyDelegate|(R|/block|.R|SubstitutionOverride|()) } public final fun getAny(): R|kotlin/Any?| { ^getAny Null(null) @@ -29,7 +29,7 @@ FILE: delegateWithLambda.kt } ) public get(): R|kotlin/String| { - ^ this@R|/Test|.D|/Test.x|.R|FakeOverride|(this@R|/Test|, ::R|/Test.x|) + ^ this@R|/Test|.D|/Test.x|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.x|) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGenericGetValue.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGenericGetValue.txt index bbc7fc040cc..016df2dc72f 100644 --- a/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGenericGetValue.txt +++ b/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGenericGetValue.txt @@ -1,6 +1,6 @@ FILE: extensionGenericGetValue.kt public final inline fun runLogged(action: R|() -> L|): R|L| { - ^runLogged R|/action|.R|FakeOverride|() + ^runLogged R|/action|.R|SubstitutionOverride|() } public final operator fun R|V|.getValue(receiver: R|kotlin/Any?|, p: R|kotlin/Any|): R|V| { ^getValue R|/runLogged|( = runLogged@fun (): R|V| { diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGetValueWithTypeVariableAsReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGetValueWithTypeVariableAsReceiver.txt index 658adcd678f..900eba0d010 100644 --- a/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGetValueWithTypeVariableAsReceiver.txt +++ b/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGetValueWithTypeVariableAsReceiver.txt @@ -1,6 +1,6 @@ FILE: extensionGetValueWithTypeVariableAsReceiver.kt public final inline fun runLogged(action: R|() -> L|): R|L| { - ^runLogged R|/action|.R|FakeOverride|() + ^runLogged R|/action|.R|SubstitutionOverride|() } public final operator fun R|kotlin/String|.getValue(receiver: R|kotlin/Any?|, p: R|kotlin/Any|): R|kotlin/String| { ^getValue R|/runLogged|( = runLogged@fun (): R|kotlin/String| { diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.txt index 311e74b6499..baec6ec1789 100644 --- a/compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.txt +++ b/compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.txt @@ -31,10 +31,10 @@ FILE: kt41982.kt } ) public get(): R|kotlin/Long| { - ^ this@R|/Test|.D|/Test.start|.R|FakeOverride|(this@R|/Test|, ::R|/Test.start|) + ^ this@R|/Test|.D|/Test.start|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.start|) } public set(: R|kotlin/Long|): R|kotlin/Unit| { - this@R|/Test|.D|/Test.start|.R|FakeOverride|(this@R|/Test|, ::R|/Test.start|, R|/start|) + this@R|/Test|.D|/Test.start|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.start|, R|/start|) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.txt index 3e0eb65efa5..a1eda8acb41 100644 --- a/compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.txt +++ b/compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.txt @@ -38,9 +38,9 @@ FILE: provideDelegate.kt super() } - public final val x: R|kotlin/Int|by R|/delegate|(Int(1)).R|FakeOverride|>|(this@R|/A|, ::R|/A.x|) + public final val x: R|kotlin/Int|by R|/delegate|(Int(1)).R|SubstitutionOverride|>|(this@R|/A|, ::R|/A.x|) public get(): R|kotlin/Int| { - ^ this@R|/A|.D|/A.x|.R|FakeOverride|(this@R|/A|, ::R|/A.x|) + ^ this@R|/A|.D|/A.x|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.x|) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.txt index 8c5f49a4850..2c4f21a6b1b 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.txt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.txt @@ -83,31 +83,31 @@ FILE: conflictingProjection.kt } public final fun test1(): R|Outer.Intermediate.Inner| { - ^test1 R|/Outer.Outer|().R|/Outer.Intermediate.Intermediate|().R|/Outer.Intermediate.Inner.Inner|() + ^test1 R|/Outer.Outer|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test2(): R|Outer.Intermediate.Inner| { - ^test2 R|/Outer.Outer|().R|/Outer.Intermediate.Intermediate|().R|/Outer.Intermediate.Inner.Inner|() + ^test2 R|/Outer.Outer|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test3(): R|Outer.Intermediate.Inner| { - ^test3 R|/Outer.Outer|().R|/Outer.Intermediate.Intermediate|().R|/Outer.Intermediate.Inner.Inner|() + ^test3 R|/Outer.Outer|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test4(): R|Outer.Intermediate.Inner| { - ^test4 R|/Outer.Outer|().R|/Outer.Intermediate.Intermediate|().R|/Outer.Intermediate.Inner.Inner|() + ^test4 R|/Outer.Outer|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test5(): R|Outer.Intermediate.Inner| { - ^test5 R|/Outer.Outer|().R|/Outer.Intermediate.Intermediate|().R|/Outer.Intermediate.Inner.Inner|() + ^test5 R|/Outer.Outer|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test6(): R|Outer.Intermediate.Inner| { - ^test6 R|/Outer.Outer|().R|/Outer.Intermediate.Intermediate|().R|/Outer.Intermediate.Inner.Inner|() + ^test6 R|/Outer.Outer|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test7(): R|Outer.Intermediate.Inner| { - ^test7 R|/Outer.Outer|().R|/Outer.Intermediate.Intermediate|().R|/Outer.Intermediate.Inner.Inner|() + ^test7 R|/Outer.Outer|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test8(): R|Outer.Intermediate.Inner| { - ^test8 R|/Outer.Outer|().R|/Outer.Intermediate.Intermediate|().R|/Outer.Intermediate.Inner.Inner|() + ^test8 R|/Outer.Outer|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test9(): R|Outer.Intermediate.Inner| { - ^test9 R|/Outer.Outer|().R|/Outer.Intermediate.Intermediate|().R|/Outer.Intermediate.Inner.Inner|() + ^test9 R|/Outer.Outer|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final class InOuter : R|kotlin/Any| { public constructor(): R|InOuter| { @@ -130,29 +130,29 @@ FILE: conflictingProjection.kt } public final fun test10(): R|InOuter.OutIntermediate.InInner| { - ^test10 R|/InOuter.InOuter|().R|/InOuter.OutIntermediate.OutIntermediate|().R|/InOuter.OutIntermediate.InInner.InInner|() + ^test10 R|/InOuter.InOuter|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test11(): R|InOuter.OutIntermediate.InInner| { - ^test11 R|/InOuter.InOuter|().R|/InOuter.OutIntermediate.OutIntermediate|().R|/InOuter.OutIntermediate.InInner.InInner|() + ^test11 R|/InOuter.InOuter|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test12(): R|InOuter.OutIntermediate.InInner| { - ^test12 R|/InOuter.InOuter|().R|/InOuter.OutIntermediate.OutIntermediate|().R|/InOuter.OutIntermediate.InInner.InInner|() + ^test12 R|/InOuter.InOuter|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test13(): R|InOuter.OutIntermediate.InInner| { - ^test13 R|/InOuter.InOuter|().R|/InOuter.OutIntermediate.OutIntermediate|().R|/InOuter.OutIntermediate.InInner.InInner|() + ^test13 R|/InOuter.InOuter|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test14(): R|InOuter.OutIntermediate.InInner| { - ^test14 R|/InOuter.InOuter|().R|/InOuter.OutIntermediate.OutIntermediate|().R|/InOuter.OutIntermediate.InInner.InInner|() + ^test14 R|/InOuter.InOuter|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test15(): R|InOuter.OutIntermediate.InInner| { - ^test15 R|/InOuter.InOuter|().R|/InOuter.OutIntermediate.OutIntermediate|().R|/InOuter.OutIntermediate.InInner.InInner|() + ^test15 R|/InOuter.InOuter|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test16(): R|InOuter.OutIntermediate.InInner| { - ^test16 R|/InOuter.InOuter|().R|/InOuter.OutIntermediate.OutIntermediate|().R|/InOuter.OutIntermediate.InInner.InInner|() + ^test16 R|/InOuter.InOuter|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test17(): R|InOuter.OutIntermediate.InInner| { - ^test17 R|/InOuter.InOuter|().R|/InOuter.OutIntermediate.OutIntermediate|().R|/InOuter.OutIntermediate.InInner.InInner|() + ^test17 R|/InOuter.InOuter|().R|SubstitutionOverride|().R|SubstitutionOverride|() } public final fun test18(): R|InOuter.OutIntermediate.InInner| { - ^test18 R|/InOuter.InOuter|().R|/InOuter.OutIntermediate.OutIntermediate|().R|/InOuter.OutIntermediate.InInner.InInner|() + ^test18 R|/InOuter.InOuter|().R|SubstitutionOverride|().R|SubstitutionOverride|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/repeatedModifier.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/repeatedModifier.txt index c339f7936ce..43eb722de0c 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/repeatedModifier.txt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/repeatedModifier.txt @@ -29,7 +29,7 @@ FILE: repeatedModifier.kt } public final inline fun foo(f: R|(kotlin/Int) -> kotlin/Int|): R|kotlin/Int| { - ^foo R|/f|.R|FakeOverride|(Int(8)) + ^foo R|/f|.R|SubstitutionOverride|(Int(8)) } public final static fun values(): R|kotlin/Array| { diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.txt index 8df815368a9..c77236154d8 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.txt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.txt @@ -5,7 +5,7 @@ FILE: KotlinImporterComponent.kt } public final class State : R|kotlin/Any| { - public constructor(directories: R|kotlin/collections/List| = R|java/util/ArrayList.ArrayList|!|>()): R|simulation/KotlinImporterComponent.State| { + public constructor(directories: R|kotlin/collections/List| = R|SubstitutionOverride|!|>()): R|simulation/KotlinImporterComponent.State| { super() } diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.txt index f0c353ed66f..e8bd8397e8e 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.txt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.txt @@ -58,9 +58,9 @@ FILE: upperBoundViolated.kt } public final typealias NL = R|NumColl>| - public final val test7: R|NumColl>| = R|/NumColl.NumColl|() + public final val test7: R|NumColl>| = R|SubstitutionOverride|() public get(): R|NumColl>| - public final val test8: R|NumColl>| = R|/NumColl.NumColl|() + public final val test8: R|NumColl>| = R|SubstitutionOverride|() public get(): R|NumColl>| public final class NumberPhile : R|kotlin/Any| { public constructor(x: R|T|): R|NumberPhile| { diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/enumValues.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/enumValues.txt index 1e8da670215..d96ef292b3d 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/enumValues.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/enumValues.txt @@ -20,9 +20,9 @@ FILE: enumValues.kt } public final fun foo(): R|kotlin/Unit| { lval values: R|kotlin/Array| = Q|MyEnum|.R|/MyEnum.values|() - lval : R|kotlin/collections/Iterator| = R|/values|.R|FakeOverride|>|() + lval : R|kotlin/collections/Iterator| = R|/values|.R|SubstitutionOverride|>|() while(R|/|.R|kotlin/collections/Iterator.hasNext|()) { - lval value: R|MyEnum| = R|/|.R|FakeOverride|() + lval value: R|MyEnum| = R|/|.R|SubstitutionOverride|() R|/value|.R|/MyEnum.bar|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/extensionPropertyInLambda.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/extensionPropertyInLambda.txt index acd41b9fc22..72d2d257345 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/extensionPropertyInLambda.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/extensionPropertyInLambda.txt @@ -11,10 +11,10 @@ FILE: extensionPropertyInLambda.kt } public final var R|C|.y: R|T| public get(): R|T| { - ^ this@R|/y|.R|FakeOverride| + ^ this@R|/y|.R|SubstitutionOverride| } public set(v: R|T|): R|kotlin/Unit| { - this@R|/y|.R|FakeOverride| = R|/v| + this@R|/y|.R|SubstitutionOverride| = R|/v| } public final fun use(f: R|() -> kotlin/String|): R|kotlin/Unit| { } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDescriptor.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDescriptor.txt index 4d2c9cb4251..441439f3fca 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDescriptor.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDescriptor.txt @@ -12,7 +12,7 @@ FILE: test.kt } public final fun test(call: R|Call|, resolvedCall: R|ResolvedCall|): R|kotlin/Unit| { - R|/call|.R|FakeOverride|.R|/name| + R|/call|.R|SubstitutionOverride|.R|/name| R|/resolvedCall|.R|/ResolvedCall.resultingDescriptor|.R|/name| lval resolvedDescriptor: R|D?| = R|/resolvedCall|.R|/ResolvedCall.candidateDescriptor| when () { @@ -24,6 +24,6 @@ FILE: test.kt R|/resolvedDescriptor|.R|/foo|() } public final fun otherTest(call: R|Call<*>|, resolvedCall: R|ResolvedCall<*>|): R|kotlin/Unit| { - R|/call|.R|FakeOverride|.R|/name| + R|/call|.R|SubstitutionOverride|.R|/name| R|/resolvedCall|.R|/ResolvedCall.resultingDescriptor|.R|/name| } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.txt index ec1726a5346..5e723192c7e 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.txt @@ -16,7 +16,7 @@ FILE: test.kt private final val DERIVED_FACTORY: R|DiagnosticFactory0!>| = R|/DiagnosticFactory0.DiagnosticFactory0|!|>() private get(): R|DiagnosticFactory0!>| public final fun createViaFactory(d: R|EmptyDiagnostic|): R|kotlin/Unit| { - lval casted: R|Diagnostic!>| = R|/DERIVED_FACTORY|.R|FakeOverride!>|>|(R|/d|) + lval casted: R|Diagnostic!>| = R|/DERIVED_FACTORY|.R|SubstitutionOverride!>|>|(R|/d|) lval element: R|DerivedElement| = R|/casted|.R|/Diagnostic.element| R|/Fix.Fix|(R|/element|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericPropertyAccess.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericPropertyAccess.txt index 3d7076022f0..35ebf944b80 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericPropertyAccess.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericPropertyAccess.txt @@ -16,7 +16,7 @@ FILE: genericPropertyAccess.kt } public final override fun foo(): R|T| { - ^foo this@R|/Derived|.R|FakeOverride| + ^foo this@R|/Derived|.R|SubstitutionOverride| } } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericUsedInFunction.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericUsedInFunction.txt index 284a9885066..35d34368812 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericUsedInFunction.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericUsedInFunction.txt @@ -13,7 +13,7 @@ FILE: genericUsedInFunction.kt } public final fun test(arg: R|Generic|): R|kotlin/Unit| { - lval value: R|kotlin/String| = R|/arg|.R|FakeOverride| - lval foo: R|kotlin/String| = R|/arg|.R|FakeOverride|() + lval value: R|kotlin/String| = R|/arg|.R|SubstitutionOverride| + lval foo: R|kotlin/String| = R|/arg|.R|SubstitutionOverride|() lval length: R|kotlin/Int| = R|/foo|.R|kotlin/String.length|.R|kotlin/Int.plus|(R|/value|.R|kotlin/String.length|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/importedReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/importedReceiver.txt index a047d4a4cda..0a2914df604 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/importedReceiver.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/importedReceiver.txt @@ -31,5 +31,5 @@ FILE: importedReceiver.kt Q|My|.R|/My.baz|() (Q|My|, Boolean(true)).R|/My.gau|() Q|My|.R|/Your.wat|() - (Q|My|, Boolean(false)).R|FakeOverride|() + (Q|My|, Boolean(false)).R|SubstitutionOverride|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/doubleBrackets.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/doubleBrackets.txt index 0fcd2c6aef3..d064ae533b2 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/doubleBrackets.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/doubleBrackets.txt @@ -6,5 +6,5 @@ FILE: doubleBrackets.kt } public final fun test(): R|kotlin/String| { - ^test String(hello).R|/k|().R|FakeOverride|() + ^test String(hello).R|/k|().R|SubstitutionOverride|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionOnObject.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionOnObject.txt index e06749e0a33..00ef41fafa9 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionOnObject.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionOnObject.txt @@ -11,9 +11,9 @@ FILE: extensionOnObject.kt } public final fun f(op: R|X.() -> kotlin/Unit|): R|kotlin/Unit| { - R|/op|.R|FakeOverride|(Q|X|) + R|/op|.R|SubstitutionOverride|(Q|X|) lval x: R|X| = Q|X| - R|/op|.R|FakeOverride|(R|/x|) + R|/op|.R|SubstitutionOverride|(R|/x|) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.txt index 0a5eb0499b1..5078d087b98 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.txt @@ -1,5 +1,5 @@ FILE: extensionSafeCall.kt public final fun bar(doIt: R|kotlin/Int.() -> kotlin/Int|): R|kotlin/Unit| { lval i: R|kotlin/Int?| = Int(1) - R|/i|?.{ R|/doIt|.R|FakeOverride|($subj$) } + R|/i|?.{ R|/doIt|.R|SubstitutionOverride|($subj$) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/inBrackets.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/inBrackets.txt index 76ef1884c37..25921aa62b3 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/inBrackets.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/inBrackets.txt @@ -1,5 +1,5 @@ FILE: inBrackets.kt public final fun test(e: R|kotlin/Int.() -> kotlin/String|): R|kotlin/Unit| { - lval s: R|kotlin/String| = R|/e|.R|FakeOverride|(Int(3)) - lval ss: R|kotlin/String| = R|/e|.R|FakeOverride|(Int(3)) + lval s: R|kotlin/String| = R|/e|.R|SubstitutionOverride|(Int(3)) + lval ss: R|kotlin/String| = R|/e|.R|SubstitutionOverride|(Int(3)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyFromParameter.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyFromParameter.txt index a0dbdbf1cf1..b52703252b3 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyFromParameter.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyFromParameter.txt @@ -4,7 +4,7 @@ FILE: propertyFromParameter.kt super() } - public final val name: R|kotlin/String| = R|/name|.R|FakeOverride|() + public final val name: R|kotlin/String| = R|/name|.R|SubstitutionOverride|() public get(): R|kotlin/String| } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyWithExtensionType.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyWithExtensionType.txt index 0902da269bd..8cdce0b7980 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyWithExtensionType.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyWithExtensionType.txt @@ -15,10 +15,10 @@ FILE: propertyWithExtensionType.kt when () { !=(R|/a|.R|/A.x|, Null(null)) -> { lval b: R|kotlin/String.() -> kotlin/Unit| = R|/a|.R|/A.x| - R|/b|.R|FakeOverride|(String()) + R|/b|.R|SubstitutionOverride|(String()) } } lval c: R|kotlin/String.() -> kotlin/Int| = R|/a|.R|/A.y| - lval d: R|kotlin/Int| = R|/c|.R|FakeOverride|(String()) + lval d: R|kotlin/Int| = R|/c|.R|SubstitutionOverride|(String()) } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.txt index 9de0198e18e..89bb1a4657b 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.txt @@ -23,18 +23,18 @@ FILE: threeReceiversCorrect.kt } public final fun with(arg: R|T|, f: R|T.() -> R|): R|R| { - ^with R|/f|.R|FakeOverride|(R|/arg|) + ^with R|/f|.R|SubstitutionOverride|(R|/arg|) } public final fun test(a: R|A|, b: R|B|, c: R|C|): R|kotlin/Unit| { R|/with|(R|/a|, = with@fun R|A|.(): R|kotlin/Unit| { R|/with|(R|/c|, = with@fun R|C|.(): R|kotlin/Unit| { - (this@R|special/anonymous|, R|/b|).R|/A.foo|.R|FakeOverride|(R|/c|) + (this@R|special/anonymous|, R|/b|).R|/A.foo|.R|SubstitutionOverride|(R|/c|) } ) ^ R|/with|(R|/b|, = with@fun R|B|.(): R|kotlin/Unit| { - (this@R|special/anonymous|, this@R|special/anonymous|).R|/A.foo|.R|FakeOverride|(R|/c|) + (this@R|special/anonymous|, this@R|special/anonymous|).R|/A.foo|.R|SubstitutionOverride|(R|/c|) ^ R|/with|(R|/c|, = with@fun R|C|.(): R|kotlin/Unit| { - (this@R|special/anonymous|, this@R|special/anonymous|).R|/A.foo|.R|FakeOverride|(this@R|special/anonymous|) + (this@R|special/anonymous|, this@R|special/anonymous|).R|/A.foo|.R|SubstitutionOverride|(this@R|special/anonymous|) } ) } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/lambda.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/lambda.txt index a250f63d58b..f70f440369d 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/lambda.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/lambda.txt @@ -27,12 +27,12 @@ FILE: lambda.kt lval s: R|kotlin/String| = fun (): R|kotlin/String| { ^ String(OK) } - .R|FakeOverride|() + .R|SubstitutionOverride|() lval f: R|() -> kotlin/String| = fun (): R|kotlin/String| { ^ String(OK) } - lval ss: R|kotlin/String| = R|/f|.R|FakeOverride|() + lval ss: R|kotlin/String| = R|/f|.R|SubstitutionOverride|() lval empty: R|() -> kotlin/Unit| = fun (): R|kotlin/Unit| { ^ Unit } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/lambdaWithReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/lambdaWithReceiver.txt index 7e81775f64d..23237bddc31 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/lambdaWithReceiver.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/lambdaWithReceiver.txt @@ -4,10 +4,10 @@ FILE: lambdaWithReceiver.kt } public final fun myWith(receiver: R|T|, block: R|T.() -> kotlin/Unit|): R|kotlin/Unit| { - R|/block|.R|FakeOverride|(R|/receiver|) + R|/block|.R|SubstitutionOverride|(R|/receiver|) } public final fun R|T|.myApply(block: R|T.() -> kotlin/Unit|): R|kotlin/Unit| { - R|/block|.R|FakeOverride|(this@R|/myApply|) + R|/block|.R|SubstitutionOverride|(this@R|/myApply|) } public final fun withA(block: R|A.() -> kotlin/Unit|): R|kotlin/Unit| { } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt index 8f6ea06016b..f059cc30595 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt @@ -101,7 +101,7 @@ FILE: protectedVisibility.kt } protected final override fun foo(): R|kotlin/Int| { - ^foo this@R|/DerivedGeneric|.super|>.R|FakeOverride|() + ^foo this@R|/DerivedGeneric|.super|>.R|SubstitutionOverride|() } } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/typeAliasConstructor.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/typeAliasConstructor.txt index 2447605b6ff..618092083dc 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/typeAliasConstructor.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/typeAliasConstructor.txt @@ -15,5 +15,5 @@ FILE: typeAliasConstructor.kt public final typealias BB = R|B| public final fun main(): R|kotlin/Unit| { lval x: R|A| = R|/A.A|(Int(1)) - lval y: R|B| = R|/B.B|(String(bb)) + lval y: R|B| = R|SubstitutionOverride|(String(bb)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/functionTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolve/functionTypeAlias.txt index 3e992fd9bde..83fa85a04ab 100644 --- a/compiler/fir/analysis-tests/testData/resolve/functionTypeAlias.txt +++ b/compiler/fir/analysis-tests/testData/resolve/functionTypeAlias.txt @@ -1,7 +1,7 @@ FILE: functionTypeAlias.kt private final typealias A = R|kotlin/String.(kotlin/Int) -> kotlin/Int| private final fun b(a: R|A|): R|kotlin/Unit| { - R|/a|.R|FakeOverride|(String(b), Int(1)) + R|/a|.R|SubstitutionOverride|(String(b), Int(1)) } public final fun main(): R|kotlin/Unit| { R|/b|( = b@fun R|kotlin/String|.(it: R|kotlin/Int|): R|kotlin/Int| { diff --git a/compiler/fir/analysis-tests/testData/resolve/functionTypes.txt b/compiler/fir/analysis-tests/testData/resolve/functionTypes.txt index 78bdd7e25cd..885aecf5230 100644 --- a/compiler/fir/analysis-tests/testData/resolve/functionTypes.txt +++ b/compiler/fir/analysis-tests/testData/resolve/functionTypes.txt @@ -1,11 +1,11 @@ FILE: functionTypes.kt public final fun simpleRun(f: R|(T) -> kotlin/Unit|): R|kotlin/Unit| { - ^simpleRun R|/f|.R|FakeOverride|(^simpleRun Unit) + ^simpleRun R|/f|.R|SubstitutionOverride|(^simpleRun Unit) } public final fun R|kotlin/collections/List|.simpleMap(f: R|(T) -> R|): R|R| { } public final fun simpleWith(t: R|T|, f: R|T.() -> kotlin/Unit|): R|kotlin/Unit| { - ^simpleWith R|/f|.R|FakeOverride|(R|/t|) + ^simpleWith R|/f|.R|SubstitutionOverride|(R|/t|) } public abstract interface KMutableProperty1 : R|KProperty1|, R|KMutableProperty| { } diff --git a/compiler/fir/analysis-tests/testData/resolve/genericConstructors.txt b/compiler/fir/analysis-tests/testData/resolve/genericConstructors.txt index 44984e9ec4d..73d33ac0a74 100644 --- a/compiler/fir/analysis-tests/testData/resolve/genericConstructors.txt +++ b/compiler/fir/analysis-tests/testData/resolve/genericConstructors.txt @@ -30,7 +30,7 @@ FILE: genericConstructors.kt } public final fun bar(): R|kotlin/Unit| { - this@R|/C|.R|FakeOverride|>|.R|FakeOverride|(String()) + this@R|/C|.R|SubstitutionOverride|>|.R|SubstitutionOverride|(String()) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/implicitTypeInFakeOverride.txt b/compiler/fir/analysis-tests/testData/resolve/implicitTypeInFakeOverride.txt index 2364ecf0b80..0866280a334 100644 --- a/compiler/fir/analysis-tests/testData/resolve/implicitTypeInFakeOverride.txt +++ b/compiler/fir/analysis-tests/testData/resolve/implicitTypeInFakeOverride.txt @@ -1,6 +1,6 @@ FILE: implicitTypeInFakeOverride.kt public final fun extract(x: R|Out|): R|K| { - ^extract R|/x|.R|FakeOverride|() + ^extract R|/x|.R|SubstitutionOverride|() } public final class Out : R|kotlin/Any| { public constructor(x: R|T|): R|Out| { diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/lambdaAsReturnStatementOfLambda.txt b/compiler/fir/analysis-tests/testData/resolve/inference/lambdaAsReturnStatementOfLambda.txt index 2cc62a5cf6e..cbf479d8627 100644 --- a/compiler/fir/analysis-tests/testData/resolve/inference/lambdaAsReturnStatementOfLambda.txt +++ b/compiler/fir/analysis-tests/testData/resolve/inference/lambdaAsReturnStatementOfLambda.txt @@ -13,7 +13,7 @@ FILE: lambdaAsReturnStatementOfLambda.kt } ) - lval alsoA: R|A| = R|/lambda|.R|FakeOverride|() + lval alsoA: R|A| = R|/lambda|.R|SubstitutionOverride|() R|/takeA|(R|/alsoA|) } public final fun takeA(a: R|A|): R|kotlin/Unit| { diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/lambdaInElvis.txt b/compiler/fir/analysis-tests/testData/resolve/inference/lambdaInElvis.txt index a590d3ccedc..89685979c73 100644 --- a/compiler/fir/analysis-tests/testData/resolve/inference/lambdaInElvis.txt +++ b/compiler/fir/analysis-tests/testData/resolve/inference/lambdaInElvis.txt @@ -9,13 +9,13 @@ FILE: lambdaInElvis.kt } public final fun bar1(w: R|kotlin/collections/List|): R|kotlin/collections/List?| { ^bar1 R|/foo|( = foo@fun (container: R|kotlin/collections/MutableList|): R|kotlin/Unit| { - R|/container|.R|FakeOverride|(String()) + R|/container|.R|SubstitutionOverride|(String()) } ) ?: R|/w| } public final fun bar2(): R|kotlin/collections/List?| { ^bar2 R|/foo|( = foo@fun (container: R|kotlin/collections/MutableList|): R|kotlin/Unit| { - R|/container|.R|FakeOverride|(String()) + R|/container|.R|SubstitutionOverride|(String()) } ) ?: R|/listOf|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/nestedExtensionFunctionType.txt b/compiler/fir/analysis-tests/testData/resolve/inference/nestedExtensionFunctionType.txt index 9306a470f7f..19ed267189d 100644 --- a/compiler/fir/analysis-tests/testData/resolve/inference/nestedExtensionFunctionType.txt +++ b/compiler/fir/analysis-tests/testData/resolve/inference/nestedExtensionFunctionType.txt @@ -2,21 +2,21 @@ FILE: nestedExtensionFunctionType.kt public abstract interface A : R|kotlin/Any| { } public final fun test_0(a: R|A|, f: R|A.() -> kotlin/Unit|): R|kotlin/Unit| { - R|/f|.R|FakeOverride|(R|/a|) + R|/f|.R|SubstitutionOverride|(R|/a|) } public final fun test_1(a: R|A|, ys: R|kotlin/collections/List<@ExtensionFunctionType kotlin/Function1>|): R|kotlin/Unit| { - lval : R|kotlin/collections/Iterator<@ExtensionFunctionType kotlin/Function1>| = R|/ys|.R|FakeOverride>|>|() + lval : R|kotlin/collections/Iterator<@ExtensionFunctionType kotlin/Function1>| = R|/ys|.R|SubstitutionOverride>|>|() while(R|/|.R|kotlin/collections/Iterator.hasNext|()) { - lval y: R|(A) -> kotlin/Unit| = R|/|.R|FakeOverride kotlin/Unit|>|() - R|/y|.R|FakeOverride|(R|/a|) + lval y: R|(A) -> kotlin/Unit| = R|/|.R|SubstitutionOverride kotlin/Unit|>|() + R|/y|.R|SubstitutionOverride|(R|/a|) } } public final fun test_2(a: R|A|, vararg zs: @R|kotlin/ExtensionFunctionType|() R|kotlin/Array>|): R|kotlin/Unit| { - lval : R|kotlin/collections/Iterator<@ExtensionFunctionType kotlin/Function1>| = R|/zs|.R|FakeOverride)>|>|() + lval : R|kotlin/collections/Iterator<@ExtensionFunctionType kotlin/Function1>| = R|/zs|.R|SubstitutionOverride)>|>|() while(R|/|.R|kotlin/collections/Iterator.hasNext|()) { - lval z: R|(A) -> kotlin/Unit| = R|/|.R|FakeOverride kotlin/Unit|>|() - R|/z|.R|FakeOverride|(R|/a|) + lval z: R|(A) -> kotlin/Unit| = R|/|.R|SubstitutionOverride kotlin/Unit|>|() + R|/z|.R|SubstitutionOverride|(R|/a|) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.txt b/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.txt index 5c359a9798e..462119edaac 100644 --- a/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.txt +++ b/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.txt @@ -11,7 +11,7 @@ FILE: receiverWithCapturedType.kt ^getParameterForArgument String() } public final fun R|ResolvedCall|.updateD(d: R|D|): R|D| { - this@R|/updateD|.R|FakeOverride| = R|/d| + this@R|/updateD|.R|SubstitutionOverride| = R|/d| ^updateD R|/d| } public final fun test_1_1(resolvedCall: R|ResolvedCall|): R|kotlin/Unit| { diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/simpleCapturedTypes.txt b/compiler/fir/analysis-tests/testData/resolve/inference/simpleCapturedTypes.txt index c36de9be75a..ecf5def9bd4 100644 --- a/compiler/fir/analysis-tests/testData/resolve/inference/simpleCapturedTypes.txt +++ b/compiler/fir/analysis-tests/testData/resolve/inference/simpleCapturedTypes.txt @@ -19,9 +19,9 @@ FILE: simpleCapturedTypes.kt ^ this@R|/idP| } private final fun getSetterInfos(kc: R|KC|): R|kotlin/Unit| { - R|/id|(R|/kc|).R|FakeOverride|.R|/Ann.foo|() - R|/kc|.R|/idR|().R|FakeOverride|.R|/Ann.foo|() - R|/kc|.R|/idP|.R|FakeOverride|.R|/Ann.foo|() + R|/id|(R|/kc|).R|SubstitutionOverride|.R|/Ann.foo|() + R|/kc|.R|/idR|().R|SubstitutionOverride|.R|/Ann.foo|() + R|/kc|.R|/idP|.R|SubstitutionOverride|.R|/Ann.foo|() lval x1: R|KC| = R|/id|(R|/kc|) lval x2: R|KC| = R|/kc|.R|/idR|() lval x3: R|KC| = R|/kc|.R|/idP| diff --git a/compiler/fir/analysis-tests/testData/resolve/invokeInWhenSubjectVariableInitializer.txt b/compiler/fir/analysis-tests/testData/resolve/invokeInWhenSubjectVariableInitializer.txt index 2f43ac33bf6..0f8aea6b542 100644 --- a/compiler/fir/analysis-tests/testData/resolve/invokeInWhenSubjectVariableInitializer.txt +++ b/compiler/fir/analysis-tests/testData/resolve/invokeInWhenSubjectVariableInitializer.txt @@ -1,4 +1,4 @@ FILE: invokeInWhenSubjectVariableInitializer.kt public final fun test(func: R|() -> kotlin/String?|): R|kotlin/Unit| { - lval x: R|kotlin/String| = R|/func|.R|FakeOverride|() ?: String() + lval x: R|kotlin/String| = R|/func|.R|SubstitutionOverride|() ?: String() } diff --git a/compiler/fir/analysis-tests/testData/resolve/invokeOfLambdaWithReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/invokeOfLambdaWithReceiver.txt index 5ca57c3f38d..6d09ea0e37c 100644 --- a/compiler/fir/analysis-tests/testData/resolve/invokeOfLambdaWithReceiver.txt +++ b/compiler/fir/analysis-tests/testData/resolve/invokeOfLambdaWithReceiver.txt @@ -2,12 +2,12 @@ FILE: invokeOfLambdaWithReceiver.kt public abstract interface A : R|kotlin/Any| { } public final fun test(a: R|A|, block: R|A.() -> kotlin/Int|): R|kotlin/Unit| { - R|/block|.R|FakeOverride|(R|/a|) + R|/block|.R|SubstitutionOverride|(R|/a|) } public abstract interface B : R|kotlin/Any| { } public final fun R|B|.otherTest(block: R|B.() -> kotlin/Int|): R|kotlin/Unit| { - R|/block|.R|FakeOverride|(this@R|/otherTest|) + R|/block|.R|SubstitutionOverride|(this@R|/otherTest|) } public final class C : R|kotlin/Any| { public constructor(): R|C| { @@ -15,7 +15,7 @@ FILE: invokeOfLambdaWithReceiver.kt } public final fun anotherTest(block: R|C.() -> kotlin/Int|): R|kotlin/Unit| { - R|/block|.R|FakeOverride|(this@R|/C|) + R|/block|.R|SubstitutionOverride|(this@R|/C|) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/kt41984.txt b/compiler/fir/analysis-tests/testData/resolve/kt41984.txt index bc0de1d73c0..0de2d198e4f 100644 --- a/compiler/fir/analysis-tests/testData/resolve/kt41984.txt +++ b/compiler/fir/analysis-tests/testData/resolve/kt41984.txt @@ -20,7 +20,7 @@ FILE: main.kt } public final fun test_1(b: R|B|, x: R|kotlin/Int|, inv: R|Inv|): R|kotlin/Unit| { - R|/b|.R|FakeOverride|(R|/x|) + R|/b|.R|SubstitutionOverride|(R|/x|) R|/b|.#(Null(null)) - R|/b|.R|FakeOverride|(R|/inv|) + R|/b|.R|SubstitutionOverride|(R|/inv|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/kt41990.txt b/compiler/fir/analysis-tests/testData/resolve/kt41990.txt index dd7c870819b..8f305e5dbd8 100644 --- a/compiler/fir/analysis-tests/testData/resolve/kt41990.txt +++ b/compiler/fir/analysis-tests/testData/resolve/kt41990.txt @@ -3,6 +3,6 @@ FILE: kt41990.kt ^getLambda Null(null)!! } public final fun R|kotlin/String|.test_1(s: R|kotlin/String|): R|kotlin/Unit| { - R|/getLambda|().R|FakeOverride|(this@R|/test_1|) - R|/getLambda|().R|FakeOverride|(R|/s|) + R|/getLambda|().R|SubstitutionOverride|(this@R|/test_1|) + R|/getLambda|().R|SubstitutionOverride|(R|/s|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/lambdaInLhsOfTypeOperatorCall.txt b/compiler/fir/analysis-tests/testData/resolve/lambdaInLhsOfTypeOperatorCall.txt index c0604b85fca..cdbe4d22f72 100644 --- a/compiler/fir/analysis-tests/testData/resolve/lambdaInLhsOfTypeOperatorCall.txt +++ b/compiler/fir/analysis-tests/testData/resolve/lambdaInLhsOfTypeOperatorCall.txt @@ -3,7 +3,7 @@ FILE: lambdaInLhsOfTypeOperatorCall.kt } public final fun test_1(b: R|B|): R|kotlin/Unit| { R|/foo|((R|/b|.R|/myMap|( = myMap@fun (it: R|B|): R|kotlin/Int| { - ^ R|/it|.R|FakeOverride|.R|kotlin/String.length| + ^ R|/it|.R|SubstitutionOverride|.R|kotlin/String.length| } ) as R|B|)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/localObject.txt b/compiler/fir/analysis-tests/testData/resolve/localObject.txt index 3411e16853f..798dfe4fb1b 100644 --- a/compiler/fir/analysis-tests/testData/resolve/localObject.txt +++ b/compiler/fir/analysis-tests/testData/resolve/localObject.txt @@ -1,6 +1,6 @@ FILE: localObject.kt public final fun run(block: R|() -> T|): R|T| { - ^run R|/block|.R|FakeOverride|() + ^run R|/block|.R|SubstitutionOverride|() } public abstract interface Foo : R|kotlin/Any| { public abstract fun foo(): R|kotlin/Int| diff --git a/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt b/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt index 29fb97aca71..39cb646bd3f 100644 --- a/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt +++ b/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt @@ -18,20 +18,20 @@ FILE: innerTypes.kt } public final fun substitute(): R|Outer.Inner| { - ^substitute R|/Outer.Outer|().R|/Outer.Inner.Inner|() + ^substitute R|/Outer.Outer|().R|SubstitutionOverride|() } } public final fun accept(p: R|Outer.Inner|): R|kotlin/Unit| { } - public final val rr: R|Outer.Inner| = R|/Outer.Outer|().R|/Outer.Inner.Inner|() + public final val rr: R|Outer.Inner| = R|/Outer.Outer|().R|SubstitutionOverride|() public get(): R|Outer.Inner| - public final val rrq: R|Outer.Inner| = R|/Boxed.Boxed|().R|FakeOverride|>|() + 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|/Outer.Inner.Inner|()) - #(R|/Outer.Outer|().R|/Outer.Inner.Inner|()) - R|/accept|(R|/Outer.Outer|().R|/Outer.Inner.Inner|()) - #(R|/Boxed.Boxed|().R|FakeOverride|>|()) - R|/accept|(R|/Boxed.Boxed|().R|FakeOverride|>|()) + #(R|/Outer.Outer|().R|SubstitutionOverride|()) + #(R|/Outer.Outer|().R|SubstitutionOverride|()) + R|/accept|(R|/Outer.Outer|().R|SubstitutionOverride|()) + #(R|/Boxed.Boxed|().R|SubstitutionOverride|>|()) + R|/accept|(R|/Boxed.Boxed|().R|SubstitutionOverride|>|()) } diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/protobufExt.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/protobufExt.txt index cc30caa9158..763c233114c 100644 --- a/compiler/fir/analysis-tests/testData/resolve/overrides/protobufExt.txt +++ b/compiler/fir/analysis-tests/testData/resolve/overrides/protobufExt.txt @@ -18,9 +18,9 @@ FILE: protobufExt.kt } public final fun |, T> R|Message|.extF(e: R|Ext|): R|T| { - ^extF this@R|/extF|.R|FakeOverride|(R|/e|) + ^extF this@R|/extF|.R|SubstitutionOverride|(R|/e|) } public final fun foo(m: R|MyMessage|, e: R|MyExt|): R|kotlin/Unit| { - R|/m|.R|FakeOverride|(R|/e|) + R|/m|.R|SubstitutionOverride|(R|/e|) R|/m|.R|/extF|(R|/e|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/simpleFakeOverride.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/simpleFakeOverride.txt index 1b09bc74cfa..f0dc19b8bac 100644 --- a/compiler/fir/analysis-tests/testData/resolve/overrides/simpleFakeOverride.txt +++ b/compiler/fir/analysis-tests/testData/resolve/overrides/simpleFakeOverride.txt @@ -21,7 +21,7 @@ FILE: simpleFakeOverride.kt } public final fun test(): R|kotlin/Unit| { - this@R|/B|.R|FakeOverride|(R|/Some.Some|()) + this@R|/B|.R|SubstitutionOverride|(R|/Some.Some|()) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenerics.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenerics.txt index d149a8ce125..968b92edd2b 100644 --- a/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenerics.txt +++ b/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenerics.txt @@ -19,5 +19,5 @@ FILE: supertypeGenerics.kt } public final fun f(list: R|kotlin/collections/List|, s: R|kotlin/collections/List|): R|kotlin/Unit| { - R|/C.C|().R|FakeOverride|(R|/list|, R|/s|) + R|/C.C|().R|/C.f|(R|/list|, R|/s|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.txt index 36cb9664b7a..01055594087 100644 --- a/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.txt +++ b/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.txt @@ -23,6 +23,6 @@ FILE: supertypeGenericsComplex.kt } public final fun f(list: R|kotlin/collections/MutableList|, s: R|kotlin/collections/MutableList|): R|kotlin/Unit| { - R|/C.C|().R|FakeOverride|(R|/list|, R|/s|) + R|/C.C|().R|SubstitutionOverride|(R|/list|, R|/s|) R|/C.C|().#(R|/s|, R|/list|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.txt b/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.txt index 550b1164784..f816262f368 100644 --- a/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.txt +++ b/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.txt @@ -1,4 +1,4 @@ FILE: main.kt public final fun main(): R|kotlin/Unit| { - R|/JavaClass.JavaClass|!|>(Null(null)).R|FakeOverride!|>|().R|kotlin/String.length| + R|/JavaClass.JavaClass|!|>(Null(null)).R|SubstitutionOverride!|>|().R|kotlin/String.length| } diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/safeCallInvoke.txt b/compiler/fir/analysis-tests/testData/resolve/problems/safeCallInvoke.txt index f9064f2d6aa..897c6475ab9 100644 --- a/compiler/fir/analysis-tests/testData/resolve/problems/safeCallInvoke.txt +++ b/compiler/fir/analysis-tests/testData/resolve/problems/safeCallInvoke.txt @@ -24,6 +24,6 @@ FILE: safeCallInvoke.kt } public final fun main(b: R|B?|): R|kotlin/Unit| { - R|/b|?.{ $subj$.R|/B.bar|.R|FakeOverride|() } + R|/b|?.{ $subj$.R|/B.bar|.R|SubstitutionOverride|() } R|/b|?.{ $subj$.R|/B.foo|.R|/A.invoke|() } } diff --git a/compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.txt b/compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.txt index 8af5f079e5e..35ec125e8b5 100644 --- a/compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.txt +++ b/compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.txt @@ -33,7 +33,7 @@ FILE: recursiveCallOnWhenWithSealedClass.kt throw R|java/lang/Exception.Exception|(String()) } ($subj$ is R|Maybe.Yeah|) -> { - this@R|/Maybe|.R|FakeOverride| + this@R|/Maybe|.R|SubstitutionOverride| } } diff --git a/compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.txt b/compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.txt index 87e94295229..197c7e18a76 100644 --- a/compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.txt +++ b/compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.txt @@ -16,27 +16,27 @@ FILE: referenceToExtension.kt super() } - public final val memberVal: R|GenericTest.A| = R|/GenericTest.A.A|() + public final val memberVal: R|GenericTest.A| = R|SubstitutionOverride|() public get(): R|GenericTest.A| public final fun memberFun(): R|GenericTest.A| { - ^memberFun R|/GenericTest.A.A|() + ^memberFun R|SubstitutionOverride|() } } public final val R|GenericTest.B|.extensionVal: R|GenericTest.A| public get(): R|GenericTest.A| { - ^ R|/GenericTest.A.A|() + ^ R|SubstitutionOverride|() } public final fun R|GenericTest.B|.extensionFun(): R|GenericTest.A| { - ^extensionFun R|/GenericTest.A.A|() + ^extensionFun R|SubstitutionOverride|() } public final fun test_1(): R|kotlin/Unit| { - lval memberValRef: R|kotlin/reflect/KProperty1, GenericTest.A>| = Q|GenericTest.B|::R|FakeOverride|>| - lval memberFunRef: R|kotlin/reflect/KFunction1, GenericTest.A>| = Q|GenericTest.B|::R|FakeOverride|>| + lval memberValRef: R|kotlin/reflect/KProperty1, GenericTest.A>| = Q|GenericTest.B|::R|SubstitutionOverride|>| + lval memberFunRef: R|kotlin/reflect/KFunction1, GenericTest.A>| = Q|GenericTest.B|::R|SubstitutionOverride|>| } public final fun test_2(): R|kotlin/Unit| { 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 da3fec98d59..cc5243f14e3 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot @@ -49,7 +49,7 @@ digraph boundSmartcastsInBranches_kt { 13 [label="Const: Null(null)"]; 14 [label="Variable declaration: lvar goodA: R|A?|"]; 15 [label="Access variable R|/list|"]; - 16 [label="Function call: R|/list|.R|FakeOverride|>|()"]; + 16 [label="Function call: R|/list|.R|SubstitutionOverride|>|()"]; 17 [label="Variable declaration: lval : R|kotlin/collections/Iterator|"]; subgraph cluster_6 { color=blue @@ -68,7 +68,7 @@ digraph boundSmartcastsInBranches_kt { color=blue 24 [label="Enter block"]; 25 [label="Access variable R|/|"]; - 26 [label="Function call: R|/|.R|FakeOverride|()"]; + 26 [label="Function call: R|/|.R|SubstitutionOverride|()"]; 27 [label="Variable declaration: lval a: R|A|"]; subgraph cluster_10 { color=blue diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.txt index e9006007d22..789fa0ae7b8 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.txt @@ -10,9 +10,9 @@ FILE: boundSmartcastsInBranches.kt } public final fun test_0(list: R|kotlin/collections/List|): R|kotlin/Unit| { lvar goodA: R|A?| = Null(null) - lval : R|kotlin/collections/Iterator| = R|/list|.R|FakeOverride|>|() + lval : R|kotlin/collections/Iterator| = R|/list|.R|SubstitutionOverride|>|() while(R|/|.R|kotlin/collections/Iterator.hasNext|()) { - lval a: R|A| = R|/|.R|FakeOverride|() + lval a: R|A| = R|/|.R|SubstitutionOverride|() when () { ==(R|/goodA|, Null(null)) -> { R|/goodA| = R|/a| diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.dot index 84480f9d0b6..b4be8d08174 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.dot @@ -389,8 +389,8 @@ digraph returns_kt { subgraph cluster_37 { color=blue 136 [label="Enter block"]; - 137 [label="Function call: R|/f|.R|FakeOverride|()"]; - 138 [label="Jump: ^runHigherOrder R|/f|.R|FakeOverride|()"]; + 137 [label="Function call: R|/f|.R|SubstitutionOverride|()"]; + 138 [label="Jump: ^runHigherOrder R|/f|.R|SubstitutionOverride|()"]; 139 [label="Stub" style="filled" fillcolor=gray]; 140 [label="Exit block" style="filled" fillcolor=gray]; } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.txt index cedc017b569..aae0e4a5854 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.txt @@ -66,7 +66,7 @@ FILE: returns.kt R|/x|.#() } public final fun runHigherOrder(f: R|() -> T|): R|T| { - ^runHigherOrder R|/f|.R|FakeOverride|() + ^runHigherOrder R|/f|.R|SubstitutionOverride|() } public final val R|kotlin/String|.ext: R|kotlin/Int| public get(): R|kotlin/Int| { diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/kt10240.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/kt10240.txt index ecdf1185447..82fa888bc7c 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/kt10240.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/kt10240.txt @@ -16,7 +16,7 @@ FILE: kt10240.kt ^a R|/c| } public final fun myRun(f: R|() -> kotlin/Unit|): R|kotlin/Unit| { - R|/f|.R|FakeOverride|() + R|/f|.R|SubstitutionOverride|() } public final fun println(arg: R|kotlin/Int|): R|kotlin/Unit| { } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.dot index 24b748b1a0c..0683e33e164 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.dot @@ -25,7 +25,7 @@ digraph smartcastOnLambda_kt { subgraph cluster_4 { color=blue 10 [label="Enter block"]; - 11 [label="Function call: R|/func|.R|FakeOverride|()"]; + 11 [label="Function call: R|/func|.R|SubstitutionOverride|()"]; 12 [label="Exit block"]; } 13 [label="Exit when branch result"]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.txt index 882102eccd7..7dcfd77ab23 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.txt @@ -2,7 +2,7 @@ FILE: smartcastOnLambda.kt public final fun test(func: R|() -> kotlin/Unit|): R|kotlin/Unit| { when () { !=(R|/func|, Null(null)) -> { - R|/func|.R|FakeOverride|() + R|/func|.R|SubstitutionOverride|() } } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/problems/invoke.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/problems/invoke.txt index abe72bc3c04..535c6b51223 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/problems/invoke.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/problems/invoke.txt @@ -2,11 +2,11 @@ FILE: invoke.kt public final fun R|kotlin/Any|.withInvoke(f: R|kotlin/String.() -> kotlin/Unit|): R|kotlin/Unit| { when () { (this@R|/withInvoke| is R|kotlin/String|) -> { - R|/f|.R|FakeOverride|(this@R|/withInvoke|) + R|/f|.R|SubstitutionOverride|(this@R|/withInvoke|) } } } public final fun R|kotlin/String|.withInvoke(f: R|kotlin/String.() -> kotlin/Unit|): R|kotlin/Unit| { - R|/f|.R|FakeOverride|(this@R|/withInvoke|) + R|/f|.R|SubstitutionOverride|(this@R|/withInvoke|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot index 63def262b91..b99487dfc0d 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot @@ -181,7 +181,7 @@ digraph smartcastToNothing_kt { 57 [label="Const: Null(null)"]; 58 [label="Variable declaration: lvar s: R|A?|"]; 59 [label="Access variable R|/results|"]; - 60 [label="Function call: R|/results|.R|FakeOverride|>|()"]; + 60 [label="Function call: R|/results|.R|SubstitutionOverride|>|()"]; 61 [label="Variable declaration: lval : R|kotlin/collections/Iterator|"]; subgraph cluster_18 { color=blue @@ -200,7 +200,7 @@ digraph smartcastToNothing_kt { color=blue 68 [label="Enter block"]; 69 [label="Access variable R|/|"]; - 70 [label="Function call: R|/|.R|FakeOverride|()"]; + 70 [label="Function call: R|/|.R|SubstitutionOverride|()"]; 71 [label="Stub" style="filled" fillcolor=gray]; 72 [label="Variable declaration: lval result: R|kotlin/Nothing|" style="filled" fillcolor=gray]; 73 [label="Access variable R|/result|" style="filled" fillcolor=gray]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.txt index 5e0fbe3650a..bc8f2ab08ec 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.txt +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.txt @@ -30,9 +30,9 @@ FILE: smartcastToNothing.kt } public final fun test_0(results: R|kotlin/collections/List|): R|kotlin/Unit| { lvar s: R|A?| = Null(null) - lval : R|kotlin/collections/Iterator| = R|/results|.R|FakeOverride|>|() + lval : R|kotlin/collections/Iterator| = R|/results|.R|SubstitutionOverride|>|() while(R|/|.R|kotlin/collections/Iterator.hasNext|()) { - lval result: R|kotlin/Nothing| = R|/|.R|FakeOverride|() + lval result: R|kotlin/Nothing| = R|/|.R|SubstitutionOverride|() R|/s| = R|/result| when () { R|/result|.# -> { diff --git a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.txt b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.txt index 399fa0e7a81..605b27477c0 100644 --- a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.txt +++ b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.txt @@ -1,5 +1,5 @@ FILE: main.kt public final fun main(): R|kotlin/Unit| { - Q|Keys|.R|/Keys.getData|!>, kotlin/Array!>?>!|>(Q|Keys|.R|/Keys.X|).R|FakeOverride!|>|(Int(0)).R|kotlin/String.length| + Q|Keys|.R|/Keys.getData|!>, kotlin/Array!>?>!|>(Q|Keys|.R|/Keys.X|).R|SubstitutionOverride!|>|(Int(0)).R|kotlin/String.length| Q|Keys|.R|/Keys.getData|!|>(Q|Keys|.R|/Keys.Y|).R|kotlin/String.length| } diff --git a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.txt b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.txt index cd59407f376..8a458e211f8 100644 --- a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.txt +++ b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.txt @@ -1,5 +1,5 @@ FILE: main.kt public final fun main(x: R|kotlin/collections/MutableCollection>|): R|kotlin/Unit| { lval y: R|ft!>, kotlin/collections/List!>?>!| = Q|ContainerUtil|.R|/ContainerUtil.flatten|!|>(R|/x|) - R|/y|.R|FakeOverride!|>|(Int(0)).R|kotlin/String.length| + R|/y|.R|SubstitutionOverride!|>|(Int(0)).R|kotlin/String.length| } diff --git a/compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.txt b/compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.txt index 791e4be26b4..150abf3b79f 100644 --- a/compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.txt +++ b/compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.txt @@ -22,31 +22,31 @@ FILE: typeAliasWithTypeArguments.kt public final typealias Inv2 = R|Inv| public final typealias Inv3 = R|Inv| public final fun testBase(inv: R|Inv|): R|kotlin/Unit| { - R|/inv|.R|FakeOverride|() - R|/inv|.R|FakeOverride|() + R|/inv|.R|SubstitutionOverride|() + R|/inv|.R|SubstitutionOverride|() } public final fun test_0(inv: R|Inv0|): R|kotlin/Unit| { - R|/inv|.R|FakeOverride|().R|/A.foo|() - R|/inv|.R|FakeOverride|().R|/B.bar|() + R|/inv|.R|SubstitutionOverride|().R|/A.foo|() + R|/inv|.R|SubstitutionOverride|().R|/B.bar|() } public final fun test_1(inv: R|Inv1|): R|kotlin/Unit| { - R|/inv|.R|FakeOverride|().R|/A.foo|() - R|/inv|.R|FakeOverride|().R|/B.bar|() + R|/inv|.R|SubstitutionOverride|().R|/A.foo|() + R|/inv|.R|SubstitutionOverride|().R|/B.bar|() } public final fun test_2(inv: R|Inv2|): R|kotlin/Unit| { - R|/inv|.R|FakeOverride|().R|/A.foo|() - R|/inv|.R|FakeOverride|().R|/B.bar|() + R|/inv|.R|SubstitutionOverride|().R|/A.foo|() + R|/inv|.R|SubstitutionOverride|().R|/B.bar|() } public final fun test_3(inv: R|Inv3|): R|kotlin/Unit| { - R|/inv|.R|FakeOverride|().R|/A.foo|() - R|/inv|.R|FakeOverride|().#() - R|/inv|.R|FakeOverride|().R|/C.baz|() + R|/inv|.R|SubstitutionOverride|().R|/A.foo|() + R|/inv|.R|SubstitutionOverride|().#() + R|/inv|.R|SubstitutionOverride|().R|/C.baz|() } public final typealias Inv02 = R|Inv, C1>| public final fun test_4(inv: R|Inv02|): R|kotlin/Unit| { - R|/inv|.R|FakeOverride|>|().R|FakeOverride|().R|/A.foo|() - R|/inv|.R|FakeOverride|>|().R|FakeOverride|().R|/B.bar|() - R|/inv|.R|FakeOverride|().R|/C.baz|() + R|/inv|.R|SubstitutionOverride|>|().R|SubstitutionOverride|().R|/A.foo|() + R|/inv|.R|SubstitutionOverride|>|().R|SubstitutionOverride|().R|/B.bar|() + R|/inv|.R|SubstitutionOverride|().R|/C.baz|() } public abstract interface In : R|kotlin/Any| { public abstract fun take(x: R|T|): R|kotlin/Unit| @@ -66,20 +66,20 @@ FILE: typeAliasWithTypeArguments.kt public final typealias Out1 = R|Out| public final typealias Invariant1 = R|Invariant| public final fun test_5(a: R|A|, in1: R|In1|, in2: R|In1|, in3: R|In1|): R|kotlin/Unit| { - R|/in1|.R|FakeOverride|(R|/a|) - R|/in2|.R|FakeOverride|(R|/a|) + R|/in1|.R|SubstitutionOverride|(R|/a|) + R|/in2|.R|SubstitutionOverride|(R|/a|) R|/in3|.#(R|/a|) } public final fun test_6(a: R|A|, out1: R|Out1|, out2: R|Out1|, out3: R|Out1|): R|kotlin/Unit| { - R|/out1|.R|FakeOverride|().R|/A.foo|() + R|/out1|.R|SubstitutionOverride|().R|/A.foo|() R|/out2|.#().#() - R|/out3|.R|FakeOverride|().R|/A.foo|() + R|/out3|.R|SubstitutionOverride|().R|/A.foo|() } public final fun test_7(a: R|A|, inv1: R|Invariant1|, inv2: R|Invariant1|, inv3: R|Invariant1|): R|kotlin/Unit| { - R|/inv1|.R|FakeOverride|().R|/A.foo|() - R|/inv2|.R|FakeOverride|().#() - R|/inv3|.R|FakeOverride|().R|/A.foo|() - R|/inv1|.R|FakeOverride|(R|/a|) - R|/inv2|.R|FakeOverride|(R|/a|) + R|/inv1|.R|SubstitutionOverride|().R|/A.foo|() + R|/inv2|.R|SubstitutionOverride|().#() + R|/inv3|.R|SubstitutionOverride|().R|/A.foo|() + R|/inv1|.R|SubstitutionOverride|(R|/a|) + R|/inv2|.R|SubstitutionOverride|(R|/a|) R|/inv3|.#(R|/a|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/types/bareWithSubjectTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolve/types/bareWithSubjectTypeAlias.txt index 4d524ea9d11..8b9a7d06ea7 100644 --- a/compiler/fir/analysis-tests/testData/resolve/types/bareWithSubjectTypeAlias.txt +++ b/compiler/fir/analysis-tests/testData/resolve/types/bareWithSubjectTypeAlias.txt @@ -32,7 +32,7 @@ FILE: bareWithSubjectTypeAlias.kt public final fun foo(): R|kotlin/Unit| { when (lval a: R|TA| = R|/bar|()) { ($subj$ is R|A.B|) -> { - R|/a|.R|FakeOverride|.R|kotlin/CharSequence.length| + R|/a|.R|SubstitutionOverride|.R|kotlin/CharSequence.length| } } diff --git a/compiler/fir/analysis-tests/testData/resolve/varargInPrimaryConstructor.txt b/compiler/fir/analysis-tests/testData/resolve/varargInPrimaryConstructor.txt index 6507993c4bc..d8259c694dd 100644 --- a/compiler/fir/analysis-tests/testData/resolve/varargInPrimaryConstructor.txt +++ b/compiler/fir/analysis-tests/testData/resolve/varargInPrimaryConstructor.txt @@ -9,17 +9,17 @@ FILE: varargInPrimaryConstructor.kt } public final fun test_1(foo: R|Foo|): R|kotlin/Unit| { - lval : R|kotlin/collections/Iterator| = R|/foo|.R|/Foo.strings|.R|FakeOverride|>|() + lval : R|kotlin/collections/Iterator| = R|/foo|.R|/Foo.strings|.R|SubstitutionOverride|>|() while(R|/|.R|kotlin/collections/Iterator.hasNext|()) { - lval s: R|kotlin/String| = R|/|.R|FakeOverride|() + lval s: R|kotlin/String| = R|/|.R|SubstitutionOverride|() R|/s|.R|kotlin/String.length| } } public final fun test_2(vararg strings: R|kotlin/Array|): R|kotlin/Unit| { - lval : R|kotlin/collections/Iterator| = R|/strings|.R|FakeOverride|>|() + lval : R|kotlin/collections/Iterator| = R|/strings|.R|SubstitutionOverride|>|() while(R|/|.R|kotlin/collections/Iterator.hasNext|()) { - lval s: R|kotlin/String| = R|/|.R|FakeOverride|() + lval s: R|kotlin/String| = R|/|.R|SubstitutionOverride|() R|/s|.R|kotlin/String.length| } diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/intersectionOverrideWithImplicitTypes.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/intersectionOverrideWithImplicitTypes.txt index ed2a56aa8bd..0c879152486 100644 --- a/compiler/fir/analysis-tests/testData/resolve/visibility/intersectionOverrideWithImplicitTypes.txt +++ b/compiler/fir/analysis-tests/testData/resolve/visibility/intersectionOverrideWithImplicitTypes.txt @@ -21,7 +21,7 @@ FILE: intersectionOverrideWithImplicitTypes.kt } public abstract interface B : R|Common| { public open override fun foo(value: R|T|, producer: R|(T) -> R|): R|R| { - ^foo R|/producer|.R|FakeOverride|(R|/value|) + ^foo R|/producer|.R|SubstitutionOverride|(R|/value|) } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.txt index 15e3d9ce8e1..466c951f137 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.txt @@ -1,11 +1,11 @@ FILE: addAllOnJavaCollection.kt public final fun foo(): R|kotlin/Unit| { lval y: R|kotlin/collections/List| = R|kotlin/collections/listOf|(vararg(String(Alpha), String(Beta))) - lval x: R|java/util/LinkedHashSet| = R|java/util/LinkedHashSet.LinkedHashSet|().R|kotlin/apply||>( = apply@fun R|java/util/LinkedHashSet|.(): R|kotlin/Unit| { - this@R|special/anonymous|.R|FakeOverride|(R|/y|) + lval x: R|java/util/LinkedHashSet| = R|SubstitutionOverride|().R|kotlin/apply||>( = apply@fun R|java/util/LinkedHashSet|.(): R|kotlin/Unit| { + this@R|special/anonymous|.R|SubstitutionOverride|(R|/y|) } ) - lval z: R|java/util/ArrayList| = R|java/util/ArrayList.ArrayList|() - R|/z|.R|FakeOverride|(R|/y|) - R|/z|.R|FakeOverride|(String(Omega)) + lval z: R|java/util/ArrayList| = R|SubstitutionOverride|() + R|/z|.R|SubstitutionOverride|(R|/y|) + R|/z|.R|SubstitutionOverride|(String(Omega)) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFirstOrNull.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFirstOrNull.txt index 12e7d7aee09..2d1e1e2c22d 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFirstOrNull.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFirstOrNull.txt @@ -13,7 +13,7 @@ FILE: arrayFirstOrNull.kt Null(null) } else -> { - this@R|/firstOrNullX|.R|FakeOverride|(Int(0)) + this@R|/firstOrNullX|.R|SubstitutionOverride|(Int(0)) } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.txt index 842ad8c1c1e..7c529c5e443 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.txt @@ -1,6 +1,6 @@ FILE: withGenericFun.kt public final fun apply(x: R|T|, f: R|(T) -> R|): R|R| { - ^apply R|/f|.R|FakeOverride|(R|/x|) + ^apply R|/f|.R|SubstitutionOverride|(R|/x|) } public final fun foo(i: R|kotlin/Int|): R|kotlin/Unit| { } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/ifWithCR.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/ifWithCR.txt index 5abb5b7265c..66181de3e8f 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/ifWithCR.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/ifWithCR.txt @@ -19,5 +19,5 @@ FILE: ifWithCR.kt } } - R|/x|.R|FakeOverride|() + R|/x|.R|SubstitutionOverride|() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/cloneArray.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/cloneArray.txt index 0f6092958e2..80f0d45d8cd 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/cloneArray.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/cloneArray.txt @@ -1,6 +1,6 @@ FILE: cloneArray.kt public final fun test_1(array: R|kotlin/Array|): R|kotlin/Unit| { - R|/array|.R|FakeOverride|>|() + R|/array|.R|SubstitutionOverride|>|() } public final fun test_2(array: R|kotlin/IntArray|): R|kotlin/Unit| { R|/array|.R|kotlin/IntArray.clone|() diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot index 79adab4b991..bdb4b3cb219 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot @@ -41,7 +41,7 @@ digraph complexPostponedCfg_kt { color=blue 27 [label="Enter block"]; 28 [label="Access variable this@R|special/anonymous|"]; - 29 [label="Function call: this@R|special/anonymous|.R|FakeOverride|(...)"]; + 29 [label="Function call: this@R|special/anonymous|.R|SubstitutionOverride|(...)"]; 30 [label="Access variable R|/arguments|"]; 31 [label="Function call: R|/arguments|.R|kotlin/collections/last|()"]; 32 [label="Type operator: (R|/arguments|.R|kotlin/collections/last|() as R|FirFunctionCall|)"]; @@ -53,10 +53,10 @@ digraph complexPostponedCfg_kt { color=blue 40 [label="Enter block"]; 41 [label="Access variable this@R|special/anonymous|"]; - 42 [label="Function call: this@R|special/anonymous|.R|FakeOverride|(...)"]; + 42 [label="Function call: this@R|special/anonymous|.R|SubstitutionOverride|(...)"]; 43 [label="Access variable R|/explicitReceiver|"]; 44 [label="Type operator: (R|/explicitReceiver| as R|FirFunctionCall|)"]; - 45 [label="Function call: this@R|special/anonymous|.R|FakeOverride|(...)"]; + 45 [label="Function call: this@R|special/anonymous|.R|SubstitutionOverride|(...)"]; 46 [label="Exit block"]; } 47 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.txt index 76bfdd64ae8..9ece8fb6153 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.txt @@ -6,10 +6,10 @@ FILE: complexPostponedCfg.kt public final fun foo(statements: R|kotlin/collections/List|, arguments: R|kotlin/collections/List|, explicitReceiver: R|FirBase|): R|kotlin/collections/List| { lval firstCalls: R|kotlin/collections/List| = R|kotlin/with||>((R|/statements|.R|kotlin/collections/last|() as R|FirFunctionCall|), = setCall@fun R|FirFunctionCall|.(): R|kotlin/collections/List| { ^ R|kotlin/collections/buildList|( = buildList@fun R|kotlin/collections/MutableList|.(): R|kotlin/Unit| { - this@R|special/anonymous|.R|FakeOverride|(this@R|special/anonymous|) + this@R|special/anonymous|.R|SubstitutionOverride|(this@R|special/anonymous|) R|kotlin/with|((R|/arguments|.R|kotlin/collections/last|() as R|FirFunctionCall|), = plusCall@fun R|FirFunctionCall|.(): R|kotlin/Boolean| { - this@R|special/anonymous|.R|FakeOverride|(this@R|special/anonymous|) - this@R|special/anonymous|.R|FakeOverride|((R|/explicitReceiver| as R|FirFunctionCall|)) + this@R|special/anonymous|.R|SubstitutionOverride|(this@R|special/anonymous|) + this@R|special/anonymous|.R|SubstitutionOverride|((R|/explicitReceiver| as R|FirFunctionCall|)) } ) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/components.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/components.txt index c8415232c5e..beb03d83f97 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/components.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/components.txt @@ -18,9 +18,9 @@ FILE: components.kt } public final fun foo(list: R|kotlin/collections/List|): R|kotlin/Unit| { - lval : R|kotlin/collections/Iterator| = R|/list|.R|FakeOverride|>|() + lval : R|kotlin/collections/Iterator| = R|/list|.R|SubstitutionOverride|>|() while(R|/|.R|kotlin/collections/Iterator.hasNext|()) { - lval : R|D| = R|/|.R|FakeOverride|() + lval : R|D| = R|/|.R|SubstitutionOverride|() lval x: R|kotlin/Int| = R|/|.R|/D.component1|() lval y: R|kotlin/String| = R|/|.R|/D.component2|() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.txt index 5b463950d0a..e26e679dc4a 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.txt @@ -9,7 +9,7 @@ FILE: concurrentMapOfAliases.kt private get(): R|java/util/concurrent/ConcurrentHashMap!, ft!>| private final fun bar(): R|kotlin/Unit| { - this@R|/A|.R|/A.foo|.R|FakeOverride|(String(dd))?.{ (this@R|/A|, $subj$).R|/A.baz|() } + this@R|/A|.R|/A.foo|.R|SubstitutionOverride|(String(dd))?.{ (this@R|/A|, $subj$).R|/A.baz|() } } private final fun R|MyAlias|.baz(): R|kotlin/Unit| { diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot index 0d37c8f05bb..08da0bfb74f 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot @@ -242,8 +242,8 @@ digraph callsInPlace_kt { subgraph cluster_21 { color=blue 80 [label="Enter block"]; - 81 [label="Function call: R|/block1|.R|FakeOverride|()"]; - 82 [label="Function call: R|/block2|.R|FakeOverride|()"]; + 81 [label="Function call: R|/block1|.R|SubstitutionOverride|()"]; + 82 [label="Function call: R|/block2|.R|SubstitutionOverride|()"]; 83 [label="Exit block"]; } 84 [label="Exit function myRun" style="filled" fillcolor=red]; @@ -384,7 +384,7 @@ digraph callsInPlace_kt { subgraph cluster_35 { color=blue 124 [label="Enter block"]; - 125 [label="Function call: R|/block|.R|FakeOverride|()"]; + 125 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; 126 [label="Exit block"]; } 127 [label="Exit function myDummyRun" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.txt index c006792858e..cf9196e0f33 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.txt @@ -34,8 +34,8 @@ FILE: callsInPlace.kt ) } public final inline fun myRun(block1: R|() -> kotlin/Unit|, block2: R|() -> kotlin/Unit|): R|kotlin/Unit| { - R|/block1|.R|FakeOverride|() - R|/block2|.R|FakeOverride|() + R|/block1|.R|SubstitutionOverride|() + R|/block2|.R|SubstitutionOverride|() } public final fun test_6(): R|kotlin/Unit| { R|/myRun|(myRun@fun (): R|kotlin/Unit| { @@ -56,7 +56,7 @@ FILE: callsInPlace.kt ) } public final fun myDummyRun(block: R|() -> kotlin/Unit|): R|kotlin/Unit| { - R|/block|.R|FakeOverride|() + R|/block|.R|SubstitutionOverride|() } public final fun test_8(): R|kotlin/Unit| { R|/myDummyRun|( = myDummyRun@fun (): R|kotlin/Unit| { diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.dot index 4cef5af97aa..430d833bf8e 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.dot @@ -13,7 +13,7 @@ digraph inAnonymousObject_kt { 3 [label="Variable declaration: lval obj: R||"]; 4 [label="Access variable R|/obj|"]; 5 [label="Function call: R|/obj|.R|/.run|()"]; - 6 [label="Function call: R|/d|.R|FakeOverride|()"]; + 6 [label="Function call: R|/d|.R|SubstitutionOverride|()"]; 7 [label="Exit block"]; } 8 [label="Exit function foo" style="filled" fillcolor=red]; @@ -102,7 +102,7 @@ digraph inAnonymousObject_kt { subgraph cluster_10 { color=blue 30 [label="Enter block"]; - 31 [label="Function call: R|/c|.R|FakeOverride|()"]; + 31 [label="Function call: R|/c|.R|SubstitutionOverride|()"]; 32 [label="Exit block"]; } 33 [label="Exit function run" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.txt index 8052815637e..088e438a102 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.txt @@ -25,11 +25,11 @@ FILE: inAnonymousObject.kt } public final override fun run(): R|kotlin/Unit| { - R|/c|.R|FakeOverride|() + R|/c|.R|SubstitutionOverride|() } } R|/obj|.R|/.run|() - R|/d|.R|FakeOverride|() + R|/d|.R|SubstitutionOverride|() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot index a353567b619..4f0ab306c9d 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot @@ -12,7 +12,7 @@ digraph inLocalClass_kt { 2 [label="Exit local class foo"]; 3 [label="Function call: R|/LocalClass.LocalClass|()"]; 4 [label="Function call: R|/LocalClass.LocalClass|().R|/LocalClass.run|()"]; - 5 [label="Function call: R|/e|.R|FakeOverride|()"]; + 5 [label="Function call: R|/e|.R|SubstitutionOverride|()"]; 6 [label="Exit block"]; } 7 [label="Exit function foo" style="filled" fillcolor=red]; @@ -73,7 +73,7 @@ digraph inLocalClass_kt { subgraph cluster_7 { color=blue 21 [label="Enter block"]; - 22 [label="Function call: R|/b|.R|FakeOverride|()"]; + 22 [label="Function call: R|/b|.R|SubstitutionOverride|()"]; 23 [label="Exit block"]; } 24 [label="Exit function " style="filled" fillcolor=red]; @@ -109,7 +109,7 @@ digraph inLocalClass_kt { subgraph cluster_11 { color=blue 32 [label="Enter block"]; - 33 [label="Function call: R|/d|.R|FakeOverride|()"]; + 33 [label="Function call: R|/d|.R|SubstitutionOverride|()"]; 34 [label="Exit block"]; } 35 [label="Exit function run" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.txt index e84229b8218..73f4a36d2e9 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.txt @@ -19,7 +19,7 @@ FILE: inLocalClass.kt public constructor(): R|LocalClass| { super() - R|/b|.R|FakeOverride|() + R|/b|.R|SubstitutionOverride|() } init { @@ -27,11 +27,11 @@ FILE: inLocalClass.kt } public final fun run(): R|kotlin/Unit| { - R|/d|.R|FakeOverride|() + R|/d|.R|SubstitutionOverride|() } } R|/LocalClass.LocalClass|().R|/LocalClass.run|() - R|/e|.R|FakeOverride|() + R|/e|.R|SubstitutionOverride|() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.dot index 483b886e397..44fb044e50b 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.dot @@ -11,7 +11,7 @@ digraph inLocalFunction_kt { 1 [label="Enter block"]; 2 [label="Local function declaration foo"]; 3 [label="Function call: R|/localFun|()"]; - 4 [label="Function call: R|/b|.R|FakeOverride|()"]; + 4 [label="Function call: R|/b|.R|SubstitutionOverride|()"]; 5 [label="Exit block"]; } 6 [label="Exit function foo" style="filled" fillcolor=red]; @@ -23,8 +23,8 @@ digraph inLocalFunction_kt { color=blue 8 [label="Enter block"]; 9 [label="Access variable R|/a|"]; - 10 [label="Function call: R|/a|.R|FakeOverride|()"]; - 11 [label="Function call: R|/a|.R|FakeOverride|()"]; + 10 [label="Function call: R|/a|.R|SubstitutionOverride|()"]; + 11 [label="Function call: R|/a|.R|SubstitutionOverride|()"]; 12 [label="Exit block"]; } 13 [label="Exit function localFun" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.txt index b3d7ae3b1ae..d1067512066 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.txt @@ -7,10 +7,10 @@ FILE: inLocalFunction.kt { [StubStatement] local final fun localFun(): R|kotlin/Unit| { - R|/a|.R|FakeOverride|() - R|/a|.R|FakeOverride|() + R|/a|.R|SubstitutionOverride|() + R|/a|.R|SubstitutionOverride|() } R|/localFun|() - R|/b|.R|FakeOverride|() + R|/b|.R|SubstitutionOverride|() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.dot index 3318bfd1a0c..bd9ad0da288 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.dot @@ -43,7 +43,7 @@ digraph toLocalVariables_kt { 13 [label="Enter block"]; 14 [label="Access variable R|/y|"]; 15 [label="Variable declaration: lval yCopy: R|() -> kotlin/Unit|"]; - 16 [label="Function call: R|/yCopy|.R|FakeOverride|()"]; + 16 [label="Function call: R|/yCopy|.R|SubstitutionOverride|()"]; 17 [label="Exit block"]; } 18 [label="Exit when branch result"]; @@ -61,7 +61,7 @@ digraph toLocalVariables_kt { 26 [label="Variable declaration: lval zCopy: R|() -> kotlin/Unit|"]; 27 [label="Access variable R|/z|"]; 28 [label="Assignment: R|/zCopy|"]; - 29 [label="Function call: R|/zCopy|.R|FakeOverride|()"]; + 29 [label="Function call: R|/zCopy|.R|SubstitutionOverride|()"]; 30 [label="Exit block"]; } 31 [label="Exit function foo" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.txt index 94cedab85a2..eb64ce50bb3 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.txt @@ -16,11 +16,11 @@ FILE: toLocalVariables.kt } else -> { lval yCopy: R|() -> kotlin/Unit| = R|/y| - R|/yCopy|.R|FakeOverride|() + R|/yCopy|.R|SubstitutionOverride|() } } lval zCopy: R|() -> kotlin/Unit| R|/zCopy| = R|/z| - R|/zCopy|.R|FakeOverride|() + R|/zCopy|.R|SubstitutionOverride|() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.dot index d435bda7efa..32afa2fc851 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.dot @@ -9,7 +9,7 @@ digraph atLeastOnce_kt { subgraph cluster_1 { color=blue 1 [label="Enter block"]; - 2 [label="Function call: R|/block|.R|FakeOverride|()"]; + 2 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; 3 [label="Exit block"]; } 4 [label="Exit function inlineRun" style="filled" fillcolor=red]; @@ -25,7 +25,7 @@ digraph atLeastOnce_kt { subgraph cluster_3 { color=blue 6 [label="Enter block"]; - 7 [label="Function call: R|/block|.R|FakeOverride|()"]; + 7 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; 8 [label="Exit block"]; } 9 [label="Exit function myRun" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.txt index a081a88afda..dccac9a8706 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.txt @@ -6,7 +6,7 @@ FILE: atLeastOnce.kt > { [StubStatement] - R|/block|.R|FakeOverride|() + R|/block|.R|SubstitutionOverride|() } public final fun myRun(block: R|() -> kotlin/Unit|): R|kotlin/Unit| [R|Contract description] @@ -15,7 +15,7 @@ FILE: atLeastOnce.kt > { [StubStatement] - R|/block|.R|FakeOverride|() + R|/block|.R|SubstitutionOverride|() } public final fun test_1(): R|kotlin/Unit| { lval x: R|kotlin/Int| diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.dot index dadc62125ea..6432d38eaf5 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.dot @@ -9,7 +9,7 @@ digraph atMostOnce_kt { subgraph cluster_1 { color=blue 1 [label="Enter block"]; - 2 [label="Function call: R|/block|.R|FakeOverride|()"]; + 2 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; 3 [label="Exit block"]; } 4 [label="Exit function inlineRun" style="filled" fillcolor=red]; @@ -25,7 +25,7 @@ digraph atMostOnce_kt { subgraph cluster_3 { color=blue 6 [label="Enter block"]; - 7 [label="Function call: R|/block|.R|FakeOverride|()"]; + 7 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; 8 [label="Exit block"]; } 9 [label="Exit function myRun" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.txt index fe7c93827c6..b3ce1c12487 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.txt @@ -6,7 +6,7 @@ FILE: atMostOnce.kt > { [StubStatement] - R|/block|.R|FakeOverride|() + R|/block|.R|SubstitutionOverride|() } public final fun myRun(block: R|() -> kotlin/Unit|): R|kotlin/Unit| [R|Contract description] @@ -15,7 +15,7 @@ FILE: atMostOnce.kt > { [StubStatement] - R|/block|.R|FakeOverride|() + R|/block|.R|SubstitutionOverride|() } public final fun test_1(): R|kotlin/Unit| { lval x: R|kotlin/Int| diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.dot index b99490105ea..d624bd2311f 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.dot @@ -10,7 +10,7 @@ digraph contractsUsage_kt { color=blue 1 [label="Enter block"]; 2 [label="Access variable R|/x|"]; - 3 [label="Function call: R|/x|.R|FakeOverride|()"]; + 3 [label="Function call: R|/x|.R|SubstitutionOverride|()"]; 4 [label="Exit block"]; } 5 [label="Exit function bar" style="filled" fillcolor=red]; @@ -42,7 +42,7 @@ digraph contractsUsage_kt { color=blue 14 [label="Enter block"]; 15 [label="Access variable this@R|/baz|"]; - 16 [label="Function call: this@R|/baz|.R|FakeOverride|()"]; + 16 [label="Function call: this@R|/baz|.R|SubstitutionOverride|()"]; 17 [label="Exit block"]; } 18 [label="Exit when branch result"]; @@ -89,7 +89,7 @@ digraph contractsUsage_kt { color=blue 30 [label="Enter block"]; 31 [label="Access variable R|/x|"]; - 32 [label="Function call: R|/x|.R|FakeOverride|()"]; + 32 [label="Function call: R|/x|.R|SubstitutionOverride|()"]; 33 [label="Access variable R|/y|"]; 34 [label="Function call: R|/y|.R|/baz|()"]; 35 [label="Jump: ^foo Unit"]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.txt index ccf03330779..16f4ea50de9 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.txt @@ -6,7 +6,7 @@ FILE: contractsUsage.kt > { [StubStatement] - R|/x|.R|FakeOverride|() + R|/x|.R|SubstitutionOverride|() } @R|kotlin/contracts/ExperimentalContracts|() public final fun R|() -> kotlin/Unit|.baz(): R|kotlin/Unit| [R|Contract description] @@ -17,7 +17,7 @@ FILE: contractsUsage.kt [StubStatement] when () { Boolean(true) -> { - this@R|/baz|.R|FakeOverride|() + this@R|/baz|.R|SubstitutionOverride|() } } @@ -32,7 +32,7 @@ FILE: contractsUsage.kt [StubStatement] when () { Boolean(true) -> { - R|/x|.R|FakeOverride|() + R|/x|.R|SubstitutionOverride|() R|/y|.R|/baz|() ^foo Unit } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.dot index b8c8e5b902b..a9dc2fbf5ea 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.dot @@ -9,7 +9,7 @@ digraph exactlyOnce_kt { subgraph cluster_1 { color=blue 1 [label="Enter block"]; - 2 [label="Function call: R|/block|.R|FakeOverride|()"]; + 2 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; 3 [label="Exit block"]; } 4 [label="Exit function inlineRun" style="filled" fillcolor=red]; @@ -25,7 +25,7 @@ digraph exactlyOnce_kt { subgraph cluster_3 { color=blue 6 [label="Enter block"]; - 7 [label="Function call: R|/block|.R|FakeOverride|()"]; + 7 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; 8 [label="Exit block"]; } 9 [label="Exit function myRun" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.txt index 62d096cabec..12063c44928 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.txt @@ -6,7 +6,7 @@ FILE: exactlyOnce.kt > { [StubStatement] - R|/block|.R|FakeOverride|() + R|/block|.R|SubstitutionOverride|() } public final fun myRun(block: R|() -> kotlin/Unit|): R|kotlin/Unit| [R|Contract description] @@ -15,7 +15,7 @@ FILE: exactlyOnce.kt > { [StubStatement] - R|/block|.R|FakeOverride|() + R|/block|.R|SubstitutionOverride|() } public final fun test_1(): R|kotlin/Unit| { lval x: R|kotlin/Int| diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.dot index 3fc4a56ec6f..3554770866a 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.dot @@ -24,7 +24,7 @@ digraph flow_kt { color=blue 8 [label="Enter block"]; 9 [label="Access variable R|/x|"]; - 10 [label="Function call: R|/x|.R|FakeOverride|()"]; + 10 [label="Function call: R|/x|.R|SubstitutionOverride|()"]; 11 [label="Jump: ^bar Unit"]; 12 [label="Stub" style="filled" fillcolor=gray]; 13 [label="Exit block" style="filled" fillcolor=gray]; @@ -102,9 +102,9 @@ digraph flow_kt { color=blue 37 [label="Enter block"]; 38 [label="Access variable R|/y|"]; - 39 [label="Function call: R|/y|.R|FakeOverride|()"]; + 39 [label="Function call: R|/y|.R|SubstitutionOverride|()"]; 40 [label="Access variable R|/z|"]; - 41 [label="Function call: R|/z|.R|FakeOverride|()"]; + 41 [label="Function call: R|/z|.R|SubstitutionOverride|()"]; 42 [label="Jump: ^foo Unit"]; 43 [label="Stub" style="filled" fillcolor=gray]; 44 [label="Exit block" style="filled" fillcolor=gray]; @@ -115,7 +115,7 @@ digraph flow_kt { color=blue 47 [label="Enter block"]; 48 [label="Access variable R|/y|"]; - 49 [label="Function call: R|/y|.R|FakeOverride|()"]; + 49 [label="Function call: R|/y|.R|SubstitutionOverride|()"]; 50 [label="Exit block"]; } 51 [label="Exit when branch result"]; @@ -153,7 +153,7 @@ digraph flow_kt { 70 [label="Function call: R|/|.R|kotlin/collections/IntIterator.next|()"]; 71 [label="Variable declaration: lval i: R|kotlin/Int|"]; 72 [label="Access variable R|/x|"]; - 73 [label="Function call: R|/x|.R|FakeOverride|()"]; + 73 [label="Function call: R|/x|.R|SubstitutionOverride|()"]; 74 [label="Exit block"]; } 75 [label="Exit loop block"]; @@ -161,7 +161,7 @@ digraph flow_kt { 76 [label="Exit whileloop"]; } 77 [label="Access variable R|/y|"]; - 78 [label="Function call: R|/y|.R|FakeOverride|()"]; + 78 [label="Function call: R|/y|.R|SubstitutionOverride|()"]; 79 [label="Exit block"]; } 80 [label="Exit when branch result"]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.txt index b5e89c4f767..53a24a6592c 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.txt @@ -8,7 +8,7 @@ FILE: flow.kt [StubStatement] when () { Boolean(true) -> { - R|/x|.R|FakeOverride|() + R|/x|.R|SubstitutionOverride|() ^bar Unit } } @@ -29,19 +29,19 @@ FILE: flow.kt lval : R|kotlin/collections/IntIterator| = Int(0).R|kotlin/Int.rangeTo|(Int(0)).R|kotlin/ranges/IntProgression.iterator|() while(R|/|.R|kotlin/collections/Iterator.hasNext|()) { lval i: R|kotlin/Int| = R|/|.R|kotlin/collections/IntIterator.next|() - R|/x|.R|FakeOverride|() + R|/x|.R|SubstitutionOverride|() } - R|/y|.R|FakeOverride|() + R|/y|.R|SubstitutionOverride|() } else -> { when () { Boolean(false) -> { - R|/y|.R|FakeOverride|() + R|/y|.R|SubstitutionOverride|() } else -> { - R|/y|.R|FakeOverride|() - R|/z|.R|FakeOverride|() + R|/y|.R|SubstitutionOverride|() + R|/z|.R|SubstitutionOverride|() ^foo Unit } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.dot index d43bfb9c90f..b056092cbd5 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.dot @@ -23,7 +23,7 @@ digraph inPlaceLambda_kt { subgraph cluster_4 { color=blue 8 [label="Enter block"]; - 9 [label="Function call: R|/x|.R|FakeOverride|()"]; + 9 [label="Function call: R|/x|.R|SubstitutionOverride|()"]; 10 [label="Exit block"]; } 11 [label="Exit when branch result"]; @@ -54,7 +54,7 @@ digraph inPlaceLambda_kt { subgraph cluster_6 { color=blue 16 [label="Enter block"]; - 17 [label="Function call: R|/x|.R|FakeOverride|()"]; + 17 [label="Function call: R|/x|.R|SubstitutionOverride|()"]; 18 [label="Postponed enter to lambda"]; subgraph cluster_7 { color=blue @@ -62,7 +62,7 @@ digraph inPlaceLambda_kt { subgraph cluster_8 { color=blue 24 [label="Enter block"]; - 25 [label="Function call: R|/x|.R|FakeOverride|()"]; + 25 [label="Function call: R|/x|.R|SubstitutionOverride|()"]; 26 [label="Exit block"]; } 27 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.txt index 202bb77399b..affbd7d7270 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.txt @@ -8,7 +8,7 @@ FILE: inPlaceLambda.kt [StubStatement] when () { Boolean(true) -> { - R|/x|.R|FakeOverride|() + R|/x|.R|SubstitutionOverride|() } } @@ -20,9 +20,9 @@ FILE: inPlaceLambda.kt > { [StubStatement] - R|/x|.R|FakeOverride|() + R|/x|.R|SubstitutionOverride|() R|/bar|( = bar@fun (): R|kotlin/Unit| { - R|/x|.R|FakeOverride|() + R|/x|.R|SubstitutionOverride|() } ) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.dot index c9929329de1..77a296fd0a4 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.dot @@ -10,7 +10,7 @@ digraph simple_kt { color=blue 1 [label="Enter block"]; 2 [label="Access variable R|/x|"]; - 3 [label="Function call: R|/x|.R|FakeOverride|()"]; + 3 [label="Function call: R|/x|.R|SubstitutionOverride|()"]; 4 [label="Exit block"]; } 5 [label="Exit function bar" style="filled" fillcolor=red]; @@ -28,7 +28,7 @@ digraph simple_kt { color=blue 7 [label="Enter block"]; 8 [label="Access variable R|/x|"]; - 9 [label="Function call: R|/x|.R|FakeOverride|()"]; + 9 [label="Function call: R|/x|.R|SubstitutionOverride|()"]; subgraph cluster_4 { color=blue 10 [label="Enter when"]; @@ -43,7 +43,7 @@ digraph simple_kt { subgraph cluster_6 { color=blue 16 [label="Enter block"]; - 17 [label="Function call: R|/y|.R|FakeOverride|()"]; + 17 [label="Function call: R|/y|.R|SubstitutionOverride|()"]; 18 [label="Exit block"]; } 19 [label="Exit when branch result"]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.txt index 7e2313cfffd..684edfb566b 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.txt @@ -6,7 +6,7 @@ FILE: simple.kt > { [StubStatement] - R|/x|.R|FakeOverride|() + R|/x|.R|SubstitutionOverride|() } @R|kotlin/contracts/ExperimentalContracts|() public final fun foo(x: R|() -> kotlin/Unit|, y: R|() -> kotlin/Unit|, z: R|() -> kotlin/Unit|): R|kotlin/Unit| [R|Contract description] @@ -17,10 +17,10 @@ FILE: simple.kt > { [StubStatement] - R|/x|.R|FakeOverride|() + R|/x|.R|SubstitutionOverride|() when () { Boolean(true) -> { - R|/y|.R|FakeOverride|() + R|/y|.R|SubstitutionOverride|() } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.dot index f2323c89cb8..31ffbff44d9 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.dot @@ -9,7 +9,7 @@ digraph unknown_kt { subgraph cluster_1 { color=blue 1 [label="Enter block"]; - 2 [label="Function call: R|/block|.R|FakeOverride|()"]; + 2 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; 3 [label="Exit block"]; } 4 [label="Exit function inlineRun" style="filled" fillcolor=red]; @@ -25,7 +25,7 @@ digraph unknown_kt { subgraph cluster_3 { color=blue 6 [label="Enter block"]; - 7 [label="Function call: R|/block|.R|FakeOverride|()"]; + 7 [label="Function call: R|/block|.R|SubstitutionOverride|()"]; 8 [label="Exit block"]; } 9 [label="Exit function myRun" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.txt index 26392791b5b..02f8d7ffaee 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.txt @@ -6,7 +6,7 @@ FILE: unknown.kt > { [StubStatement] - R|/block|.R|FakeOverride|() + R|/block|.R|SubstitutionOverride|() } public final fun myRun(block: R|() -> kotlin/Unit|): R|kotlin/Unit| [R|Contract description] @@ -15,7 +15,7 @@ FILE: unknown.kt > { [StubStatement] - R|/block|.R|FakeOverride|() + R|/block|.R|SubstitutionOverride|() } public final fun test_1(): R|kotlin/Unit| { lval x: R|kotlin/Int| diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/variousContracts/newSyntax/functionsWithContract.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/variousContracts/newSyntax/functionsWithContract.txt index 87527bceba0..c546a1adf53 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/variousContracts/newSyntax/functionsWithContract.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/variousContracts/newSyntax/functionsWithContract.txt @@ -15,7 +15,7 @@ FILE: functionsWithContract.kt > { R|kotlin/require|(!=(R|/s|, Null(null))) - R|/block|.R|FakeOverride|() + R|/block|.R|SubstitutionOverride|() } public final fun test3(arg: R|kotlin/Any?|): R|kotlin/Boolean| [R|Contract description] diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.txt index 7fb7ecf5fea..72599548ac1 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.txt @@ -35,10 +35,10 @@ FILE: delegateTypeMismatch.kt public final var classifierNamePolicy: R|ClassifierNamePolicy|by this@R|/A|.R|/A.property|(Q|ClassifierNamePolicy.SOURCE_CODE_QUALIFIED|) public get(): R|ClassifierNamePolicy| { - ^ this@R|/A|.D|/A.classifierNamePolicy|.R|FakeOverride|(this@R|/A|, ::R|/A.classifierNamePolicy|) + ^ this@R|/A|.D|/A.classifierNamePolicy|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.classifierNamePolicy|) } public set(: R|ClassifierNamePolicy|): R|kotlin/Unit| { - this@R|/A|.D|/A.classifierNamePolicy|.R|FakeOverride|(this@R|/A|, ::R|/A.classifierNamePolicy|, R|/classifierNamePolicy|) + this@R|/A|.D|/A.classifierNamePolicy|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.classifierNamePolicy|, R|/classifierNamePolicy|) } public final var typeNormalizer: R|(KotlinType) -> KotlinType|by this@R|/A|.R|/A.property| KotlinType|>(property@fun (it: R|KotlinType|): R|KotlinType| { @@ -46,10 +46,10 @@ FILE: delegateTypeMismatch.kt } ) public get(): R|(KotlinType) -> KotlinType| { - ^ this@R|/A|.D|/A.typeNormalizer|.R|FakeOverride KotlinType|>|(this@R|/A|, ::R|/A.typeNormalizer|) + ^ this@R|/A|.D|/A.typeNormalizer|.R|SubstitutionOverride KotlinType|>|(this@R|/A|, ::R|/A.typeNormalizer|) } public set(: R|(KotlinType) -> KotlinType|): R|kotlin/Unit| { - this@R|/A|.D|/A.typeNormalizer|.R|FakeOverride|(this@R|/A|, ::R|/A.typeNormalizer|, R|/typeNormalizer|) + this@R|/A|.D|/A.typeNormalizer|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.typeNormalizer|, R|/typeNormalizer|) } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot index f34ce65fbcc..84f6eb6028c 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot @@ -155,8 +155,8 @@ digraph delegateWithAnonymousObject_kt { 55 [label="Enter block"]; 56 [label="Access variable D|/IssuesListUserProfile.issueListView|"]; 57 [label="Access variable this@R|/IssuesListUserProfile|"]; - 58 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|FakeOverride|(...)"]; - 59 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|FakeOverride|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)"]; + 58 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride|(...)"]; + 59 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)"]; 60 [label="Stub" style="filled" fillcolor=gray]; 61 [label="Exit block" style="filled" fillcolor=gray]; } @@ -181,7 +181,7 @@ digraph delegateWithAnonymousObject_kt { 65 [label="Access variable D|/IssuesListUserProfile.issueListView|"]; 66 [label="Access variable this@R|/IssuesListUserProfile|"]; 67 [label="Access variable R|/issueListView|"]; - 68 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|FakeOverride|(...)"]; + 68 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride|(...)"]; 69 [label="Exit block"]; } 70 [label="Exit function setter" style="filled" fillcolor=red]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt index 3937029ee7d..8b12a49fb46 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt @@ -41,10 +41,10 @@ FILE: delegateWithAnonymousObject.kt } ) public get(): R|IssueListView| { - ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|FakeOverride|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|) + ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|) } public set(: R|IssueListView|): R|kotlin/Unit| { - this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|FakeOverride|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|, R|/issueListView|) + this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|, R|/issueListView|) } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.txt index 29b661977dc..f0c5fdf3d63 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.txt @@ -15,10 +15,10 @@ FILE: propertyWithFunctionalType.kt } ) public get(): R|(B) -> B| { - ^ this@R|/A|.D|/A.conventer|.R|FakeOverride B|>|(this@R|/A|, ::R|/A.conventer|) + ^ this@R|/A|.D|/A.conventer|.R|SubstitutionOverride B|>|(this@R|/A|, ::R|/A.conventer|) } public set(: R|(B) -> B|): R|kotlin/Unit| { - this@R|/A|.D|/A.conventer|.R|FakeOverride|(this@R|/A|, ::R|/A.conventer|, R|/conventer|) + this@R|/A|.D|/A.conventer|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.conventer|, R|/conventer|) } public final var conventerWithExpectedType: R|(B) -> B|by this@R|/A|.R|/A.property| B|>(property@fun (it: R|B|): R|B| { @@ -26,10 +26,10 @@ FILE: propertyWithFunctionalType.kt } ) public get(): R|(B) -> B| { - ^ this@R|/A|.D|/A.conventerWithExpectedType|.R|FakeOverride B|>|(this@R|/A|, ::R|/A.conventerWithExpectedType|) + ^ this@R|/A|.D|/A.conventerWithExpectedType|.R|SubstitutionOverride B|>|(this@R|/A|, ::R|/A.conventerWithExpectedType|) } public set(: R|(B) -> B|): R|kotlin/Unit| { - this@R|/A|.D|/A.conventerWithExpectedType|.R|FakeOverride|(this@R|/A|, ::R|/A.conventerWithExpectedType|, R|/conventerWithExpectedType|) + this@R|/A|.D|/A.conventerWithExpectedType|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.conventerWithExpectedType|, R|/conventerWithExpectedType|) } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/getOnKProperty.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/getOnKProperty.txt index 6a5db54549b..91fed8d97c0 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/getOnKProperty.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/getOnKProperty.txt @@ -5,6 +5,6 @@ FILE: getOnKProperty.kt } public final fun test(): R|kotlin/Unit| { lval f: R|kotlin/reflect/KProperty1| = Q|kotlin/Any?|::R|/meaning| - R|/f|.R|FakeOverride|(Null(null)) - R|/f|.R|FakeOverride|(String()) + R|/f|.R|SubstitutionOverride|(Null(null)) + R|/f|.R|SubstitutionOverride|(String()) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashMapTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashMapTypeAlias.txt index 9322eb4c238..d093c4d2df3 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashMapTypeAlias.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashMapTypeAlias.txt @@ -3,7 +3,7 @@ FILE: hashMapTypeAlias.kt public final fun R|MyT|.add(x: R|X|, y: R|kotlin/Int|): R|kotlin/Unit| { } public final fun main(): R|kotlin/Unit| { - R|java/util/HashMap.HashMap|().R|kotlin/apply||>( = apply@fun R|java/util/HashMap|.(): R|kotlin/Unit| { + R|SubstitutionOverride|().R|kotlin/apply||>( = apply@fun R|java/util/HashMap|.(): R|kotlin/Unit| { this@R|special/anonymous|.R|/add|(String(1), Int(2)) } ) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.txt index 160e05c30c9..c655e1d2a89 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.txt @@ -15,7 +15,7 @@ FILE: hashTableWithForEach.kt R|/DEBUG| -> { ^ Q|java/util/Collections|.R|java/util/Collections.unmodifiableSet|, kotlin/collections/MutableMap.MutableEntry?>!|>(R|kotlin/collections/mutableSetOf||>().R|kotlin/apply|>|>( = apply@fun R|kotlin/collections/MutableSet>|.(): R|kotlin/Unit| { this@R|/SomeHashTable|.R|/SomeHashTable.forEach|( = forEach@fun (key: R|K|, value: R|V|): R|kotlin/Unit| { - this@R|special/anonymous|.R|FakeOverride|(R|/SomeHashTable.Entry.Entry|(R|/key|, R|/value|)) + this@R|special/anonymous|.R|SubstitutionOverride|(R|SubstitutionOverride|(R|/key|, R|/value|)) } ) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.txt index 51d244e4873..826f6fab14b 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.txt @@ -6,7 +6,7 @@ FILE: builderInference.kt } public final fun test(): R|kotlin/Unit| { lval s: R|kotlin/String| = R|/foo|( = foo@fun R|kotlin/collections/MutableList|.(): R|kotlin/Unit| { - this@R|special/anonymous|.R|FakeOverride|(String()) + this@R|special/anonymous|.R|SubstitutionOverride|(String()) } ) R|/takeString|(R|/s|) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.txt index ca56573ca80..9f20cb518cb 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.txt @@ -10,7 +10,7 @@ FILE: builderInferenceAndCoercionToUnit.kt } public final fun test(strings: R|kotlin/collections/List|): R|kotlin/Unit| { lval dropDown: R|DropDownComponent| = R|/DropDownComponent.DropDownComponent|(initialValues = R|kotlin/collections/buildList|( = buildList@fun R|kotlin/collections/MutableList|.(): R|kotlin/Unit| { - this@R|special/anonymous|.R|FakeOverride|(R|/strings|) + this@R|special/anonymous|.R|SubstitutionOverride|(R|/strings|) } )) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt index 8b6b2b8e15d..ef31d5679c0 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt @@ -1,20 +1,20 @@ FILE: builderInferenceFromStdlib.kt public final fun test_1(): R|kotlin/Unit| { lval list: R|kotlin/collections/List| = R|kotlin/collections/buildList|( = buildList@fun R|kotlin/collections/MutableList|.(): R|kotlin/Unit| { - this@R|special/anonymous|.R|FakeOverride|(String()) + this@R|special/anonymous|.R|SubstitutionOverride|(String()) } ) R|/takeList|(R|/list|) } public final fun test_2(): R|kotlin/Unit| { lval list: R|kotlin/collections/List| = R|/myBuildList|( = myBuildList@fun R|kotlin/collections/MutableList|.(): R|kotlin/Unit| { - this@R|special/anonymous|.R|FakeOverride|(String()) + this@R|special/anonymous|.R|SubstitutionOverride|(String()) } ) R|/takeList|(R|/list|) } public final fun myBuildList(@R|kotlin/BuilderInference|() builderAction: R|kotlin/collections/MutableList.() -> kotlin/Unit|): R|kotlin/collections/List| { - ^myBuildList R|java/util/ArrayList.ArrayList|().R|kotlin/apply||>(R|/builderAction|) + ^myBuildList R|SubstitutionOverride|().R|kotlin/apply||>(R|/builderAction|) } public final fun takeList(list: R|kotlin/collections/List|): R|kotlin/Unit| { } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/complexConstraintSystem.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/complexConstraintSystem.txt index 51a30e0bcf4..022b0871aa9 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/complexConstraintSystem.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/complexConstraintSystem.txt @@ -20,5 +20,5 @@ FILE: complexConstraintSystem.kt } } - ).R|kotlin/collections/first||>().R|FakeOverride| + ).R|kotlin/collections/first||>().R|SubstitutionOverride| } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.dot index a767f58a989..8bb516ef204 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.dot @@ -110,8 +110,8 @@ digraph plusAssignWithLambdaInRhs_kt { subgraph cluster_13 { color=blue 47 [label="Enter block"]; - 48 [label="Function call: R|/computation|.R|FakeOverride|()"]; - 49 [label="Function call: R|/resolve|.R|FakeOverride|(...)"]; + 48 [label="Function call: R|/computation|.R|SubstitutionOverride|()"]; + 49 [label="Function call: R|/resolve|.R|SubstitutionOverride|(...)"]; 50 [label="Exit block"]; } 51 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; @@ -126,7 +126,7 @@ digraph plusAssignWithLambdaInRhs_kt { 33 [label="Function call: R|/A.A|(...)"]; 34 [label="Jump: ^postpone R|/A.A|( = A@fun (resolve: R|(T) -> kotlin/Unit|): R|kotlin/Unit| { R|/queue|.R|kotlin/collections/plusAssign| kotlin/Unit|>(A@fun (): R|kotlin/Unit| { - R|/resolve|.R|FakeOverride|(R|/computation|.R|FakeOverride|()) + R|/resolve|.R|SubstitutionOverride|(R|/computation|.R|SubstitutionOverride|()) } ) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.txt index 16863a33082..b56f0fc167c 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.txt @@ -19,7 +19,7 @@ FILE: plusAssignWithLambdaInRhs.kt lval queue: R|kotlin/collections/MutableList>| = R|kotlin/collections/mutableListOf| kotlin/Unit|>() ^postpone R|/A.A|( = A@fun (resolve: R|(T) -> kotlin/Unit|): R|kotlin/Unit| { R|/queue|.R|kotlin/collections/plusAssign| kotlin/Unit|>(A@fun (): R|kotlin/Unit| { - R|/resolve|.R|FakeOverride|(R|/computation|.R|FakeOverride|()) + R|/resolve|.R|SubstitutionOverride|(R|/computation|.R|SubstitutionOverride|()) } ) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.txt index 9c6d945fc17..400879460b9 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.txt @@ -11,7 +11,7 @@ FILE: simpleFakeOverride.kt } public final fun test(): R|kotlin/Unit| { - this@R|/B|.R|FakeOverride!|>|(R|/Some.Some|()) + this@R|/B|.R|SubstitutionOverride!|>|(R|/Some.Some|()) } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldSubstitution.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldSubstitution.txt index 16a7fa363df..b601185f78d 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldSubstitution.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldSubstitution.txt @@ -5,7 +5,7 @@ FILE: Derived.kt } public final fun test(): R|kotlin/Unit| { - this@R|/Derived|.R|/Derived.myHost|.R|kotlin/String.length| + this@R|/Derived|.R|SubstitutionOverride|.R|kotlin/String.length| } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt index 8f176ab3c65..db63047f8c3 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt @@ -6,9 +6,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|FakeOverride|(R|/vString|) + R|/k|.R|/J1.getImpl|().R|SubstitutionOverride|(R|/vString|) R|/k|.R|/J1.getImpl|().#(R|/vInt|) - R|/k|.R|/J1.getNestedSubClass|().R|FakeOverride|(String()) + R|/k|.R|/J1.getNestedSubClass|().R|SubstitutionOverride|(String()) R|/k|.R|/J1.getNestedSubClass|().#(Int(1)) } FILE: K2.kt diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.txt index e7f0f8b4c93..c73fe5ddeef 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.txt @@ -16,7 +16,7 @@ FILE: K2.kt } public final fun bar(): R|kotlin/Unit| { - this@R|/K2|.R|FakeOverride!|>|(Int(1)) + this@R|/K2|.R|SubstitutionOverride!|>|(Int(1)) this@R|/K2|.R|/J1.baz|() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.txt index c72dbf9a3f5..b54366370df 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.txt @@ -1,8 +1,8 @@ FILE: MapCompute.kt public final fun R|kotlin/collections/MutableMap>|.initAndAdd(key: R|kotlin/String|, value: R|D|): R|kotlin/Unit| { - this@R|/initAndAdd|.R|FakeOverride?|>|(R|/key|, = compute@fun (_: R|ft!|, maybeValues: R|ft, kotlin/collections/MutableSet?>!|): R|ft, kotlin/collections/MutableSet?>!| { + this@R|/initAndAdd|.R|SubstitutionOverride?|>|(R|/key|, = compute@fun (_: R|ft!|, maybeValues: R|ft, kotlin/collections/MutableSet?>!|): R|ft, kotlin/collections/MutableSet?>!| { lval setOfValues: R|kotlin/collections/MutableSet| = R|/maybeValues| ?: R|kotlin/collections/mutableSetOf|() - R|/setOfValues|.R|FakeOverride|(R|/value|) + R|/setOfValues|.R|SubstitutionOverride|(R|/value|) ^ R|/setOfValues| } ) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.txt index 3cc75fc0a34..f1345d9a36b 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.txt @@ -1,12 +1,12 @@ FILE: test.kt public abstract interface UseIterable : R|MyIterable| { public open fun test(): R|kotlin/Unit| { - lval it: R|kotlin/collections/MutableIterator!>| = this@R|/UseIterable|.R|FakeOverride!>|>|() - lval split: R|java/util/Spliterator!>| = this@R|/UseIterable|.R|FakeOverride!>|>|() + lval it: R|kotlin/collections/MutableIterator!>| = this@R|/UseIterable|.R|SubstitutionOverride!>|>|() + lval split: R|java/util/Spliterator!>| = this@R|/UseIterable|.R|SubstitutionOverride!>|>|() } } public final fun test(some: R|kotlin/collections/Iterable|): R|kotlin/Unit| { - lval it: R|kotlin/collections/Iterator| = R|/some|.R|FakeOverride|>|() - lval split: R|java/util/Spliterator!>| = R|/some|.R|FakeOverride!>|>|() + lval it: R|kotlin/collections/Iterator| = R|/some|.R|SubstitutionOverride|>|() + lval split: R|java/util/Spliterator!>| = R|/some|.R|SubstitutionOverride!>|>|() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.txt index c205590d84b..918cf56b99c 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.txt @@ -4,9 +4,9 @@ FILE: test.kt ^ String(value) } ) - lval otherResult: R|ft!| = R|/map|.R|FakeOverride!|>|(String(key), String(value)) - lval anotherResult: R|kotlin/String?| = R|/map|.R|FakeOverride|(String(key), String(value)) - R|/map|.R|FakeOverride|( = forEach@fun (key: R|ft!|, value: R|ft!|): R|kotlin/Unit| { + lval otherResult: R|ft!| = R|/map|.R|SubstitutionOverride!|>|(String(key), String(value)) + lval anotherResult: R|kotlin/String?| = R|/map|.R|SubstitutionOverride|(String(key), String(value)) + R|/map|.R|SubstitutionOverride|( = forEach@fun (key: R|ft!|, value: R|ft!|): R|kotlin/Unit| { R|kotlin/io/println|((R|/key|.R|kotlin/Any.toString|(), String(: ), R|/value|.R|kotlin/Any.toString|())) R|/key|.R|kotlin/String.length| R|/value|.R|kotlin/String.length| @@ -26,9 +26,9 @@ FILE: test.kt ^ String(value) } ) - lval otherResult: R|kotlin/String| = R|/map|.R|FakeOverride|(String(key), String(value)) - lval anotherResult: R|kotlin/String?| = R|/map|.R|FakeOverride|(String(key), String(value)) - R|/map|.R|FakeOverride|( = forEach@fun (key: R|ft!|, value: R|ft!|): R|kotlin/Unit| { + lval otherResult: R|kotlin/String| = R|/map|.R|SubstitutionOverride|(String(key), String(value)) + lval anotherResult: R|kotlin/String?| = R|/map|.R|SubstitutionOverride|(String(key), String(value)) + R|/map|.R|SubstitutionOverride|( = forEach@fun (key: R|ft!|, value: R|ft!|): R|kotlin/Unit| { R|kotlin/io/println|((R|/key|.R|kotlin/Any.toString|(), String(: ), R|/value|.R|kotlin/Any.toString|())) R|/key|.R|kotlin/String.length| R|/value|.R|kotlin/String.length| diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt index 301a91e87af..c456e26a268 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt @@ -1,13 +1,13 @@ FILE: test.kt public final fun R|Call|.testForEach(): R|kotlin/Unit| { - this@R|/testForEach|.R|/Call.arguments|.R|FakeOverride|( = forEach@fun (key: R|ft!|, value: R|ft!|): R|kotlin/Unit| { + this@R|/testForEach|.R|/Call.arguments|.R|SubstitutionOverride|( = forEach@fun (key: R|ft!|, value: R|ft!|): R|kotlin/Unit| { R|/key|.R|kotlin/String.length| R|/value|.R|kotlin/String.length| } ) this@R|/testForEach|.R|/Call.arguments|.R|kotlin/collections/forEach|!|, R|ft!|>( = forEach@fun (it: R|kotlin/collections/Map.Entry!, ft!>|): R|kotlin/Unit| { - R|/it|.R|FakeOverride!|>|.R|kotlin/String.length| - R|/it|.R|FakeOverride!|>|.R|kotlin/String.length| + R|/it|.R|SubstitutionOverride!|>|.R|kotlin/String.length| + R|/it|.R|SubstitutionOverride!|>|.R|kotlin/String.length| } ) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.txt index a7273d97f81..12c0220f823 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.txt @@ -4,5 +4,5 @@ FILE: main.kt public final typealias ImmutableLinkedHashSet = R|imm/LinkedHashSet| private final typealias ImmutableMultimap = R|ImmutableMap>| private final fun R|ImmutableMultimap|.put(key: R|K|, value: R|V|): R|kotlin/Unit| { - this@R|/put|.R|FakeOverride, ImmutableSet?>!>, imm/Option, ImmutableSet?>!>?>!|>|(R|/key|).R|FakeOverride, ImmutableSet?>!|>|(Q|ImmutableLinkedHashSet|.R|imm/LinkedHashSet.empty|!|>()) + this@R|/put|.R|SubstitutionOverride, ImmutableSet?>!>, imm/Option, ImmutableSet?>!>?>!|>|(R|/key|).R|SubstitutionOverride, ImmutableSet?>!|>|(Q|ImmutableLinkedHashSet|.R|imm/LinkedHashSet.empty|!|>()) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.txt index 951b61fe151..781baa70375 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.txt @@ -1,6 +1,6 @@ FILE: mapMerge.kt public final fun foo(x: R|kotlin/collections/MutableMap>|): R|kotlin/Unit| { - R|/x|.R|FakeOverride?|>|(String(), R|kotlin/collections/listOf|(String()), = merge@fun (a: R|ft, kotlin/collections/List?>!|, b: R|ft, kotlin/collections/List?>!|): R|ft, kotlin/collections/List?>!| { + R|/x|.R|SubstitutionOverride?|>|(String(), R|kotlin/collections/listOf|(String()), = merge@fun (a: R|ft, kotlin/collections/List?>!|, b: R|ft, kotlin/collections/List?>!|): R|ft, kotlin/collections/List?>!| { ^ R|/a|.R|kotlin/collections/plus|(R|/b|) } ) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/smartSet.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/smartSet.txt index f531b95e267..1b862b6d507 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/smartSet.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/smartSet.txt @@ -26,5 +26,5 @@ FILE: smartSet.kt } public final fun foo(x: R|kotlin/Any|): R|kotlin/Unit| { lval s: R|SmartSet| = R|/SmartSet.SmartSet|() - R|/s|.R|FakeOverride|(R|/x|) + R|/s|.R|SubstitutionOverride|(R|/x|) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.txt index 5c4dfee8732..9e94c1f750f 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.txt @@ -6,8 +6,8 @@ FILE: kotlinComparatorAlias.kt ) } public final fun test_3(comparator: R|java/util/Comparator|): R|kotlin/Unit| { - R|/comparator|.R|FakeOverride|(Int(1), Int(2)) + R|/comparator|.R|SubstitutionOverride|(Int(1), Int(2)) } public final fun test_4(comparator: R|kotlin/Comparator|): R|kotlin/Unit| { - R|/comparator|.R|FakeOverride|(Int(1), Int(2)) + R|/comparator|.R|SubstitutionOverride|(Int(1), Int(2)) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/mapList.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/mapList.txt index 81603d6f6f5..bfd9ded5db9 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/mapList.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/mapList.txt @@ -6,8 +6,8 @@ FILE: mapList.kt } ) R|/u|.R|/applyX||>( = applyX@fun R|kotlin/collections/List|.(): R|kotlin/Unit| { - this@R|special/anonymous|.R|FakeOverride|(Int(1)) - this@R|special/anonymous|.R|FakeOverride|(Int(1)) + this@R|special/anonymous|.R|SubstitutionOverride|(Int(1)) + this@R|special/anonymous|.R|SubstitutionOverride|(Int(1)) } ) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.txt index c6791a68568..c22424c4793 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.txt @@ -51,9 +51,9 @@ FILE: jvm.kt } public final fun test(): R|kotlin/Unit| { - this@R|/D|.R|FakeOverride|(String()) + this@R|/D|.R|SubstitutionOverride|(String()) this@R|/D|.R|/C.bar|(String()) - this@R|/D|.R|FakeOverride|(String()) + this@R|/D|.R|SubstitutionOverride|(String()) } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/noneWithForEach.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/noneWithForEach.txt index 4ebcc56e213..3a2d20e21f1 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/noneWithForEach.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/noneWithForEach.txt @@ -10,8 +10,8 @@ FILE: noneWithForEach.kt ^ R|/it|.R|/Diagnostic.name| } ).R|kotlin/collections/forEach||>( = forEach@fun (it: R|kotlin/collections/Map.Entry>|): R|kotlin/Unit| { - lval diagnostics: R|kotlin/collections/List| = R|/it|.R|FakeOverride|>| - R|/filtered|.R|FakeOverride|(R|/diagnostics|.R|kotlin/collections/filter|( = filter@fun (me: R|Diagnostic|): R|kotlin/Boolean| { + lval diagnostics: R|kotlin/collections/List| = R|/it|.R|SubstitutionOverride|>| + R|/filtered|.R|SubstitutionOverride|(R|/diagnostics|.R|kotlin/collections/filter|( = filter@fun (me: R|Diagnostic|): R|kotlin/Boolean| { ^ R|/diagnostics|.R|kotlin/collections/none|( = none@fun (other: R|Diagnostic|): R|kotlin/Boolean| { ^ !=(R|/me|, R|/other|) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.txt index 72605020353..d6832dbdd69 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.txt @@ -53,7 +53,7 @@ FILE: problems.kt } } - public final val xx: R|kotlin/Int| = R|/Derived.Derived|().R|FakeOverride|.R|kotlin/Int.plus|(Int(1)) + public final val xx: R|kotlin/Int| = R|/Derived.Derived|().R|SubstitutionOverride|.R|kotlin/Int.plus|(Int(1)) public get(): R|kotlin/Int| public final val t: R|kotlin/Nothing| = throw R|java/lang/AssertionError.AssertionError|(String()) public get(): R|kotlin/Nothing| diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/DeepCopyIrTree.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/DeepCopyIrTree.txt index 010089f66d6..6167084b7c8 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/DeepCopyIrTree.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/DeepCopyIrTree.txt @@ -42,11 +42,11 @@ FILE: DeepCopyIrTree.kt } ) this@R|/DeepCopyIrTreeWithSymbols|.R|/DeepCopyIrTreeWithSymbols.typeRemapper|.R|/withinScope|(this@R|/DeepCopyIrTreeWithSymbols.copyTypeParametersFrom|, = withinScope@fun (): R|kotlin/Unit| { - lval : R|kotlin/collections/Iterator>| = this@R|/DeepCopyIrTreeWithSymbols.copyTypeParametersFrom|.R|/IrTypeParametersContainer.typeParameters|.R|kotlin/collections/zip|(R|/other|.R|/IrTypeParametersContainer.typeParameters|).R|FakeOverride>|>|() + lval : R|kotlin/collections/Iterator>| = this@R|/DeepCopyIrTreeWithSymbols.copyTypeParametersFrom|.R|/IrTypeParametersContainer.typeParameters|.R|kotlin/collections/zip|(R|/other|.R|/IrTypeParametersContainer.typeParameters|).R|SubstitutionOverride>|>|() while(R|/|.R|kotlin/collections/Iterator.hasNext|()) { - lval : R|kotlin/Pair| = R|/|.R|FakeOverride|>|() - lval thisTypeParameter: R|IrTypeParameter| = R|/|.R|FakeOverride|() - lval otherTypeParameter: R|IrTypeParameter| = R|/|.R|FakeOverride|() + lval : R|kotlin/Pair| = R|/|.R|SubstitutionOverride|>|() + lval thisTypeParameter: R|IrTypeParameter| = R|/|.R|SubstitutionOverride|() + lval otherTypeParameter: R|IrTypeParameter| = R|/|.R|SubstitutionOverride|() R|/otherTypeParameter|.R|/IrTypeParameter.superTypes|.R|kotlin/collections/mapTo||>(R|/thisTypeParameter|.R|/IrTypeParameter.superTypes|, = mapTo@fun (it: R|IrType|): R|IrType| { ^ this@R|/DeepCopyIrTreeWithSymbols|.R|/DeepCopyIrTreeWithSymbols.typeRemapper|.R|/TypeRemapper.remapType|(R|/it|) } @@ -60,7 +60,7 @@ FILE: DeepCopyIrTree.kt } public final inline fun R|TypeRemapper|.withinScope(irTypeParametersContainer: R|IrTypeParametersContainer|, fn: R|() -> T|): R|T| { this@R|/withinScope|.R|/TypeRemapper.enterScope|(R|/irTypeParametersContainer|) - lval result: R|T| = R|/fn|.R|FakeOverride|() + lval result: R|T| = R|/fn|.R|SubstitutionOverride|() this@R|/withinScope|.R|/TypeRemapper.leaveScope|() ^withinScope R|/result| } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/EnumMapGet.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/EnumMapGet.txt index 87c0213999f..eff15d6dd58 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/EnumMapGet.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/EnumMapGet.txt @@ -1,5 +1,5 @@ FILE: EnumMapGet.kt public final typealias SomeEnumMap = R|java/util/EnumMap| public final fun test(map: R|SomeEnumMap|, qualifier: R|kotlin/String?|): R|kotlin/Unit| { - lval result: R|kotlin/String?| = R|/map|.R|FakeOverride|(R|/qualifier|) + lval result: R|kotlin/String?| = R|/map|.R|SubstitutionOverride|(R|/qualifier|) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/receiverResolutionInLambda.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/receiverResolutionInLambda.txt index c78245b775f..8c5edf1996f 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/receiverResolutionInLambda.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/receiverResolutionInLambda.txt @@ -7,11 +7,11 @@ FILE: receiverResolutionInLambda.kt public final fun foo(): R|kotlin/Unit| { lval x: R|kotlin/sequences/Sequence| = R|kotlin/sequences/sequence|( = sequence@fun R|kotlin/sequences/SequenceScope|.(): R|kotlin/Unit| { lval y: R|kotlin/sequences/SequenceScope| = this@R|special/anonymous| - this@R|special/anonymous|.R|FakeOverride|(String()) - this@R|special/anonymous|.R|FakeOverride|(String()) + this@R|special/anonymous|.R|SubstitutionOverride|(String()) + this@R|special/anonymous|.R|SubstitutionOverride|(String()) (this@R|special/anonymous| as R|kotlin/sequences/SequenceScope|) - this@R|special/anonymous|.R|FakeOverride|(String()) - this@R|special/anonymous|.R|FakeOverride|(String()) + this@R|special/anonymous|.R|SubstitutionOverride|(String()) + this@R|special/anonymous|.R|SubstitutionOverride|(String()) } ) } @@ -20,11 +20,11 @@ FILE: receiverResolutionInLambda.kt public final fun case2(): R|kotlin/Unit| { lval x: R|kotlin/sequences/Sequence| = R|kotlin/sequences/sequence|( = sequence@fun R|kotlin/sequences/SequenceScope|.(): R|kotlin/Unit| { lval y: R|kotlin/sequences/SequenceScope| = this@R|special/anonymous| - this@R|special/anonymous|.R|FakeOverride|(String()) - this@R|special/anonymous|.R|FakeOverride|(String()) + this@R|special/anonymous|.R|SubstitutionOverride|(String()) + this@R|special/anonymous|.R|SubstitutionOverride|(String()) (this@R|special/anonymous| as R|kotlin/sequences/SequenceScope|) - this@R|special/anonymous|.R|FakeOverride|(String()) - this@R|special/anonymous|.R|FakeOverride|(String()) + this@R|special/anonymous|.R|SubstitutionOverride|(String()) + this@R|special/anonymous|.R|SubstitutionOverride|(String()) } ) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.txt index 48fa23a8b7f..4ca2a2eec04 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.txt @@ -2,5 +2,5 @@ FILE: weakHashMap.kt public final val someMap: R|java/util/WeakHashMap!, ft!>| = R|java/util/WeakHashMap.WeakHashMap|!|, R|ft!|>() public get(): R|java/util/WeakHashMap!, ft!>| public final fun foo(): R|kotlin/Unit| { - R|/someMap|.R|FakeOverride|(String()) + R|/someMap|.R|SubstitutionOverride|(String()) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/recursiveBug.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/recursiveBug.txt index 0d0e7705f30..f30097bfb48 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/recursiveBug.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/recursiveBug.txt @@ -5,7 +5,7 @@ FILE: recursiveBug.kt } public final val result: R|kotlin/String| = this@R|/Foo|.R|kotlin/run|( = run@fun R|Foo|.(): R|kotlin/String| { - ^ R|/name|.R|FakeOverride|() + ^ R|/name|.R|SubstitutionOverride|() } ) public get(): R|kotlin/String| @@ -16,7 +16,7 @@ FILE: recursiveBug.kt } public final fun bar(name: R|() -> kotlin/String|): R|kotlin/Unit| { lval result: R|kotlin/String| = R|kotlin/run|( = run@fun (): R|kotlin/String| { - ^ R|/name|.R|FakeOverride|() + ^ R|/name|.R|SubstitutionOverride|() } ) lval name: R|kotlin/Int| = R|/result|.R|kotlin/String.length| diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.txt index 106649ff9d6..0b335d855d9 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.txt @@ -1,6 +1,6 @@ FILE: removeIf.kt public final fun test(collection: R|kotlin/collections/MutableCollection|): R|kotlin/Unit| { - R|/collection|.R|FakeOverride|( = removeIf@fun (it: R|ft!|): R|kotlin/Boolean| { + R|/collection|.R|SubstitutionOverride|( = removeIf@fun (it: R|ft!|): R|kotlin/Boolean| { ^ R|/it| } ) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.txt index 07d7aa4ba2d..588fa693822 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.txt @@ -1,5 +1,5 @@ FILE: removeOnAbstractMap.kt public final fun test(map: R|java/util/AbstractMap|): R|kotlin/Unit| { - R|/map|.R|FakeOverride|(String(), Null(null)) - R|/map|.R|FakeOverride|(Null(null)) + R|/map|.R|SubstitutionOverride|(String(), Null(null)) + R|/map|.R|SubstitutionOverride|(Null(null)) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.txt index 898662073e3..af361ae3b58 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.txt @@ -1,5 +1,5 @@ FILE: typeAliasDeserialization.kt public final fun main(): R|kotlin/Unit| { - lval a: R|java/util/LinkedHashSet| = R|java/util/LinkedHashSet.LinkedHashSet|() - R|/a|.R|FakeOverride|(String()) + lval a: R|java/util/LinkedHashSet| = R|SubstitutionOverride|() + R|/a|.R|SubstitutionOverride|(String()) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.txt index cd860384fca..3f8196eab3e 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.txt @@ -10,7 +10,7 @@ FILE: typeAliasWithForEach.kt public final typealias Arguments = R|kotlin/collections/Map| public final fun R|Arguments|.deepCopy(): R|Arguments| { lval result: R|java/util/HashMap!, ft!>| = R|java/util/HashMap.HashMap|!|, R|ft!|>() - this@R|/deepCopy|.R|FakeOverride|( = forEach@fun (key: R|ft!|, value: R|ft!|): R|kotlin/Unit| { + this@R|/deepCopy|.R|SubstitutionOverride|( = forEach@fun (key: R|ft!|, value: R|ft!|): R|kotlin/Unit| { R|/result|.R|kotlin/collections/set|!|, R|ft!|>(R|/key|, R|/ArgsInfoImpl.ArgsInfoImpl|(R|/value|)) } ) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeParameterDerived.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeParameterDerived.txt index 822451b2fb9..cd3675e87b9 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeParameterDerived.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeParameterDerived.txt @@ -1,11 +1,11 @@ FILE: typeParameterDerived.kt public final inline fun R|kotlin/collections/MutableMap|.getOrPut(key: R|K|, defaultValue: R|(K) -> VA|, postCompute: R|(VA) -> kotlin/Unit|): R|V| { - lval value: R|V?| = this@R|/getOrPut|.R|FakeOverride|(R|/key|) + lval value: R|V?| = this@R|/getOrPut|.R|SubstitutionOverride|(R|/key|) ^getOrPut when () { ==(R|/value|, Null(null)) -> { - lval answer: R|VA| = R|/defaultValue|.R|FakeOverride|(R|/key|) - this@R|/getOrPut|.R|FakeOverride|(R|/key|, R|/answer|) - R|/postCompute|.R|FakeOverride|(R|/answer|) + lval answer: R|VA| = R|/defaultValue|.R|SubstitutionOverride|(R|/key|) + this@R|/getOrPut|.R|SubstitutionOverride|(R|/key|, R|/answer|) + R|/postCompute|.R|SubstitutionOverride|(R|/answer|) R|/answer| } else -> { diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt index e1024fee384..5cff929d20e 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt @@ -27,7 +27,7 @@ FILE: delegates.kt } public final [IMPLICIT_TYPES_BODY_RESOLVE] val valueWithImplicitType: R|kotlin/Int|by R|/delegate| public get(): R|kotlin/Int| { - ^ D|/valueWithImplicitType|.R|FakeOverride|(Null(null), ::R|/valueWithImplicitType|) + ^ D|/valueWithImplicitType|.R|SubstitutionOverride|(Null(null), ::R|/valueWithImplicitType|) } public final [STATUS] var variableWithExplicitType: R|kotlin/Int|by LAZY_EXPRESSION public get(): { @@ -38,8 +38,8 @@ FILE: delegates.kt } public final [IMPLICIT_TYPES_BODY_RESOLVE] var variableWithImplicitType: R|kotlin/Int|by R|/delegate| public get(): R|kotlin/Int| { - ^ D|/variableWithImplicitType|.R|FakeOverride|(Null(null), ::R|/variableWithImplicitType|) + ^ D|/variableWithImplicitType|.R|SubstitutionOverride|(Null(null), ::R|/variableWithImplicitType|) } public set(: R|kotlin/Int|): R|kotlin/Unit| { - D|/variableWithImplicitType|.R|FakeOverride|(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) + D|/variableWithImplicitType|.R|SubstitutionOverride|(Null(null), ::R|/variableWithImplicitType|, R|/variableWithImplicitType|) }