[FIR2IR]: fix translation of this references in instance methods

Currently FirThisReceiverExpression of instance methods are translated to references of the class' thisReceiver, not the method's dispatch receiver, which causes problems with IrFrameMap::typeOf, as the class' thisReceiver is not in the typeMap. This commit translates non-qualified "this" references of instance methods to references of the methods' dispatch receiver.
2020-01-08 16:20:45 -08:00
parent 6b4e5bc2f0
commit 573188bdc4
112 changed files with 102 additions and 200 deletions
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Test {
    fun check(a: Any?): String {
        if (this === a) return "Fail 1"
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface FirstTrait
 interface SecondTrait

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KT-16291 Smart cast doesn't work when getting class of instance

 class Foo(val s: String) {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A {
    private val p: Int
        get() = 4
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class Foo {
  fun xyzzy(): String = "xyzzy"
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Greeter(var name : String) {
    fun greet() {
        name = name.plus("")
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 public interface LoggerAware {
    public val logger: StringBuilder
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class C(val s: String) {
    fun test(): String {
        return s
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: test.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: test.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class MyQueue {
    fun poll(): String? =  null
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class MyQueue {
    fun poll(): String? =  null
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Foo {
  var rnd = 10

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A(var string: String)

 fun box(): String {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A(val x: Int) {
  override fun equals(other: Any?): Boolean = false
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A(val v: Any?)

 data class B<T>(val v: T)
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Dummy {
  override fun equals(other: Any?) = true
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A(val arg: Any? = null)

 fun box() : String {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A(val x: Int) {
  override fun hashCode(): Int = -3
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A(val a: Any?, var x: Int)
 data class B(val a: Any?)
 data class C(val a: Int, var x: Int?)
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A(var x: Int, val z: Int)

 fun box(): String {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A(val x: Int, val y: Any?, val z: String)

 fun box(): String {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 abstract class Base {
    final override fun toString() = "OK"
    final override fun hashCode() = 42
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A(val x: Int) {
  override fun toString(): String = "!"
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A(val x: Int, val y: String)

 fun box(): String {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A(val x: Unit)

 fun box(): String {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 import kotlin.reflect.KProperty

 class Delegate {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // DONT_RUN_GENERATED_CODE: JS
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Test {
    val Int.foo: String
        get() = "OK"
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Test {
    val Int.foo: String
        get() {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Test {
    private val Int.foo: String
        get() {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 public class MPair<out A> (
        public val first: A
 ) {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class T4(
  val c1: Boolean,
  val c2: Boolean,
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A(val expected: Int) {
    fun foo(x: Int, y: Int = x + 20, z: Int = y * 2) = z == expected
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 //KT-3821 Invoke convention doesn't work for `this`

 class A() {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 //KT-3822 Compiler crashes when use invoke convention with `this` in class which extends Function0<T>
 // IGNORE_BACKEND: JS
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 object A {
    var x = 0

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class AByte(var value: Byte) {
    operator fun get(i: Int) = value

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // See KT-9246 IllegalAccessError when trying to access protected nested class from parent class
 // FILE: a.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun box(): String {
    abstract class L1 {
        abstract fun foo(): String
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun box(): String {
    val result = "OK"

@@ -1,5 +1,4 @@
 // !JVM_DEFAULT_MODE: enable
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM

 // WITH_RUNTIME
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // TARGET_BACKEND: JVM
 object ObjectThisTest {
@@ -1,5 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-
 class A (val p: String, p1: String, p2: String) {

    var cond1 :String = ""
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 var holder = ""

 var mainShape: Shape? = null
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 package t

 class Reproduce {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Range(val from : C, val to: C) {
    operator fun iterator() = It(from, to)
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Range(val from : C, val to: C) {
    operator fun iterator() = It(from, to)
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Range(val from : C, val to: C) {
    operator fun iterator() = It(from, to)
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Range(val from : C, val to: C) {
    operator fun iterator() = It(from, to)
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Range(val from : C, val to: C) {
    operator fun iterator() = It(from, to)
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Range(val from : C, val to: C) {
    operator fun iterator() = It(from, to)
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Range(val from : C, val to: C) {
    operator fun iterator() = It(from, to)
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class Z(val p: String, val k: String)


@@ -1,5 +1,4 @@
 // !LANGUAGE: +ProperVisibilityForCompanionObjectInstanceField
-// IGNORE_BACKEND_FIR: JVM_IR

 class Outer {
    private companion object {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 import Foo.bar0 as bar

 object Foo {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class C(val x: Int) {
  override fun equals(rhs: Any?): Boolean {
    if (rhs is C) {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // Strictly speaking, asymmetric equals violates contract for 'Object#equals'.
 // However, we don't rely on this contract so far.
 class FakeInt(val value: Int) {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Book(val name: String) : Comparable<Book> {
  override fun compareTo(other: Book) = name.compareTo(other.name)
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 public abstract class BaseClass() {
    protected abstract val kind : String

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 public abstract class BaseClass() {
    open val kind : String = "BaseClass "

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 package pack

 open class A(val value: String )
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 package testing

 class Test {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 public class A {
    fun getFromClass(): Boolean {
        try {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A {
    private lateinit var str: String

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-
 class SS {
    private lateinit var s: String

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface Intf {
    val str: String
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface Intf {
    val str: String
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // MODULE: lib
 // FILE: lib.kt
 class A {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface Sample {
    val callMe: Int
 }
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: WithGenerics.java

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: WithPrimary.java

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: WithoutPrimary.java

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class SuperFoo {
    public fun bar(): String {
        if (this is Foo) {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A {
    class B : A() {
        val a = "FAIL"
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A {
    fun f(): String =
            when (this) {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A {
    open fun foo() = "FAIL"

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class KFoo {
    fun foo(): String {
        if (this is KFooQux) return qux
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KT-5956 java.lang.AbstractMethodError: test.Thing.subSequence(II)Ljava/lang/CharSequence

 class Thing(val delegate: CharSequence) : CharSequence {
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface A<T> {
    val property : T

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS

 interface A {
@@ -1,5 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-
 class A (val p: String, p1: String, p2: String) {

    var cond1: String = ""