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

[FIR] Don't report duplicated errors on default accessor error type refs

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-07-27 13:09:42 +03:00
parent e0d25876b0
commit 749346b73b
22 changed files with 83 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/objects/kt21515/classifierFromCompanionObjectNew.fir.kt
Vendored
+14 -14
View File
@@ -72,28 +72,28 @@ class C : O.B() {
val n: FromCompanionC? = null
// INVISIBLE: direct superclasses themselves.
val a: <!OTHER_ERROR, OTHER_ERROR!>A?<!> = null
val b: <!OTHER_ERROR, OTHER_ERROR!>B?<!> = null
val a: <!OTHER_ERROR!>A?<!> = null
val b: <!OTHER_ERROR!>B?<!> = null
// DEPRECATED: Classifiers from companions of direct superclasses
val e: <!OTHER_ERROR, OTHER_ERROR!>FromCompanionA?<!> = null
val f: <!OTHER_ERROR, OTHER_ERROR!>FromCompanionB?<!> = null
val e: <!OTHER_ERROR!>FromCompanionA?<!> = null
val f: <!OTHER_ERROR!>FromCompanionB?<!> = null
// INVISIBLE: "cousin" supertypes themselves
val g: <!OTHER_ERROR, OTHER_ERROR!>Alpha?<!> = null
val h: <!OTHER_ERROR, OTHER_ERROR!>Beta?<!> = null
val i: <!OTHER_ERROR, OTHER_ERROR!>Gamma?<!> = null
val g: <!OTHER_ERROR!>Alpha?<!> = null
val h: <!OTHER_ERROR!>Beta?<!> = null
val i: <!OTHER_ERROR!>Gamma?<!> = null
// DEPRECATED: classifiers from "cousin" superclasses
val k: <!OTHER_ERROR, OTHER_ERROR!>FromAlpha?<!> = null
val l: <!OTHER_ERROR, OTHER_ERROR!>FromBeta?<!> = null
val m: <!OTHER_ERROR, OTHER_ERROR!>FromGamma?<!> = null
val k: <!OTHER_ERROR!>FromAlpha?<!> = null
val l: <!OTHER_ERROR!>FromBeta?<!> = null
val m: <!OTHER_ERROR!>FromGamma?<!> = null
// INVISIBLE: We don't see classifiers from companions of "cousin" superclasses
val o: <!OTHER_ERROR, OTHER_ERROR!>FromCompanionAlpha?<!> = null
val p: <!OTHER_ERROR, OTHER_ERROR!>FromCompanionBeta?<!> = null
val q: <!OTHER_ERROR, OTHER_ERROR!>FromCompanionGamma?<!> = null
val o: <!OTHER_ERROR!>FromCompanionAlpha?<!> = null
val p: <!OTHER_ERROR!>FromCompanionBeta?<!> = null
val q: <!OTHER_ERROR!>FromCompanionGamma?<!> = null
// DEPRECATED: Classifiers from supertypes of our own companion
val r: <!OTHER_ERROR, OTHER_ERROR!>FromDelta?<!> = null
val r: <!OTHER_ERROR!>FromDelta?<!> = null
}
compiler/testData/diagnostics/tests/objects/kt21515/classifierFromCompanionObjectOld.fir.kt
Vendored
+14 -14
View File
@@ -71,28 +71,28 @@ class C : O.B() {
val n: FromCompanionC? = null
// INVISIBLE: direct superclasses themselves.
val a: <!OTHER_ERROR, OTHER_ERROR!>A?<!> = null
val b: <!OTHER_ERROR, OTHER_ERROR!>B?<!> = null
val a: <!OTHER_ERROR!>A?<!> = null
val b: <!OTHER_ERROR!>B?<!> = null
// DEPRECATED: Classifiers from companions of direct superclasses
val e: <!OTHER_ERROR, OTHER_ERROR!>FromCompanionA?<!> = null
val f: <!OTHER_ERROR, OTHER_ERROR!>FromCompanionB?<!> = null
val e: <!OTHER_ERROR!>FromCompanionA?<!> = null
val f: <!OTHER_ERROR!>FromCompanionB?<!> = null
// INVISIBLE: "cousin" supertypes themselves
val g: <!OTHER_ERROR, OTHER_ERROR!>Alpha?<!> = null
val h: <!OTHER_ERROR, OTHER_ERROR!>Beta?<!> = null
val i: <!OTHER_ERROR, OTHER_ERROR!>Gamma?<!> = null
val g: <!OTHER_ERROR!>Alpha?<!> = null
val h: <!OTHER_ERROR!>Beta?<!> = null
val i: <!OTHER_ERROR!>Gamma?<!> = null
// DEPRECATED: classifiers from "cousin" superclasses
val k: <!OTHER_ERROR, OTHER_ERROR!>FromAlpha?<!> = null
val l: <!OTHER_ERROR, OTHER_ERROR!>FromBeta?<!> = null
val m: <!OTHER_ERROR, OTHER_ERROR!>FromGamma?<!> = null
val k: <!OTHER_ERROR!>FromAlpha?<!> = null
val l: <!OTHER_ERROR!>FromBeta?<!> = null
val m: <!OTHER_ERROR!>FromGamma?<!> = null
// INVISIBLE: We don't see classifiers from companions of "cousin" superclasses
val o: <!OTHER_ERROR, OTHER_ERROR!>FromCompanionAlpha?<!> = null
val p: <!OTHER_ERROR, OTHER_ERROR!>FromCompanionBeta?<!> = null
val q: <!OTHER_ERROR, OTHER_ERROR!>FromCompanionGamma?<!> = null
val o: <!OTHER_ERROR!>FromCompanionAlpha?<!> = null
val p: <!OTHER_ERROR!>FromCompanionBeta?<!> = null
val q: <!OTHER_ERROR!>FromCompanionGamma?<!> = null
// DEPRECATED: Classifiers from supertypes of our own companion
val r: <!OTHER_ERROR, OTHER_ERROR!>FromDelta?<!> = null
val r: <!OTHER_ERROR!>FromDelta?<!> = null
}