[FIR] Fix Java override ambiguity (Kotlin type parameter VS Java Object)

This commit is contained in:
Mikhail Glukhikh
2020-02-07 17:01:10 +03:00
parent 4b5f3b7a94
commit dc7621a112
9 changed files with 24 additions and 18 deletions
@@ -18,6 +18,6 @@ fun main(a: A, b: B, c: ArrayList<Int>) {
a.removeAt(0)
b.remove(1)
b.removeAt(0)
c.<!AMBIGUITY!>remove<!>(1)
c.remove(1)
c.removeAt(0)
}
@@ -14,7 +14,7 @@ fun evaluateArg(expr: CharSequence, numbers: ArrayList<Int>): Int {
if (c >= '0' && c <= '9') {
val n = c <!UNRESOLVED_REFERENCE!>-<!> '0'
if (!numbers.contains(n)) throw Exception("You used incorrect number: " + n)
numbers.<!AMBIGUITY!>remove<!>(n)
numbers.remove(n)
return n
}
throw Exception("Syntax error: Unrecognized character " + c)
@@ -39,9 +39,9 @@ fun test2(value: Any?) {
// From KT-32116
fun test3(h: HashMap<*, *>) {
val a = <!AMBIGUITY!>h["str"]<!>
val b = <!AMBIGUITY!>h[1]<!>
val c = <!AMBIGUITY!>h["other"]<!> as? Double
val a = h["str"]
val b = h[1]
val c = h["other"] as? Double
}
// From KT-32218