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

Revert "Fix ISE when inferring type of a property that delegates to itself"

Browse Source 
This reverts commit 1a03d5c93e.

The reason is that original change seems to be breaking (see KT-44137).

^KT-44137 Relates
^KT-37796 Open
This commit is contained in:
Denis.Zharkov
2020-12-29 15:45:34 +03:00
parent 826985450e
commit b7a382f097
7 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/delegatedProperty/kt37796.fir.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
val foo by <!UNRESOLVED_REFERENCE!>foo<!>
val bar by <!UNRESOLVED_REFERENCE!><!INAPPLICABLE_CANDIDATE!>baz<!>(bar)<!>
fun <T> baz(t: T): T = t
compiler/testData/diagnostics/tests/delegatedProperty/kt37796.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
val foo by <!DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>foo<!>
val bar by <!DELEGATE_SPECIAL_FUNCTION_MISSING!>baz(<!DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>bar<!>)<!>
fun <T> baz(t: T): T = t
compiler/testData/diagnostics/tests/delegatedProperty/kt37796.txt
Vendored
-6
View File
@@ -1,6 +0,0 @@
package
public val bar: [ERROR : Type from delegate]
public val foo: [ERROR : <ERROR FUNCTION RETURN TYPE>]
public fun </*0*/ T> baz(/*0*/ t: T): T
compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt
Vendored
+2 -2
View File
@@ -4,12 +4,12 @@
import kotlin.reflect.KProperty
val a by <!DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>a<!>
val a by <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM{OI}!>a<!>
val b by Delegate(<!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>b<!>)
val c by <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, UNINITIALIZED_VARIABLE!>d<!>
val d by <!DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>c<!>
val d by <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM{OI}!>c<!>
class Delegate(i: Int) {
operator fun getValue(t: Any?, p: KProperty<*>): Int {