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

[FIR] Generate dispatch & extension receivers for variable assignments

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-04-03 15:14:01 +03:00
parent 774fc32f3e
commit d7460d47de
33 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/propertyFromJavaPlusAssign.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
FILE: main.kt
public final fun test(b: R|B|): R|kotlin/Unit| {
R|/B.text| = R|<local>/b|.R|/B.text|.R|kotlin/String.plus|(String())
R|<local>/b|.R|/B.text| = R|<local>/b|.R|/B.text|.R|kotlin/String.plus|(String())
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
+4
View File
@@ -290,6 +290,10 @@ class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransformer) :
source = operatorCall.argument.source
diagnostic = ConeVariableExpectedError()
}
(leftArgument as? FirQualifiedAccess)?.let {
dispatchReceiver = it.dispatchReceiver
extensionReceiver = it.extensionReceiver
}
}
assignment.transform(transformer, ResolutionMode.ContextIndependent)
}
compiler/testData/codegen/box/controlStructures/kt8148.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
class A(var value: String)
fun box(): String {
compiler/testData/codegen/box/controlStructures/kt8148_break.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
class A(var value: String)
fun box(): String {
compiler/testData/codegen/box/controlStructures/kt8148_continue.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
class A(var value: String)
fun box(): String {
compiler/testData/codegen/box/dataClasses/twoVarParams.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
data class A(var x: Int, var y: String)
fun box(): String {
compiler/testData/codegen/box/extensionProperties/kt9897.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
object Test {
var z = "0"
var l = 0L
compiler/testData/codegen/box/extensionProperties/kt9897_topLevel.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
var z = "0"
var l = 0L
compiler/testData/codegen/box/finally/finallyAndFinally.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
class MyString {
var s = ""
operator fun plus(x : String) : MyString {
compiler/testData/codegen/box/finally/kt3894.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
class MyString {
var s = ""
operator fun plus(x : String) : MyString {
compiler/testData/codegen/box/finally/loopAndFinally.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
//KT-3869 Loops and finally: outer finally block not run
class MyString {
compiler/testData/codegen/box/finally/tryLoopTry.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
//test for appropriate
class MyString {
compiler/testData/codegen/box/functions/localFunctions/kt4784.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
open class T(var value: Int) {}
fun plusAssign(): T {
compiler/testData/codegen/box/functions/localFunctions/localExtensionOnNullableParameter.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
open class T(var value: Int) {}
fun localExtensionOnNullableParameter(): T {
compiler/testData/codegen/box/jvmStatic/kt9897_static.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// WITH_RUNTIME
compiler/testData/codegen/box/nonLocalReturns/use.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// WITH_RUNTIME
compiler/testData/codegen/box/nonLocalReturns/useWithException.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// WITH_RUNTIME
compiler/testData/codegen/box/objectIntrinsics/objects.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
package foo
fun box(): String {
compiler/testData/codegen/box/objects/compoundAssignmentToObjectFromCall.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
var log = ""
class A(p: String) {
compiler/testData/codegen/box/objects/compoundAssignmentToPropertyWithQualifier.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
var log = ""
class A(p: String) {
compiler/testData/codegen/box/operatorConventions/assignmentOperations.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
class A() {
var x = 0
}
compiler/testData/codegen/box/operatorConventions/remAssignmentOperation.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// IGNORE_BACKEND_FIR: JVM_IR
class A() {
var x = 5
compiler/testData/codegen/box/operatorConventions/remOverModOperation.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// !LANGUAGE: -ProhibitOperatorMod
// IGNORE_BACKEND_FIR: JVM_IR
class A() {
var x = 5
compiler/testData/codegen/box/package/incrementProperty.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
class Slot() {
var vitality: Int = 10000
compiler/testData/codegen/box/properties/augmentedAssignmentsAndIncrements.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// Enable when KT-14833 is fixed.
// IGNORE_BACKEND: JVM
import kotlin.reflect.KProperty
compiler/testData/codegen/box/secondaryConstructors/basicNoPrimaryManySinks.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
var sideEffects: String = ""
class A {
compiler/testData/codegen/box/secondaryConstructors/basicNoPrimaryOneSink.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
internal var sideEffects: String = ""
internal class A {
compiler/testData/codegen/box/secondaryConstructors/basicPrimary.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
var sideEffects: String = ""
class A() {
compiler/testData/codegen/box/secondaryConstructors/superCallPrimary.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
var sideEffects: String = ""
abstract class B protected constructor(val arg: Int) {
compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt
Vendored
+1
View File
@@ -219,6 +219,7 @@ FILE fqName:<root> fileName:/complexAugmentedAssignment.kt
VALUE_PARAMETER name:b index:0 type:<root>.B
BLOCK_BODY
CALL 'public final fun <set-s> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>.B' type=kotlin.Unit origin=EQ
$this: GET_VAR '<this>: <root>.B declared in <root>.Host.plusAssign' type=<root>.B origin=null
<set-?>: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
$this: CALL 'public final fun <get-s> (): kotlin.Int declared in <root>.B' type=kotlin.Int origin=GET_PROPERTY
$this: GET_VAR '<this>: <root>.B declared in <root>.Host.plusAssign' type=<root>.B origin=null
compiler/testData/ir/irText/expressions/javaSyntheticGenericPropertyAccess.fir.txt
Vendored
+1
View File
@@ -17,6 +17,7 @@ FILE fqName:<root> fileName:/javaSyntheticGenericPropertyAccess.kt
$this: GET_VAR 'val tmp_0: kotlin.Int [val] declared in <root>.test' type=kotlin.Int origin=null
GET_VAR 'val tmp_0: kotlin.Int [val] declared in <root>.test' type=kotlin.Int origin=null
CALL 'public open fun <set-foo> (x: kotlin.Int): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=EQ
$this: GET_VAR 'j: <root>.J<F of <root>.test> declared in <root>.test' type=<root>.J<F of <root>.test> origin=null
x: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
$this: CALL 'public open fun <get-foo> (): kotlin.Int declared in <root>.J' type=kotlin.Int origin=GET_PROPERTY
$this: GET_VAR 'j: <root>.J<F of <root>.test> declared in <root>.test' type=<root>.J<F of <root>.test> origin=null
compiler/testData/ir/irText/expressions/javaSyntheticPropertyAccess.fir.txt
Vendored
+1
View File
@@ -16,6 +16,7 @@ FILE fqName:<root> fileName:/javaSyntheticPropertyAccess.kt
$this: GET_VAR 'val tmp_0: kotlin.Int [val] declared in <root>.test' type=kotlin.Int origin=null
GET_VAR 'val tmp_0: kotlin.Int [val] declared in <root>.test' type=kotlin.Int origin=null
CALL 'public open fun <set-foo> (x: kotlin.Int): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=EQ
$this: GET_VAR 'j: <root>.J declared in <root>.test' type=<root>.J origin=null
x: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
$this: CALL 'public open fun <get-foo> (): kotlin.Int declared in <root>.J' type=kotlin.Int origin=GET_PROPERTY
$this: GET_VAR 'j: <root>.J declared in <root>.test' type=<root>.J origin=null
compiler/testData/ir/irText/expressions/kt16904.fir.txt
Vendored
+1
View File
@@ -82,6 +82,7 @@ FILE fqName:<root> fileName:/kt16904.kt
$this: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1' type=<root>.Test1 origin=null
x: CONST Int type=kotlin.Int value=42
CALL 'public final fun <set-y> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>.A' type=kotlin.Unit origin=EQ
$this: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1' type=<root>.Test1 origin=null
<set-?>: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
$this: CALL 'public final fun <get-y> (): kotlin.Int declared in <root>.A' type=kotlin.Int origin=GET_PROPERTY
$this: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1' type=<root>.Test1 origin=null