azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Unify some special names to make code more uniform

Browse Source
This commit is contained in:
Roman Golyshev
2022-05-31 18:09:06 +04:00
parent 023def9d25
commit 01ce499bb2
20 changed files with 159 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignWithArrayAccessConvention.txt
Vendored
+1 -1
View File
@@ -3,4 +3,4 @@ FIR element: FirFunctionCallImpl
FIR source kind: KtRealSourceElementKind FIR source kind: KtRealSourceElementKind
FIR element rendered: FIR element rendered:
R|<local>/<<array>>|.R|SubstitutionOverride</MyMap.set: R|kotlin/Unit|>|(R|<local>/<<index_0>>|, R|<local>/<<array>>|.R|SubstitutionOverride</MyMap.get: R|kotlin/Int|>|(R|<local>/<<index_0>>|).R|kotlin/Int.plus|(Int(1))) R|<local>/<array>|.R|SubstitutionOverride</MyMap.set: R|kotlin/Unit|>|(R|<local>/<index_0>|, R|<local>/<array>|.R|SubstitutionOverride</MyMap.get: R|kotlin/Int|>|(R|<local>/<index_0>|).R|kotlin/Int.plus|(Int(1)))
analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignWithArrayAccessConvention_lhs.txt
Vendored
+1 -1
View File
@@ -3,4 +3,4 @@ FIR element: FirFunctionCallImpl
FIR source kind: DesugaredCompoundAssignment FIR source kind: DesugaredCompoundAssignment
FIR element rendered: FIR element rendered:
R|<local>/<<array>>|.R|SubstitutionOverride</MyMap.get: R|kotlin/Int|>|(R|<local>/<<index_0>>|) R|<local>/<array>|.R|SubstitutionOverride</MyMap.get: R|kotlin/Int|>|(R|<local>/<index_0>|)
compiler/fir/analysis-tests/testData/resolve/arrays/arraySetWithOperation.fir.txt
Vendored
+3 -3
View File
@@ -49,9 +49,9 @@ FILE: arraySetWithOperation.kt
} }
public final fun test_2(a: R|A<C>|): R|kotlin/Unit| { public final fun test_2(a: R|A<C>|): R|kotlin/Unit| {
{ {
lval <<array>>: R|A<C>| = R|<local>/a| lval <array>: R|A<C>| = R|<local>/a|
lval <<index_0>>: R|kotlin/Int| = Int(0) lval <index_0>: R|kotlin/Int| = Int(0)
R|<local>/<<array>>|.R|SubstitutionOverride</A.set: R|kotlin/Unit|>|(R|<local>/<<index_0>>|, R|<local>/<<array>>|.R|SubstitutionOverride</A.get: R|C|>|(R|<local>/<<index_0>>|).R|/C.plus|(R|/C.C|())) R|<local>/<array>|.R|SubstitutionOverride</A.set: R|kotlin/Unit|>|(R|<local>/<index_0>|, R|<local>/<array>|.R|SubstitutionOverride</A.get: R|C|>|(R|<local>/<index_0>|).R|/C.plus|(R|/C.C|()))
} }
} }
compiler/fir/analysis-tests/testData/resolve/callResolution/arraySetWithPlusAssign.fir.txt
Vendored
+10 -10
View File
@@ -174,18 +174,18 @@ FILE: arraySetWithPlusAssign.kt
} }
public final fun test_7(x: R|G|): R|kotlin/Unit| { public final fun test_7(x: R|G|): R|kotlin/Unit| {
{ {
lval <<array>>: R|G| = R|<local>/x| lval <array>: R|G| = R|<local>/x|
lval <<index_0>>: R|kotlin/Int| = Int(1) lval <index_0>: R|kotlin/Int| = Int(1)
lval <<index_1>>: R|kotlin/Int| = Int(2) lval <index_1>: R|kotlin/Int| = Int(2)
lval <<index_2>>: R|kotlin/Int| = Int(3) lval <index_2>: R|kotlin/Int| = Int(3)
R|<local>/<<array>>|.R|/G.set|(R|<local>/<<index_0>>|, R|<local>/<<index_1>>|, R|<local>/<<index_2>>|, R|<local>/<<array>>|.R|/G.get|(R|<local>/<<index_0>>|, R|<local>/<<index_1>>|, R|<local>/<<index_2>>|).R|/G.plus|(fun <anonymous>(): R|kotlin/Unit| <inline=NoInline> { R|<local>/<array>|.R|/G.set|(R|<local>/<index_0>|, R|<local>/<index_1>|, R|<local>/<index_2>|, R|<local>/<array>|.R|/G.get|(R|<local>/<index_0>|, R|<local>/<index_1>|, R|<local>/<index_2>|).R|/G.plus|(fun <anonymous>(): R|kotlin/Unit| <inline=NoInline> {
R|/someCallInsideLambda|() R|/someCallInsideLambda|()
{ {
lval <<array>>: R|G| = R|<local>/x| lval <array>: R|G| = R|<local>/x|
lval <<index_0>>: R|kotlin/Int| = Int(1) lval <index_0>: R|kotlin/Int| = Int(1)
lval <<index_1>>: R|kotlin/Int| = Int(2) lval <index_1>: R|kotlin/Int| = Int(2)
lval <<index_2>>: R|kotlin/Int| = Int(3) lval <index_2>: R|kotlin/Int| = Int(3)
R|<local>/<<array>>|.R|/G.set|(R|<local>/<<index_0>>|, R|<local>/<<index_1>>|, R|<local>/<<index_2>>|, R|<local>/<<array>>|.R|/G.get|(R|<local>/<<index_0>>|, R|<local>/<<index_1>>|, R|<local>/<<index_2>>|).R|/G.plus|(fun <anonymous>(): R|kotlin/Unit| <inline=NoInline> { R|<local>/<array>|.R|/G.set|(R|<local>/<index_0>|, R|<local>/<index_1>|, R|<local>/<index_2>|, R|<local>/<array>|.R|/G.get|(R|<local>/<index_0>|, R|<local>/<index_1>|, R|<local>/<index_2>|).R|/G.plus|(fun <anonymous>(): R|kotlin/Unit| <inline=NoInline> {
R|/someCallInsideLambda|() R|/someCallInsideLambda|()
Q|kotlin/Unit| Q|kotlin/Unit|
} }
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt
+1 -1
View File
@@ -255,7 +255,7 @@ fun FirClass.findNonInterfaceSupertype(context: CheckerContext): FirTypeRef? {
} }
val FirFunctionCall.isIterator: Boolean val FirFunctionCall.isIterator: Boolean
get() = this.calleeReference.name.asString() == "<iterator>" get() = this.calleeReference.name == SpecialNames.ITERATOR
fun ConeKotlinType.isSubtypeOfThrowable(session: FirSession): Boolean = fun ConeKotlinType.isSubtypeOfThrowable(session: FirSession): Boolean =
session.builtinTypes.throwableType.type.isSupertypeOf(session.typeContext, this.fullyExpandedType(session)) session.builtinTypes.throwableType.type.isSupertypeOf(session.typeContext, this.fullyExpandedType(session))
compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/safeCallsWithUnaryOperators.txt
Vendored
+36 -36
View File
@@ -20,45 +20,45 @@ FILE: safeCallsWithUnaryOperators.kt
R|<local>/<unary>| R|<local>/<unary>|
a#?.{ { a#?.{ {
lval <array>: <implicit> = $subj$.b# lval <array>: <implicit> = $subj$.b#
lval <index0>: <implicit> = IntegerLiteral(0) lval <index_0>: <implicit> = IntegerLiteral(0)
lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|) lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary>|.inc#()) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
R|<local>/<unary>| R|<local>/<unary>|
} }
} }
a#?.{ $subj$.b# }?.{ { a#?.{ $subj$.b# }?.{ {
lval <array>: <implicit> = $subj$.c# lval <array>: <implicit> = $subj$.c#
lval <index0>: <implicit> = IntegerLiteral(0) lval <index_0>: <implicit> = IntegerLiteral(0)
lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|) lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary>|.inc#()) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
R|<local>/<unary>| R|<local>/<unary>|
} }
} }
lval <array>: <implicit> = a#?.{ $subj$.b# }.c# lval <array>: <implicit> = a#?.{ $subj$.b# }.c#
lval <index0>: <implicit> = IntegerLiteral(0) lval <index_0>: <implicit> = IntegerLiteral(0)
lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|) lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary>|.inc#()) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
R|<local>/<unary>| R|<local>/<unary>|
a#?.{ { a#?.{ {
lval <array>: <implicit> = $subj$.b#.get#(IntegerLiteral(0)) lval <array>: <implicit> = $subj$.b#.get#(IntegerLiteral(0))
lval <index0>: <implicit> = IntegerLiteral(0) lval <index_0>: <implicit> = IntegerLiteral(0)
lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|) lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary>|.inc#()) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
R|<local>/<unary>| R|<local>/<unary>|
} }
} }
a#?.{ $subj$.b# }?.{ { a#?.{ $subj$.b# }?.{ {
lval <array>: <implicit> = $subj$.c#.get#(IntegerLiteral(0)) lval <array>: <implicit> = $subj$.c#.get#(IntegerLiteral(0))
lval <index0>: <implicit> = IntegerLiteral(0) lval <index_0>: <implicit> = IntegerLiteral(0)
lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|) lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary>|.inc#()) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
R|<local>/<unary>| R|<local>/<unary>|
} }
} }
lval <array>: <implicit> = a#?.{ $subj$.b# }.c#.get#(IntegerLiteral(0)) lval <array>: <implicit> = a#?.{ $subj$.b# }.c#.get#(IntegerLiteral(0))
lval <index0>: <implicit> = IntegerLiteral(0) lval <index_0>: <implicit> = IntegerLiteral(0)
lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|) lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary>|.inc#()) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
R|<local>/<unary>| R|<local>/<unary>|
lval <receiver>: <implicit> = a#?.{ $subj$.b# } lval <receiver>: <implicit> = a#?.{ $subj$.b# }
lval <unary>: <implicit> = R|<local>/<receiver>|.d#() lval <unary>: <implicit> = R|<local>/<receiver>|.d#()
@@ -86,45 +86,45 @@ FILE: safeCallsWithUnaryOperators.kt
R|<local>/<unary-result>| R|<local>/<unary-result>|
a#?.{ { a#?.{ {
lval <array>: <implicit> = $subj$.b# lval <array>: <implicit> = $subj$.b#
lval <index0>: <implicit> = IntegerLiteral(0) lval <index_0>: <implicit> = IntegerLiteral(0)
lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|).inc#() lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|).inc#()
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary-result>|) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary-result>|)
R|<local>/<unary-result>| R|<local>/<unary-result>|
} }
} }
a#?.{ $subj$.b# }?.{ { a#?.{ $subj$.b# }?.{ {
lval <array>: <implicit> = $subj$.c# lval <array>: <implicit> = $subj$.c#
lval <index0>: <implicit> = IntegerLiteral(0) lval <index_0>: <implicit> = IntegerLiteral(0)
lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|).inc#() lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|).inc#()
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary-result>|) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary-result>|)
R|<local>/<unary-result>| R|<local>/<unary-result>|
} }
} }
lval <array>: <implicit> = a#?.{ $subj$.b# }.c# lval <array>: <implicit> = a#?.{ $subj$.b# }.c#
lval <index0>: <implicit> = IntegerLiteral(0) lval <index_0>: <implicit> = IntegerLiteral(0)
lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|).inc#() lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|).inc#()
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary-result>|) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary-result>|)
R|<local>/<unary-result>| R|<local>/<unary-result>|
a#?.{ { a#?.{ {
lval <array>: <implicit> = $subj$.b#.get#(IntegerLiteral(0)) lval <array>: <implicit> = $subj$.b#.get#(IntegerLiteral(0))
lval <index0>: <implicit> = IntegerLiteral(0) lval <index_0>: <implicit> = IntegerLiteral(0)
lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|).inc#() lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|).inc#()
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary-result>|) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary-result>|)
R|<local>/<unary-result>| R|<local>/<unary-result>|
} }
} }
a#?.{ $subj$.b# }?.{ { a#?.{ $subj$.b# }?.{ {
lval <array>: <implicit> = $subj$.c#.get#(IntegerLiteral(0)) lval <array>: <implicit> = $subj$.c#.get#(IntegerLiteral(0))
lval <index0>: <implicit> = IntegerLiteral(0) lval <index_0>: <implicit> = IntegerLiteral(0)
lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|).inc#() lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|).inc#()
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary-result>|) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary-result>|)
R|<local>/<unary-result>| R|<local>/<unary-result>|
} }
} }
lval <array>: <implicit> = a#?.{ $subj$.b# }.c#.get#(IntegerLiteral(0)) lval <array>: <implicit> = a#?.{ $subj$.b# }.c#.get#(IntegerLiteral(0))
lval <index0>: <implicit> = IntegerLiteral(0) lval <index_0>: <implicit> = IntegerLiteral(0)
lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|).inc#() lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|).inc#()
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary-result>|) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary-result>|)
R|<local>/<unary-result>| R|<local>/<unary-result>|
lval <receiver>: <implicit> = a#?.{ $subj$.b# } lval <receiver>: <implicit> = a#?.{ $subj$.b# }
lval <unary-result>: <implicit> = R|<local>/<receiver>|.d#().inc#() lval <unary-result>: <implicit> = R|<local>/<receiver>|.d#().inc#()
compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/unary.txt
Vendored
+12 -12
View File
@@ -58,17 +58,17 @@ FILE: unary.kt
public? final? fun test3(arr: Array<Int>): R|kotlin/Unit| { public? final? fun test3(arr: Array<Int>): R|kotlin/Unit| {
lval x1: <implicit> = { lval x1: <implicit> = {
lval <array>: <implicit> = arr# lval <array>: <implicit> = arr#
lval <index0>: <implicit> = IntegerLiteral(0) lval <index_0>: <implicit> = IntegerLiteral(0)
lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|) lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary>|.inc#()) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
R|<local>/<unary>| R|<local>/<unary>|
} }
lval x2: <implicit> = { lval x2: <implicit> = {
lval <array>: <implicit> = arr# lval <array>: <implicit> = arr#
lval <index0>: <implicit> = IntegerLiteral(1) lval <index_0>: <implicit> = IntegerLiteral(1)
lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|).inc#() lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|).inc#()
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary-result>|) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary-result>|)
R|<local>/<unary-result>| R|<local>/<unary-result>|
} }
@@ -85,17 +85,17 @@ FILE: unary.kt
public? final? fun test4(y: Y): R|kotlin/Unit| { public? final? fun test4(y: Y): R|kotlin/Unit| {
lval x1: <implicit> = { lval x1: <implicit> = {
lval <array>: <implicit> = y#.arr# lval <array>: <implicit> = y#.arr#
lval <index0>: <implicit> = IntegerLiteral(0) lval <index_0>: <implicit> = IntegerLiteral(0)
lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|) lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary>|.inc#()) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
R|<local>/<unary>| R|<local>/<unary>|
} }
lval x2: <implicit> = { lval x2: <implicit> = {
lval <array>: <implicit> = y#.arr# lval <array>: <implicit> = y#.arr#
lval <index0>: <implicit> = IntegerLiteral(1) lval <index_0>: <implicit> = IntegerLiteral(1)
lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index0>|).inc#() lval <unary-result>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|).inc#()
R|<local>/<array>|.set#(R|<local>/<index0>|, R|<local>/<unary-result>|) R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary-result>|)
R|<local>/<unary-result>| R|<local>/<unary-result>|
} }
compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt
+3 -3
View File
@@ -715,7 +715,7 @@ abstract class BaseFirBuilder<T>(val baseSession: FirSession, val context: Conte
val argumentReceiverVariable = generateTemporaryVariable( val argumentReceiverVariable = generateTemporaryVariable(
baseModuleData, baseModuleData,
argumentReceiver?.toFirSourceElement(), argumentReceiver?.toFirSourceElement(),
Name.special("<receiver>"), SpecialNames.RECEIVER,
initializer = receiverFir, initializer = receiverFir,
).also { statements += it } ).also { statements += it }
@@ -795,7 +795,7 @@ abstract class BaseFirBuilder<T>(val baseSession: FirSession, val context: Conte
val arrayVariable = generateTemporaryVariable( val arrayVariable = generateTemporaryVariable(
baseModuleData, baseModuleData,
array?.toFirSourceElement(), array?.toFirSourceElement(),
Name.special("<array>"), name = SpecialNames.ARRAY,
initializer = arrayReceiver, initializer = arrayReceiver,
).also { statements += it } ).also { statements += it }
@@ -803,7 +803,7 @@ abstract class BaseFirBuilder<T>(val baseSession: FirSession, val context: Conte
generateTemporaryVariable( generateTemporaryVariable(
baseModuleData, baseModuleData,
index.toFirSourceElement(), index.toFirSourceElement(),
Name.special("<index$i>"), name = SpecialNames.subscribeOperatorIndex(i),
index.convert() index.convert()
).also { statements += it } ).also { statements += it }
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
+3 -2
View File
@@ -44,6 +44,7 @@ import org.jetbrains.kotlin.fir.visitors.FirTransformer
import org.jetbrains.kotlin.fir.visitors.TransformData import org.jetbrains.kotlin.fir.visitors.TransformData
import org.jetbrains.kotlin.fir.visitors.transformSingle import org.jetbrains.kotlin.fir.visitors.transformSingle
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.name.SpecialNames
import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.name.StandardClassIds
import org.jetbrains.kotlin.resolve.calls.inference.buildAbstractResultingSubstitutor import org.jetbrains.kotlin.resolve.calls.inference.buildAbstractResultingSubstitutor
import org.jetbrains.kotlin.types.AbstractTypeChecker import org.jetbrains.kotlin.types.AbstractTypeChecker
@@ -1304,7 +1305,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
val arrayVariable = generateTemporaryVariable( val arrayVariable = generateTemporaryVariable(
session.moduleData, session.moduleData,
source = lhsGetCall.explicitReceiver?.source?.fakeElement(KtFakeSourceElementKind.DesugaredCompoundAssignment), source = lhsGetCall.explicitReceiver?.source?.fakeElement(KtFakeSourceElementKind.DesugaredCompoundAssignment),
specialName = "<array>", name = SpecialNames.ARRAY,
initializer = lhsGetCall.explicitReceiver ?: buildErrorExpression { initializer = lhsGetCall.explicitReceiver ?: buildErrorExpression {
source = augmentedArraySetCall.source source = augmentedArraySetCall.source
?.fakeElement(KtFakeSourceElementKind.DesugaredCompoundAssignment) ?.fakeElement(KtFakeSourceElementKind.DesugaredCompoundAssignment)
@@ -1321,7 +1322,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
generateTemporaryVariable( generateTemporaryVariable(
session.moduleData, session.moduleData,
source = index.source?.fakeElement(KtFakeSourceElementKind.DesugaredCompoundAssignment), source = index.source?.fakeElement(KtFakeSourceElementKind.DesugaredCompoundAssignment),
specialName = "<index_$i>", name = SpecialNames.subscribeOperatorIndex(i),
initializer = index initializer = index
) )
} }
compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.fir.kt.txt
Vendored
+9 -9
View File
@@ -22,24 +22,24 @@ class C {
fun testVariable() { fun testVariable() {
var x: IntArray = foo() var x: IntArray = foo()
{ // BLOCK { // BLOCK
val <<array>>: IntArray = x val <array>: IntArray = x
val <<index_0>>: Int = 0 val <index_0>: Int = 0
<<array>>.set(index = <<index_0>>, value = <<array>>.get(index = <<index_0>>).plus(other = 1)) <array>.set(index = <index_0>, value = <array>.get(index = <index_0>).plus(other = 1))
} }
} }
fun testCall() { fun testCall() {
{ // BLOCK { // BLOCK
val <<array>>: IntArray = foo() val <array>: IntArray = foo()
val <<index_0>>: Int = bar() val <index_0>: Int = bar()
<<array>>.set(index = <<index_0>>, value = <<array>>.get(index = <<index_0>>).times(other = 2)) <array>.set(index = <index_0>, value = <array>.get(index = <index_0>).times(other = 2))
} }
} }
fun testMember(c: C) { fun testMember(c: C) {
val <array>: IntArray = c.<get-x>() val <array>: IntArray = c.<get-x>()
val <index0>: Int = 0 val <index_0>: Int = 0
val <unary>: Int = <array>.get(index = <index0>) val <unary>: Int = <array>.get(index = <index_0>)
<array>.set(index = <index0>, value = <unary>.inc()) <array>.set(index = <index_0>, value = <unary>.inc())
<unary> /*~> Unit */ <unary> /*~> Unit */
} }
compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.fir.kt.txt
Vendored
+3 -3
View File
@@ -10,8 +10,8 @@ interface IB {
fun IB.test(a: IA) { fun IB.test(a: IA) {
{ // BLOCK { // BLOCK
val <<array>>: IA = a val <array>: IA = a
val <<index_0>>: String = "" val <index_0>: String = ""
(<this>, <<array>>).set(index = <<index_0>>, value = <<array>>.get(index = <<index_0>>).plus(other = 42)) (<this>, <array>).set(index = <index_0>, value = <array>.get(index = <index_0>).plus(other = 42))
} }
} }
compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.fir.kt.txt
Vendored
+18 -18
View File
@@ -45,40 +45,40 @@ fun withVararg(vararg xs: Int): Int {
fun test1() { fun test1() {
{ // BLOCK { // BLOCK
val <<array>>: A = A val <array>: A = A
val <<index_0>>: KFunction1<Int, Unit> = local fun withVararg(p0: Int) { val <index_0>: KFunction1<Int, Unit> = local fun withVararg(p0: Int) {
withVararg(xs = [p0]) withVararg(xs = [p0])
} }
<<array>>.set(i = <<index_0>> /*-> IFoo */, newValue = <<array>>.get(i = <<index_0>> /*-> IFoo */).plus(other = 1)) <array>.set(i = <index_0> /*-> IFoo */, newValue = <array>.get(i = <index_0> /*-> IFoo */).plus(other = 1))
} }
} }
fun test2() { fun test2() {
{ // BLOCK { // BLOCK
val <<array>>: B = B val <array>: B = B
val <<index_0>>: KFunction1<Int, Unit> = local fun withVararg(p0: Int) { val <index_0>: KFunction1<Int, Unit> = local fun withVararg(p0: Int) {
withVararg(xs = [p0]) withVararg(xs = [p0])
} }
<<array>>.set(i = <<index_0>> /*-> IFoo2 */, newValue = <<array>>.get(i = <<index_0>> /*-> IFoo */).plus(other = 1)) <array>.set(i = <index_0> /*-> IFoo2 */, newValue = <array>.get(i = <index_0> /*-> IFoo */).plus(other = 1))
} }
} }
fun test3(fn: Function1<Int, Unit>) { fun test3(fn: Function1<Int, Unit>) {
{ // BLOCK { // BLOCK
val <<array>>: A = A val <array>: A = A
val <<index_0>>: Function1<Int, Unit> = fn val <index_0>: Function1<Int, Unit> = fn
<<array>>.set(i = <<index_0>> /*-> IFoo */, newValue = <<array>>.get(i = <<index_0>> /*-> IFoo */).plus(other = 1)) <array>.set(i = <index_0> /*-> IFoo */, newValue = <array>.get(i = <index_0> /*-> IFoo */).plus(other = 1))
} }
} }
fun test4(fn: Function1<Int, Unit>) { fun test4(fn: Function1<Int, Unit>) {
when { when {
fn is IFoo -> { // BLOCK fn is IFoo -> { // BLOCK
val <<array>>: A = A val <array>: A = A
val <<index_0>>: IFoo = fn /*as IFoo */ val <index_0>: IFoo = fn /*as IFoo */
<<array>>.set(i = <<index_0>>, newValue = <<array>>.get(i = <<index_0>>).plus(other = 1)) <array>.set(i = <index_0>, newValue = <array>.get(i = <index_0>).plus(other = 1))
} }
} }
} }
@@ -86,9 +86,9 @@ fun test4(fn: Function1<Int, Unit>) {
fun test5(a: Any) { fun test5(a: Any) {
a as Function1<Int, Unit> /*~> Unit */ a as Function1<Int, Unit> /*~> Unit */
{ // BLOCK { // BLOCK
val <<array>>: A = A val <array>: A = A
val <<index_0>>: Function1<Int, Unit> = a /*as Function1<Int, Unit> */ val <index_0>: Function1<Int, Unit> = a /*as Function1<Int, Unit> */
<<array>>.set(i = <<index_0>> /*-> IFoo */, newValue = <<array>>.get(i = <<index_0>> /*-> IFoo */).plus(other = 1)) <array>.set(i = <index_0> /*-> IFoo */, newValue = <array>.get(i = <index_0> /*-> IFoo */).plus(other = 1))
} }
} }
@@ -96,8 +96,8 @@ fun test6(a: Any) {
a as Function1<Int, Unit> /*~> Unit */ a as Function1<Int, Unit> /*~> Unit */
a /*as Function1<Int, Unit> */ as IFoo /*~> Unit */ a /*as Function1<Int, Unit> */ as IFoo /*~> Unit */
{ // BLOCK { // BLOCK
val <<array>>: A = A val <array>: A = A
val <<index_0>>: Function1<Int, Unit> = a /*as Function1<Int, Unit> */ val <index_0>: Function1<Int, Unit> = a /*as Function1<Int, Unit> */
<<array>>.set(i = <<index_0>>, newValue = <<array>>.get(i = <<index_0>>).plus(other = 1)) <array>.set(i = <index_0>, newValue = <array>.get(i = <index_0>).plus(other = 1))
} }
} }
compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.kt.txt
Vendored
+3 -3
View File
@@ -43,13 +43,13 @@ object X1 {
fun test1(a: IntArray) { fun test1(a: IntArray) {
var i: Int = 0 var i: Int = 0
val <array>: IntArray = a val <array>: IntArray = a
val <index0>: Int = { // BLOCK val <index_0>: Int = { // BLOCK
val <unary>: Int = i val <unary>: Int = i
i = <unary>.inc() i = <unary>.inc()
<unary> <unary>
} }
val <unary>: Int = <array>.get(index = <index0>) val <unary>: Int = <array>.get(index = <index_0>)
<array>.set(index = <index0>, value = <unary>.inc()) <array>.set(index = <index_0>, value = <unary>.inc())
<unary> /*~> Unit */ <unary> /*~> Unit */
} }
compiler/testData/ir/irText/expressions/incrementDecrement.fir.kt.txt
Vendored
+12 -12
View File
@@ -59,16 +59,16 @@ fun testPropPostfix() {
fun testArrayPrefix() { fun testArrayPrefix() {
val a1: Int = { // BLOCK val a1: Int = { // BLOCK
val <array>: IntArray = <get-arr>() val <array>: IntArray = <get-arr>()
val <index0>: Int = 0 val <index_0>: Int = 0
val <unary-result>: Int = <array>.get(index = <index0>).inc() val <unary-result>: Int = <array>.get(index = <index_0>).inc()
<array>.set(index = <index0>, value = <unary-result>) <array>.set(index = <index_0>, value = <unary-result>)
<unary-result> <unary-result>
} }
val a2: Int = { // BLOCK val a2: Int = { // BLOCK
val <array>: IntArray = <get-arr>() val <array>: IntArray = <get-arr>()
val <index0>: Int = 0 val <index_0>: Int = 0
val <unary-result>: Int = <array>.get(index = <index0>).dec() val <unary-result>: Int = <array>.get(index = <index_0>).dec()
<array>.set(index = <index0>, value = <unary-result>) <array>.set(index = <index_0>, value = <unary-result>)
<unary-result> <unary-result>
} }
} }
@@ -76,16 +76,16 @@ fun testArrayPrefix() {
fun testArrayPostfix() { fun testArrayPostfix() {
val a1: Int = { // BLOCK val a1: Int = { // BLOCK
val <array>: IntArray = <get-arr>() val <array>: IntArray = <get-arr>()
val <index0>: Int = 0 val <index_0>: Int = 0
val <unary>: Int = <array>.get(index = <index0>) val <unary>: Int = <array>.get(index = <index_0>)
<array>.set(index = <index0>, value = <unary>.inc()) <array>.set(index = <index_0>, value = <unary>.inc())
<unary> <unary>
} }
val a2: Int = { // BLOCK val a2: Int = { // BLOCK
val <array>: IntArray = <get-arr>() val <array>: IntArray = <get-arr>()
val <index0>: Int = 0 val <index_0>: Int = 0
val <unary>: Int = <array>.get(index = <index0>) val <unary>: Int = <array>.get(index = <index_0>)
<array>.set(index = <index0>, value = <unary>.dec()) <array>.set(index = <index_0>, value = <unary>.dec())
<unary> <unary>
} }
} }
compiler/testData/ir/irText/expressions/kt28456.fir.kt.txt
Vendored
+8 -8
View File
@@ -21,19 +21,19 @@ fun testSimpleAssignment(a: A) {
fun testPostfixIncrement(a: A): Int { fun testPostfixIncrement(a: A): Int {
return { // BLOCK return { // BLOCK
val <array>: A = a val <array>: A = a
val <index0>: Int = 1 val <index_0>: Int = 1
val <index1>: Int = 2 val <index_1>: Int = 2
val <unary>: Int = <array>.get(xs = [<index0>, <index1>]) val <unary>: Int = <array>.get(xs = [<index_0>, <index_1>])
<array>.set(i = <index0>, j = <index1>, v = <unary>.inc()) <array>.set(i = <index_0>, j = <index_1>, v = <unary>.inc())
<unary> <unary>
} }
} }
fun testCompoundAssignment(a: A) { fun testCompoundAssignment(a: A) {
{ // BLOCK { // BLOCK
val <<array>>: A = a val <array>: A = a
val <<index_0>>: Int = 1 val <index_0>: Int = 1
val <<index_1>>: Int = 2 val <index_1>: Int = 2
<<array>>.set(i = <<index_0>>, j = <<index_1>>, v = <<array>>.get(xs = [<<index_0>>, <<index_1>>]).plus(other = 10)) <array>.set(i = <index_0>, j = <index_1>, v = <array>.get(xs = [<index_0>, <index_1>]).plus(other = 10))
} }
} }
compiler/testData/ir/irText/expressions/kt28456b.fir.kt.txt
Vendored
+6 -6
View File
@@ -21,17 +21,17 @@ fun testSimpleAssignment(a: A) {
fun testPostfixIncrement(a: A): Int { fun testPostfixIncrement(a: A): Int {
return { // BLOCK return { // BLOCK
val <array>: A = a val <array>: A = a
val <index0>: Int = 1 val <index_0>: Int = 1
val <unary>: Int = <array>.get(i = <index0>) val <unary>: Int = <array>.get(i = <index_0>)
<array>.set(i = <index0>, v = <unary>.inc()) <array>.set(i = <index_0>, v = <unary>.inc())
<unary> <unary>
} }
} }
fun testCompoundAssignment(a: A) { fun testCompoundAssignment(a: A) {
{ // BLOCK { // BLOCK
val <<array>>: A = a val <array>: A = a
val <<index_0>>: Int = 1 val <index_0>: Int = 1
<<array>>.set(i = <<index_0>>, v = <<array>>.get(i = <<index_0>>).plus(other = 10)) <array>.set(i = <index_0>, v = <array>.get(i = <index_0>).plus(other = 10))
} }
} }
compiler/testData/ir/irText/expressions/kt36956.fir.kt.txt
Vendored
+3 -3
View File
@@ -25,9 +25,9 @@ val aFloat: A<Float>
val aInt: Float val aInt: Float
field = { // BLOCK field = { // BLOCK
val <array>: A<Float> = <get-aFloat>() val <array>: A<Float> = <get-aFloat>()
val <index0>: Int = 1 val <index_0>: Int = 1
val <unary>: Float = <array>.get(i = <index0>) val <unary>: Float = <array>.get(i = <index_0>)
<array>.set(i = <index0>, v = <unary>.dec()) <array>.set(i = <index_0>, v = <unary>.dec())
<unary> <unary>
} }
get get
compiler/testData/ir/irText/expressions/lambdaInCAO.fir.kt.txt
Vendored
+6 -6
View File
@@ -17,22 +17,22 @@ fun test1(a: Any) {
fun test2(a: Any) { fun test2(a: Any) {
{ // BLOCK { // BLOCK
val <<array>>: Any = a val <array>: Any = a
val <<index_0>>: Function0<Unit> = local fun <anonymous>() { val <index_0>: Function0<Unit> = local fun <anonymous>() {
return Unit return Unit
} }
<<array>>.set(index = <<index_0>>, value = <<array>>.get(index = <<index_0>>).plus(other = 42)) <array>.set(index = <index_0>, value = <array>.get(index = <index_0>).plus(other = 42))
} }
} }
fun test3(a: Any) { fun test3(a: Any) {
val <array>: Any = a val <array>: Any = a
val <index0>: Function0<Unit> = local fun <anonymous>() { val <index_0>: Function0<Unit> = local fun <anonymous>() {
return Unit return Unit
} }
val <unary>: Int = <array>.get(index = <index0>) val <unary>: Int = <array>.get(index = <index_0>)
<array>.set(index = <index0>, value = <unary>.inc()) <array>.set(index = <index_0>, value = <unary>.inc())
<unary> /*~> Unit */ <unary> /*~> Unit */
} }
compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.fir.kt.txt
Vendored
+3 -3
View File
@@ -55,9 +55,9 @@ fun testArrayAccess(nc: C?) {
EQEQ(arg0 = tmp2_safe_receiver, arg1 = null) -> null EQEQ(arg0 = tmp2_safe_receiver, arg1 = null) -> null
else -> { // BLOCK else -> { // BLOCK
val <array>: Int = tmp2_safe_receiver.<get-p>() val <array>: Int = tmp2_safe_receiver.<get-p>()
val <index0>: Int = 0 val <index_0>: Int = 0
val <unary>: Int = <array>.get(index = <index0>) val <unary>: Int = <array>.get(index = <index_0>)
<array>.set(index = <index0>, value = <unary>.inc()) <array>.set(index = <index_0>, value = <unary>.inc())
<unary> <unary>
} }
} }
core/compiler.common/src/org/jetbrains/kotlin/name/SpecialNames.kt
+18
View File
@@ -61,6 +61,24 @@ object SpecialNames {
@JvmField @JvmField
val IMPLICIT_SET_PARAMETER = Name.special("<set-?>") val IMPLICIT_SET_PARAMETER = Name.special("<set-?>")
@JvmField
val ARRAY = Name.special("<array>")
@JvmField
val RECEIVER = Name.special("<receiver>")
/**
* Special name to store expressions used as indexes in subscription operators (`get` and `set`).
*
* For example, `bar1()` and `bar2()` are indexes in `foo[bar1(), bar2()]` call.
*/
@JvmStatic
fun subscribeOperatorIndex(idx: Int): Name {
require(idx >= 0) { "Index should be non-negative, but was $idx" }
return Name.special("<index_$idx>")
}
@JvmStatic @JvmStatic
fun safeIdentifier(name: Name?): Name { fun safeIdentifier(name: Name?): Name {
return if (name != null && !name.isSpecial) name else SAFE_IDENTIFIER_FOR_NO_NAME return if (name != null && !name.isSpecial) name else SAFE_IDENTIFIER_FOR_NO_NAME