Cleanup deprecated symbol usages in testData

compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt

@@ -17,15 +17,15 @@ enum class E {
 }
 
 fun box(): String {
-    val e = javaClass<E>()
+    val e = E::class.java
 
     val e1 = e.getDeclaredField(E.E1.toString()).getAnnotations()
-    if (e1.size() != 1) return "Fail E1 size: ${e1.toList()}"
-    if (e1[0].annotationType() != javaClass<First>()) return "Fail E1: ${e1.toList()}"
+    if (e1.size != 1) return "Fail E1 size: ${e1.toList()}"
+    if (e1[0].annotationClass.java != First::class.java) return "Fail E1: ${e1.toList()}"
 
     val e2 = e.getDeclaredField(E.E2.toString()).getAnnotations()
-    if (e2.size() != 1) return "Fail E2 size: ${e2.toList()}"
-    if (e2[0].annotationType() != javaClass<Second>()) return "Fail E2: ${e2.toList()}"
+    if (e2.size != 1) return "Fail E2 size: ${e2.toList()}"
+    if (e2[0].annotationClass.java != Second::class.java) return "Fail E2: ${e2.toList()}"
 
     return (e2[0] as Second).value
 }

compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/funExpression.kt

@@ -8,7 +8,7 @@ fun foo0(block: () -> Unit) = block.javaClass
 fun foo1(block: (String) -> Unit) = block.javaClass
 
 fun testMethod(method: Method, name: String) {
-    assertEquals("OK", method.getAnnotation(javaClass<Ann>()).x, "On method of test named `$name`")
+    assertEquals("OK", method.getAnnotation(Ann::class.java).x, "On method of test named `$name`")
 
     for ((index, annotations) in method.getParameterAnnotations().withIndex()) {
         val ann = annotations.filterIsInstance<Ann>().single()

compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/lambda.kt

@@ -8,7 +8,7 @@ annotation class Ann(val x: String)
 fun foo0(block: () -> Unit) = block.javaClass
 
 fun testMethod(method: Method, name: String) {
-    assertEquals("OK", method.getAnnotation(javaClass<Ann>()).x, "On method of test named `$name`")
+    assertEquals("OK", method.getAnnotation(Ann::class.java).x, "On method of test named `$name`")
 
     for ((index, annotations) in method.getParameterAnnotations().withIndex()) {
         val ann = annotations.filterIsInstance<Ann>().single()

compiler/testData/codegen/boxWithStdlib/annotations/annotationsOnDefault.kt

@@ -15,18 +15,18 @@ fun test(name: String, annotations: Array<out Annotation>) {
 }
 
 fun box(): String {
-    val foo = javaClass<A>().getDeclaredMethods().first { it.getName() == "foo" }
+    val foo = A::class.java.getDeclaredMethods().first { it.getName() == "foo" }
     test("foo", foo.getDeclaredAnnotations())
 
-    val fooDefault = javaClass<A>().getDeclaredMethods().first { it.getName() == "foo\$default" }
+    val fooDefault = A::class.java.getDeclaredMethods().first { it.getName() == "foo\$default" }
     test("foo", foo.getDeclaredAnnotations())
 
-    val (secondary, secondaryDefault) = javaClass<A>().getDeclaredConstructors().partition { it.getParameterTypes().size() == 3 }
+    val (secondary, secondaryDefault) = A::class.java.getDeclaredConstructors().partition { it.getParameterTypes().size == 3 }
 
     test("secondary", secondary[0].getDeclaredAnnotations())
     test("secondary\$default", secondaryDefault[0].getDeclaredAnnotations())
 
-    val (primary, primaryDefault) = javaClass<B>().getConstructors().partition { it.getParameterTypes().size() == 3 }
+    val (primary, primaryDefault) = B::class.java.getConstructors().partition { it.getParameterTypes().size == 3 }
 
     test("primary", primary[0].getDeclaredAnnotations())
     test("primary\$default", primaryDefault[0].getDeclaredAnnotations())

compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt

@@ -12,14 +12,14 @@ annotation class Ann(
 )
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.i != 1) return "fail: annotation parameter i should be 1, but was ${ann.i}"
     if (ann.s != "a") return "fail: annotation parameter s should be \"a\", but was ${ann.s}"
-    val annSimpleName = ann.a.annotationType().getSimpleName()
+    val annSimpleName = ann.a.annotationClass.java.getSimpleName()
     if (annSimpleName != "Ann2") return "fail: annotation parameter a should be of class Ann2, but was $annSimpleName"
     if (ann.e != MyEnum.A) return "fail: annotation parameter e should be MyEnum.A, but was ${ann.e}"
-    if (ann.c.java != javaClass<A>()) return "fail: annotation parameter c should be of class A, but was ${ann.c}"
+    if (ann.c.java != A::class.java) return "fail: annotation parameter c should be of class A, but was ${ann.c}"
     if (ann.ia[0] != 1 || ann.ia[1] != 2) return "fail: annotation parameter ia should be [1, 2], but was ${ann.ia}"
     if (ann.sa[0] != "a" || ann.sa[1] != "b") return "fail: annotation parameter ia should be [\"a\", \"b\"], but was ${ann.sa}"
     return "OK"

compiler/testData/codegen/boxWithStdlib/annotations/delegatedPropertySetter.kt

@@ -17,11 +17,11 @@ class Delegate {
 }
 
 fun box(): String {
-    val e = javaClass<MyClass>()
+    val e = MyClass::class.java
 
-    val e1 = e.getDeclaredMethod("setX", javaClass<String>()).getAnnotations()
-    if (e1.size() != 1) return "Fail E1 size: ${e1.toList()}"
-    if (e1[0].annotationType() != javaClass<First>()) return "Fail: ${e1.toList()}"
+    val e1 = e.getDeclaredMethod("setX", String::class.java).getAnnotations()
+    if (e1.size != 1) return "Fail E1 size: ${e1.toList()}"
+    if (e1[0].annotationClass.java != First::class.java) return "Fail: ${e1.toList()}"
 
     return MyClass().x
 }

compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt

@@ -1,7 +1,7 @@
 @Ann(Foo.i, Foo.s, Foo.f, Foo.d, Foo.l, Foo.b, Foo.bool, Foo.c, Foo.str) class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.i != 2) return "fail: annotation parameter i should be 2, but was ${ann.i}"
     if (ann.s != 2.toShort()) return "fail: annotation parameter i should be 2, but was ${ann.i}"

compiler/testData/codegen/boxWithStdlib/annotations/kotlinTopLevelPropertyAsParameter.kt

@@ -1,7 +1,7 @@
 @Ann(i, s, f, d, l, b, bool, c, str) class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.i != 2) return "fail: annotation parameter i should be 2, but was ${ann.i}"
     if (ann.s != 2.toShort()) return "fail: annotation parameter i should be 2, but was ${ann.i}"

compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt

@@ -1,7 +1,7 @@
 @Ann(A.B.i) class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.i != 1) return "fail: annotation parameter i should be 1, but was ${ann.i}"
     return "OK"

compiler/testData/codegen/boxWithStdlib/annotations/parameterWithPrimitiveType.kt

@@ -11,7 +11,7 @@ annotation class Ann(
 )
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.b != 1.toByte()) return "fail: annotation parameter b should be 1, but was ${ann.b}"
     if (ann.s != 1.toShort()) return "fail: annotation parameter s should be 1, but was ${ann.s}"

compiler/testData/codegen/boxWithStdlib/annotations/propertyWithPropertyInInitializerAsParameter.kt

@@ -1,7 +1,7 @@
 @Ann(i) class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.i != 1) return "fail: annotation parameter i should be 1, but was ${ann.i}"
     return "OK"

compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt

@@ -16,25 +16,25 @@ annotation class Ann(vararg val p: Int)
 @Ann(p = *intArrayOf(1, 2)) class MyClass10
 
 fun box(): String {
-    test(javaClass<MyClass1>(), "")
-    test(javaClass<MyClass2>(), "1")
-    test(javaClass<MyClass3>(), "12")
+    test(MyClass1::class.java, "")
+    test(MyClass2::class.java, "1")
+    test(MyClass3::class.java, "12")
 
-    test(javaClass<MyClass4>(), "")
-    test(javaClass<MyClass5>(), "1")
-    test(javaClass<MyClass6>(), "12")
+    test(MyClass4::class.java, "")
+    test(MyClass5::class.java, "1")
+    test(MyClass6::class.java, "12")
 
-    test(javaClass<MyClass7>(), "1")
+    test(MyClass7::class.java, "1")
 
-    test(javaClass<MyClass8>(), "")
-    test(javaClass<MyClass9>(), "1")
-    test(javaClass<MyClass10>(), "12")
+    test(MyClass8::class.java, "")
+    test(MyClass9::class.java, "1")
+    test(MyClass10::class.java, "12")
 
     return "OK"
 }
 
 fun test(klass: Class<*>, expected: String) {
-    val ann = klass.getAnnotation(javaClass<Ann>())
+    val ann = klass.getAnnotation(Ann::class.java)
     if (ann == null) throw AssertionError("fail: cannot find Ann on ${klass}")
 
     var result = ""

compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt

@@ -2,7 +2,7 @@ fun box(): String {
     val x : Array<Array<*>> = arrayOf(arrayOf(1))
     val y : Array<in Array<String>> = x
 
-    if (y.size() != 1) return "fail 1"
+    if (y.size != 1) return "fail 1"
 
     y[0] = arrayOf("OK")
 

compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfList.kt

@@ -2,7 +2,7 @@ fun box(): String {
     val x: Array<List<*>> = arrayOf(listOf(1))
     val y : Array<in List<String>> = x
 
-    if (y.size() != 1) return "fail 1"
+    if (y.size != 1) return "fail 1"
 
     y[0] = listOf("OK")
 

compiler/testData/codegen/boxWithStdlib/arrays/kt945.kt

@@ -1,7 +1,7 @@
 fun box() : String {
     val data = Array<Array<Boolean>>(3) { Array<Boolean>(4, {false}) }
     for(d in data) {
-        if(d.size() != 4) return "fail"
+        if(d.size != 4) return "fail"
         for(b in d) if (b) return "fail"
     }
 

compiler/testData/codegen/boxWithStdlib/arrays/stdlib.kt

@@ -39,7 +39,7 @@ class MutableArray<T>(length: Int, init : (Int) -> T) : ReadOnlyArray<T>, WriteO
     override fun set(index : Int, value : T) : Unit { array[index] = value }
 
     override val size : Int
-        get() = array.size()
+        get() = array.size
 }
 
 fun box() : String {

compiler/testData/codegen/boxWithStdlib/boxingOptimization/progressions.kt

@@ -4,22 +4,22 @@ import kotlin.test.assertEquals
 fun box() : String {
 
     val result1 = (1..100).count { x -> x % 2 == 0 }
-    val result2 = (1..100).filter { x -> x % 2 == 0 }.size()
+    val result2 = (1..100).filter { x -> x % 2 == 0 }.size
     assertEquals(result1, 50)
     assertEquals(result2, 50)
 
     val result3 = (1..100).map { x -> 2 * x }.count { x -> x % 2 == 0 }
-    val result4 = (1..100).map { x -> 2 * x }.filter { x -> x % 2 == 0 }.size()
+    val result4 = (1..100).map { x -> 2 * x }.filter { x -> x % 2 == 0 }.size
     assertEquals(result3, 100)
     assertEquals(result4, 100)
 
     val result5 = (1L..100L).count { x -> x % 2 == 0L }
-    val result6 = (1L..100L).filter { x -> x % 2 == 0L }.size()
+    val result6 = (1L..100L).filter { x -> x % 2 == 0L }.size
     assertEquals(result5, 50)
     assertEquals(result6, 50)
 
     val result7 = (1L..100L).map { x -> 2 * x }.count { x -> x % 2 == 0L }
-    val result8 = (1L..100L).map { x -> 2 * x }.filter { x -> x % 2 == 0L }.size()
+    val result8 = (1L..100L).map { x -> 2 * x }.filter { x -> x % 2 == 0L }.size
     assertEquals(result7, 100)
     assertEquals(result8, 100)
 

compiler/testData/codegen/boxWithStdlib/casts/asWithMutable.kt

@@ -118,7 +118,7 @@ fun box(): String {
     asSucceeds("mentry as MutableMap.MutableEntry") { mentry as MutableMap.MutableEntry<*, *> }
 
     hashMap[""] = ""
-    val hashMapEntry = hashMap.entrySet().first()
+    val hashMapEntry = hashMap.entries.first()
 
     asSucceeds("hashMapEntry as MutableMap.MutableEntry") { hashMapEntry as MutableMap.MutableEntry<*, *> }
 

compiler/testData/codegen/boxWithStdlib/casts/isWithMutable.kt

@@ -96,7 +96,7 @@ fun box(): String {
     val mentry = MME()
 
     hashMap[""] = ""
-    val hashMapEntry = hashMap.entrySet().first()
+    val hashMapEntry = hashMap.entries.first()
 
     assert(entry !is MutableMap.MutableEntry<*, *>) { "ME should satisfy '!is MutableMap.MutableEntry'"}
     assert(mentry is MutableMap.MutableEntry<*, *>) { "MME should satisfy 'is MutableMap.MutableEntry'"}

compiler/testData/codegen/boxWithStdlib/casts/reifiedAsWithMutable.kt

@@ -118,7 +118,7 @@ fun box(): String {
     val mentry = MME()
 
     hashMap[""] = ""
-    val hashMapEntry = hashMap.entrySet().first()
+    val hashMapEntry = hashMap.entries.first()
 
     reifiedAsFailsWithCCE<MutableMap.MutableEntry<*, *>>(entry, "reifiedAs<MutableMap.MutableEntry<*, *>>(entry)")
     reifiedAsSucceeds<MutableMap.MutableEntry<*, *>>(mentry, "reifiedAs<MutableMap.MutableEntry<*, *>>(mentry)")

compiler/testData/codegen/boxWithStdlib/casts/reifiedIsWithMutable.kt

@@ -99,7 +99,7 @@ fun box(): String {
     val mentry = MME()
 
     hashMap[""] = ""
-    val hashMapEntry = hashMap.entrySet().first()
+    val hashMapEntry = hashMap.entries.first()
 
     assert(reifiedIsNot<MutableMap.MutableEntry<*, *>>(entry)) { "reifiedIsNot<MutableMap.MutableEntry<*, *>>(entry)"}
     assert(reifiedIs<MutableMap.MutableEntry<*, *>>(mentry)) { "reifiedIs<MutableMap.MutableEntry<*, *>>(mentry)"}

compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsWithMutable.kt

@@ -120,7 +120,7 @@ fun box(): String {
     val mentry = MME()
 
     hashMap[""] = ""
-    val hashMapEntry = hashMap.entrySet().first()
+    val hashMapEntry = hashMap.entries.first()
 
     reifiedSafeAsReturnsNull<MutableMap.MutableEntry<*, *>>(entry, "reifiedSafeAs<MutableMap.MutableEntry<*, *>>(entry)")
     reifiedSafeAsReturnsNonNull<MutableMap.MutableEntry<*, *>>(mentry, "reifiedSafeAs<MutableMap.MutableEntry<*, *>>(mentry)")

compiler/testData/codegen/boxWithStdlib/casts/safeAsWithMutable.kt

@@ -117,7 +117,7 @@ fun box(): String {
     safeAsReturnsNonNull("mentry as? MutableMap.MutableEntry") { mentry as? MutableMap.MutableEntry<*, *> }
 
     hashMap[""] = ""
-    val hashMapEntry = hashMap.entrySet().first()
+    val hashMapEntry = hashMap.entries.first()
 
     safeAsReturnsNonNull("hashMapEntry as? MutableMap.MutableEntry") { hashMapEntry as? MutableMap.MutableEntry<*, *> }
 

compiler/testData/codegen/boxWithStdlib/casts/unitAsInt.kt

@@ -8,7 +8,7 @@ fun box(): String {
         return "OK"
     }
     catch (e: Throwable) {
-        return "Fail: ClassCastException should have been thrown, but was instead ${e.javaClass.getName()}: ${e.getMessage()}"
+        return "Fail: ClassCastException should have been thrown, but was instead ${e.javaClass.getName()}: ${e.message}"
     }
 
     return "Fail: no exception was thrown"

compiler/testData/codegen/boxWithStdlib/dataClasses/doubleParam.kt

@@ -26,5 +26,5 @@ fun box(): String {
     if (A(-2.72) !in s) return "Fail: -2.72 not found"
     if (A(NAN) !in s) return "Fail: NaN not found"
 
-    return if (s.size() == 5) "OK" else "Fail $s"
+    return if (s.size == 5) "OK" else "Fail $s"
 }

compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclaredWrongSignature.kt

@@ -16,17 +16,17 @@ data class E(val x: Int) {
 }
 
 fun box(): String {
-  javaClass<B>().getDeclaredMethod("equals", javaClass<Any>())
-  javaClass<B>().getDeclaredMethod("equals", javaClass<B>())
+  B::class.java.getDeclaredMethod("equals", Any::class.java)
+  B::class.java.getDeclaredMethod("equals", B::class.java)
 
-  javaClass<C>().getDeclaredMethod("equals", javaClass<Any>())
-  javaClass<C>().getDeclaredMethod("equals")
+  C::class.java.getDeclaredMethod("equals", Any::class.java)
+  C::class.java.getDeclaredMethod("equals")
 
-  javaClass<D>().getDeclaredMethod("equals", javaClass<Any>())
-  javaClass<D>().getDeclaredMethod("equals", javaClass<Any>(), javaClass<String>())
+  D::class.java.getDeclaredMethod("equals", Any::class.java)
+  D::class.java.getDeclaredMethod("equals", Any::class.java, String::class.java)
 
-  javaClass<E>().getDeclaredMethod("equals", javaClass<Any>())
-  javaClass<E>().getDeclaredMethod("equals", javaClass<E>())
+  E::class.java.getDeclaredMethod("equals", Any::class.java)
+  E::class.java.getDeclaredMethod("equals", E::class.java)
 
   return "OK"
 }

compiler/testData/codegen/boxWithStdlib/dataClasses/floatParam.kt

@@ -26,5 +26,5 @@ fun box(): String {
     if (A(-2.72f) !in s) return "Fail: -2.72 not found"
     if (A(NAN) !in s) return "Fail: NaN not found"
 
-    return if (s.size() == 5) "OK" else "Fail $s"
+    return if (s.size == 5) "OK" else "Fail $s"
 }

compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt

@@ -7,11 +7,11 @@ data class B(val x: Int) {
 }
 
 fun box(): String {
-  javaClass<A>().getDeclaredMethod("hashCode")
-  javaClass<A>().getDeclaredMethod("hashCode", javaClass<Any>())
+  A::class.java.getDeclaredMethod("hashCode")
+  A::class.java.getDeclaredMethod("hashCode", Any::class.java)
 
-  javaClass<B>().getDeclaredMethod("hashCode")
-  javaClass<B>().getDeclaredMethod("hashCode", javaClass<B>(), javaClass<Any>())
+  B::class.java.getDeclaredMethod("hashCode")
+  B::class.java.getDeclaredMethod("hashCode", B::class.java, Any::class.java)
 
   return "OK"
 }

compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclaredWrongSignature.kt

@@ -7,11 +7,11 @@ data class B(val x: Int) {
 }
 
 fun box(): String {
-  javaClass<A>().getDeclaredMethod("toString")
-  javaClass<A>().getDeclaredMethod("toString", javaClass<Any>())
+  A::class.java.getDeclaredMethod("toString")
+  A::class.java.getDeclaredMethod("toString", Any::class.java)
 
-  javaClass<B>().getDeclaredMethod("toString")
-  javaClass<B>().getDeclaredMethod("toString", javaClass<B>(), javaClass<Any>())
+  B::class.java.getDeclaredMethod("toString")
+  B::class.java.getDeclaredMethod("toString", B::class.java, Any::class.java)
 
   return "OK"
 }

compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/checkIfConstructorIsSynthetic.kt

@@ -1,6 +1,6 @@
 class A(value: Int = 1)
 
 fun box(): String {
-    val constructors = javaClass<A>().getConstructors().filter { !it.isSynthetic() }
-    return if (constructors.size() == 2) "OK" else constructors.size().toString()
+    val constructors = A::class.java.getConstructors().filter { !it.isSynthetic() }
+    return if (constructors.size == 2) "OK" else constructors.size.toString()
 }

compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/manyArgs.kt

@@ -160,7 +160,7 @@ class C(val a: Int = 1,
 
 fun box(): String {
     val test1 = A(4, e = 8, f = 15, w = 16, aa = 23, ff = 42).toString()
-    val test2 = javaClass<A>().newInstance().toString()
+    val test2 = A::class.java.newInstance().toString()
     val test3 = A(32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, q = 16, r = 15, s = 14, t = 13,
                   u = 12, v = 11, w = 10, x = 9, y = 8, z = 7, aa = 6, bb = 5, cc = 4, dd = 3, ee = 2, ff = 1).toString()
     if (test1 != "4 2 3 4 8 15 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 16 24 25 26 23 28 29 30 31 42") {
@@ -174,7 +174,7 @@ fun box(): String {
     }
 
     val test4 = B(54, 217, h = 236, l = 18, q = 3216, u = 8, aa = 22, ff = 33, jj = 44, mm = 55).toString()
-    val test5 = javaClass<B>().newInstance().toString()
+    val test5 = B::class.java.newInstance().toString()
     val test6 = B(40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, u = 20, v = 19,
                   w = 18, x = 17, y = 16, z = 15, aa = 14, bb = 13, cc = 12, dd = 11, ee = 10, ff = 9, gg = 8, hh = 7, ii = 6,
                   jj = 5, kk = 4, ll = 3, mm = 2, nn = 1).toString()
@@ -189,7 +189,7 @@ fun box(): String {
     }
 
     val test7 = C(5, f = 3, w = 1, aa = 71, nn = 2, qq = 15, ww = 97, aaa = 261258, iii = 3, nnn = 8, rrr = 7).toString()
-    val test8 = javaClass<C>().newInstance().toString()
+    val test8 = C::class.java.newInstance().toString()
     val test9 = C(70, 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41,
                   40, 39, 38, 37, 36, jj = 35, kk = 34, ll = 33, mm = 32, nn = 31, oo = 30, pp = 29, qq = 28, rr = 27, ss = 26, tt = 25,
                   uu = 24, vv = 23, ww = 22, xx = 21, yy = 20, zz = 19, aaa = 18, bbb = 17, ccc = 16, ddd = 15, eee = 14, fff = 13,

compiler/testData/codegen/boxWithStdlib/evaluate/char.kt

@@ -6,7 +6,7 @@ annotation class Ann(val c1: Int)
 @Ann('a' - 'a') class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.c1 != 0) return "fail : expected = ${1}, actual = ${annotation.c1}"
     return "OK"
 }

compiler/testData/codegen/boxWithStdlib/evaluate/divide.kt

@@ -9,7 +9,7 @@ annotation class Ann(
 @Ann(1 / 1, 1 / 1, 1 / 1, 1 / 1) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.b != 1.toByte()) return "fail 1"
     if (annotation.s != 1.toShort()) return "fail 2"
     if (annotation.i != 1) return "fail 2"

compiler/testData/codegen/boxWithStdlib/evaluate/intrincics.kt

@@ -18,7 +18,7 @@ val prop6: Int = 1 ushr 1
 @Ann(1 or 1, 1 and 1, 1 xor 1, 1 shl 1, 1 shr 1, 1 ushr 1) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"

compiler/testData/codegen/boxWithStdlib/evaluate/maxValue.kt

@@ -18,7 +18,7 @@ annotation class Ann(
 ) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != 128) return "fail 1, expected = ${128}, actual = ${annotation.p1}"
     if (annotation.p2 != 32768) return "fail 2, expected = ${32768}, actual = ${annotation.p2}"
     if (annotation.p3 != -2147483648) return "fail 3, expected = ${-2147483648}, actual = ${annotation.p3}"

compiler/testData/codegen/boxWithStdlib/evaluate/maxValueByte.kt

@@ -14,7 +14,7 @@ annotation class Ann(
 ) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != 128) return "fail 1, expected = ${128}, actual = ${annotation.p1}"
     if (annotation.p2 != 2.toByte()) return "fail 2, expected = ${2}, actual = ${annotation.p2}"
     if (annotation.p4 != 2) return "fail 4, expected = ${2}, actual = ${annotation.p4}"

compiler/testData/codegen/boxWithStdlib/evaluate/maxValueInt.kt

@@ -14,7 +14,7 @@ annotation class Ann(
 ) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != -2147483648) return "fail 1, expected = ${-2147483648}, actual = ${annotation.p1}"
     if (annotation.p2 != 2) return "fail 2, expected = ${2}, actual = ${annotation.p2}"
     if (annotation.p4 != 2.toLong()) return "fail 4, expected = ${2}, actual = ${annotation.p4}"

compiler/testData/codegen/boxWithStdlib/evaluate/miltiply.kt

@@ -18,7 +18,7 @@ val prop6: Float = 1.0.toFloat() * 1.0.toFloat()
 @Ann(1 * 1, 1 * 1, 1 * 1, 1 * 1, 1.0 * 1.0, 1.0.toFloat() * 1.0.toFloat()) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"

compiler/testData/codegen/boxWithStdlib/evaluate/minus.kt

@@ -18,7 +18,7 @@ val prop6: Float = 1.0.toFloat() - 1.0.toFloat()
 @Ann(1 - 1, 1 - 1, 1 - 1, 1 - 1, 1.0 - 1.0, 1.0.toFloat() - 1.0.toFloat()) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"

compiler/testData/codegen/boxWithStdlib/evaluate/mod.kt

@@ -18,7 +18,7 @@ val prop6: Float = 1.0.toFloat() % 1.0.toFloat()
 @Ann(1 % 1, 1 % 1, 1 % 1, 1 % 1, 1.0 % 1.0, 1.0.toFloat() % 1.0.toFloat()) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"

compiler/testData/codegen/boxWithStdlib/evaluate/paranthesized.kt

@@ -18,7 +18,7 @@ val prop6: Float = (1.toFloat() + 2) * 2
 @Ann((1 + 2) * 2, (1 + 2) * 2, (1 + 2) * 2, (1 + 2) * 2, (1.0 + 2) * 2, (1.toFloat() + 2) * 2) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"

compiler/testData/codegen/boxWithStdlib/evaluate/plus.kt

@@ -18,7 +18,7 @@ val prop6: Float = 1.0.toFloat() + 1.0.toFloat()
 @Ann(1 + 1, 1 + 1, 1 + 1, 1 + 1, 1.0 + 1.0, 1.0.toFloat() + 1.0.toFloat()) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"

compiler/testData/codegen/boxWithStdlib/evaluate/simpleCallBinary.kt

@@ -16,7 +16,7 @@ const val prop5: Int = 1.mod(1)
 @Ann(prop1, prop2, prop3, prop4, prop5) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"

compiler/testData/codegen/boxWithStdlib/evaluate/unaryMinus.kt

@@ -18,7 +18,7 @@ const val prop6: Float = -1.0.toFloat()
 @Ann(prop1, prop2, prop3, prop4, prop5, prop6) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"

compiler/testData/codegen/boxWithStdlib/evaluate/unaryPlus.kt

@@ -18,7 +18,7 @@ const val prop6: Float = +1.0.toFloat()
 @Ann(prop1, prop2, prop3, prop4, prop5, prop6) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"

compiler/testData/codegen/boxWithStdlib/fullJdk/genericBackingFieldSignature.kt

@@ -36,7 +36,7 @@ class Test<T>(val constructorProperty: T) {
 }
 
 fun box(): String {
-    val clz = javaClass<Test<*>>()
+    val clz = Test::class.java
 
     val constructorProperty = clz.getDeclaredField("constructorProperty");
 

compiler/testData/codegen/boxWithStdlib/fullJdk/genericMethodSignature.kt

@@ -22,14 +22,14 @@ class Test<T, X, in Y>() {
 }
 
 fun box(): String {
-    val clz = javaClass<Test<*, *, *>>()
+    val clz = Test::class.java
 
     val params = listOf(
-            Params(1, javaClass<Any>(), "T", "T"),
-            Params(2, javaClass<Z<*>>(), "Z<T>", "Z<T>"),
-            Params(3, javaClass<Z<*>>(), "Z<java.lang.String>", "Z<java.lang.String>"),
-            Params(4, javaClass<Any>(), "Zout<java.lang.String>", "X"),
-            Params(5, javaClass<Any>(), "Zin<TParam>", "Y")
+            Params(1, Any::class.java, "T", "T"),
+            Params(2, Z::class.java, "Z<T>", "Z<T>"),
+            Params(3, Z::class.java, "Z<java.lang.String>", "Z<java.lang.String>"),
+            Params(4, Any::class.java, "Zout<java.lang.String>", "X"),
+            Params(5, Any::class.java, "Zin<TParam>", "Y")
     )
 
 

compiler/testData/codegen/boxWithStdlib/fullJdk/jvmAnnotationFlags.kt

@@ -15,7 +15,7 @@ class C {
 }
 
 fun box(): String {
-    val c = javaClass<C>()
+    val c = C::class.java
 
     if (c.getDeclaredField("vol").getModifiers() and Modifier.VOLATILE == 0) return "Fail: volatile"
     if (c.getDeclaredField("tra").getModifiers() and Modifier.TRANSIENT == 0) return "Fail: transient"

compiler/testData/codegen/boxWithStdlib/fullJdk/native/default.kt

@@ -18,7 +18,7 @@ fun box(): String {
         return "Link error expected on object"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != "foo.ObjWithNative.bar(JLjava/lang/String;)D") return "Fail 1: " + e.getMessage()
+        if (e.message != "foo.ObjWithNative.bar(JLjava/lang/String;)D") return "Fail 1: " + e.message
     }
 
     try {
@@ -26,7 +26,7 @@ fun box(): String {
         return "Link error expected on object"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != "foo.ObjWithNative.foo(I)D") return "Fail 2: " + e.getMessage()
+        if (e.message != "foo.ObjWithNative.foo(I)D") return "Fail 2: " + e.message
     }
 
     try {
@@ -34,7 +34,7 @@ fun box(): String {
         return "Link error expected on object"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != "foo.DefaultKt.topLevel(I)D") return "Fail 3: " + e.getMessage()
+        if (e.message != "foo.DefaultKt.topLevel(I)D") return "Fail 3: " + e.message
     }
     return "OK"
 }

compiler/testData/codegen/boxWithStdlib/fullJdk/native/nativePropertyAccessors.kt

@@ -29,7 +29,7 @@ fun check(body: () -> Unit, signature: String): String? {
         return "Link error expected"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != signature) return "Fail $signature: " + e.getMessage()
+        if (e.message != signature) return "Fail $signature: " + e.message
     }
 
     return null

compiler/testData/codegen/boxWithStdlib/fullJdk/native/privateStatic.kt

@@ -16,7 +16,7 @@ fun box(): String {
         return "Link error expected"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != "C.foo()V") return "Fail 1: " + e.getMessage()
+        if (e.message != "C.foo()V") return "Fail 1: " + e.message
     }
 
     return "OK"

compiler/testData/codegen/boxWithStdlib/fullJdk/native/staticNative.kt

@@ -19,7 +19,7 @@ fun box(): String {
         return "Link error expected"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != "foo.WithNative.bar(JLjava/lang/String;)D") return "Fail 1: " + e.getMessage()
+        if (e.message != "foo.WithNative.bar(JLjava/lang/String;)D") return "Fail 1: " + e.message
     }
 
     try {
@@ -27,7 +27,7 @@ fun box(): String {
         return "Link error expected on object"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != "foo.ObjWithNative.bar(JLjava/lang/String;)D") return "Fail 2: " + e.getMessage()
+        if (e.message != "foo.ObjWithNative.bar(JLjava/lang/String;)D") return "Fail 2: " + e.message
     }
     return "OK"
 }

compiler/testData/codegen/boxWithStdlib/fullJdk/native/topLevel.kt

@@ -12,7 +12,7 @@ fun box(): String {
         return "Link error expected on object"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != "foo.TopLevelKt.bar(JLjava/lang/String;)D") return "Fail 1: " + e.getMessage()
+        if (e.message != "foo.TopLevelKt.bar(JLjava/lang/String;)D") return "Fail 1: " + e.message
     }
 
     return "OK"

compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt

@@ -8,7 +8,7 @@ fun box(): String {
         return "Fail: an exception should be thrown"
     } catch (e: IllegalStateException) {
         val st = (e as java.lang.Throwable).getStackTrace()
-        if (st.size() < 5) {
+        if (st.size < 5) {
             return "Fail: very small stack trace, should at least have current function and JUnit reflective calls: ${Arrays.toString(st)}"
         }
         val top = st[0]

compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/collections.kt

@@ -6,9 +6,9 @@ import kotlin.test.assertTrue
 import java.security.KeyPair
 
 
-fun <T> testCollectionSize(c: Collection<T>) = assertEquals(0, c.size())
+fun <T> testCollectionSize(c: Collection<T>) = assertEquals(0, c.size)
 fun <T> testCollectionIsEmpty(c: Collection<T>) = assertTrue(c.isEmpty())
-fun <T> testCollectionContains(c: Collection<T>) = assertTrue(c.contains(1))
+fun <T> testCollectionContains(c: Collection<T>) = assertTrue(c.contains(1 as Any?))
 fun <T> testCollectionIterator(c: Collection<T>) {
     val it = c.iterator()
     while (it.hasNext()) {
@@ -18,12 +18,12 @@ fun <T> testCollectionIterator(c: Collection<T>) {
 fun <T> testCollectionContainsAll(c: Collection<T>) = assertTrue(c.containsAll(c))
 fun <T> testMutableCollectionAdd(c: MutableCollection<T>, t: T) {
     c.add(t)
-    assertEquals(1, c.size())
+    assertEquals(1, c.size)
     assertTrue(c.contains(t))
 }
 fun <T> testMutableCollectionRemove(c: MutableCollection<T>, t: T) {
     c.remove(t)
-    assertEquals(0, c.size())
+    assertEquals(0, c.size)
     assertFalse(c.contains(t))
 }
 fun <T> testMutableCollectionIterator(c: MutableCollection<T>, t: T) {
@@ -33,7 +33,7 @@ fun <T> testMutableCollectionIterator(c: MutableCollection<T>, t: T) {
         it.next()
         it.remove()
     }
-    assertEquals(0, c.size())
+    assertEquals(0, c.size)
 }
 fun <T> testMutableCollectionAddAll(c: MutableCollection<T>, t1: T, t2: T) {
     c.addAll(arrayListOf(t1, t2))
@@ -114,16 +114,16 @@ fun testList() {
 }
 
 fun <K, V> testMapContainsKey(map: Map<K, V>, k: K) = assertTrue(map.containsKey(k))
-fun <K, V> testMapKeys(map: Map<K, V>, k1: K, k2: K) = assertEqualCollections(hashSetOf(k1, k2), map.keySet())
-fun <K, V> testMapValues(map: Map<K, V>, v1: V, v2: V) = assertEqualCollections(hashSetOf(v1, v2), map.values())
+fun <K, V> testMapKeys(map: Map<K, V>, k1: K, k2: K) = assertEqualCollections(hashSetOf(k1, k2), map.keys)
+fun <K, V> testMapValues(map: Map<K, V>, v1: V, v2: V) = assertEqualCollections(hashSetOf(v1, v2), map.values)
 fun <K, V> testMapEntrySet(map: Map<K, V>, k : K, v: V) {
-    for (entry in map.entrySet()) {
+    for (entry in map.entries) {
         assertEquals(k, entry.key)
         assertEquals(v, entry.value)
     }
 }
 fun <K, V> testMutableMapEntry(map: MutableMap<K, V>, k1 : K, v: V) {
-    for (entry in map.entrySet()) {
+    for (entry in map.entries) {
         entry.setValue(v)
     }
     assertEquals(hashMapOf(k1 to v), map)

compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt528.kt

@@ -34,24 +34,24 @@ class Luhny() {
         // }
 
         if (it.isDigit()) {
-            digits.addLast(it.toInt() - '0'.toInt())
+            digits.addLast(it - '0')
         } else if (it == ' ' || it == '-') {
         } else {
             printAll()
             digits.clear()
         }
 
-        if (digits.size() > 16)
+        if (digits.size > 16)
           printOneDigit()
         check()
     }
 
     fun check() {
-        if (digits.size() < 14) return
+        if (digits.size < 14) return
         print("check")
         val sum = digits.sum { i, d ->
 //            println("$i -> $d")
-            if (i % 2 == digits.size()) {
+            if (i % 2 == digits.size) {
                 val f = d * 2 / 10
                 val s = d * 2 % 10
 //                println("$d: f = $f, s = $s")
@@ -61,7 +61,7 @@ class Luhny() {
             } else d
         }
 //        println(sum)
-        if (sum % 10 == 0) {print("s"); toBeMasked = digits.size()}
+        if (sum % 10 == 0) {print("s"); toBeMasked = digits.size}
     }
 
     fun printOneDigit() {
@@ -98,8 +98,8 @@ fun <T> T.pr(f : (T) -> Unit) : T {
 
 fun LinkedList<Int>.sum(f : (Int, Int )-> Int): Int {
     var sum = 0
-    for (i in 1..size()) {
-        val j = size() - i
+    for (i in 1..size) {
+        val j = size - i
         sum += f(j, get(j))
     }
     return sum

compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt529.kt

@@ -31,19 +31,19 @@ class Luhny() {
         // }
 
         if (it.isDigit()) {
-            digits.addLast(it.toInt() - '0'.toInt())
+            digits.addLast(it - '0')
         } else if (it == ' ' || it == '-') {
         } else {
             printAll()
         }
 
-        if (digits.size() > 16)
+        if (digits.size > 16)
           printOneDigit()
         check()
     }
 
     private fun check() {
-        val size = digits.size()
+        val size = digits.size
         if (size < 14) return
         val sum = digits.sum {i, d ->
             if (i % 2 == size % 2) double(d) else d
@@ -54,7 +54,7 @@ class Luhny() {
 //            sum += if (i % 2 == size % 2) double(d) else d
 //            i++
 //        }
-        if (sum % 10 == 0) toBeMasked = digits.size()
+        if (sum % 10 == 0) toBeMasked = digits.size
     }
 
     private fun double(d : Int) = d * 2 / 10 + d * 2 % 10

compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt533.kt

@@ -35,26 +35,26 @@ class Luhny() {
         // }
 
         if (it.isDigit()) {
-            digits.push(it.toInt() - '0'.toInt())
+            digits.push(it - '0')
         } else if (it == ' ' || it == '-') {
         } else {
             printAll()
             digits.clear()
         }
 
-        if (digits.size() > 16)
+        if (digits.size > 16)
           printOneDigit()
         check()
     }
 
     fun check() {
-        if (digits.size() < 14) return
+        if (digits.size < 14) return
         val sum = digits.sum { i, d ->
             if (i % 2 != 0)
                 d * 2 / 10 +  d * 2 % 10
             else d
         }
-        if (sum % 10 == 0) toBeMasked = digits.size()
+        if (sum % 10 == 0) toBeMasked = digits.size
     }
 
     fun printOneDigit() {
@@ -97,7 +97,7 @@ fun LinkedList<Int>.sum(f : (Int, Int) -> Int) : Int {
 fun <T> List<T>.backwards() : Iterable<T> = object : Iterable<T> {
   override fun iterator() : Iterator<T> =
       object : Iterator<T> {
-          var current = size()
+          var current = size
           override fun next() : T = get(--current)
           override fun hasNext() : Boolean = current > 0
       }

compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nonLocalReturn.kt

@@ -56,7 +56,7 @@ class TestLocal(val name: String, val executionType: ExecutionType) : Callable<S
     fun nonLocalSimple(): String {
         synchronized(mutex) {
             underMutexFun()
-            return executionType.name()
+            return executionType.name
         }
         return "fail"
     }
@@ -65,9 +65,9 @@ class TestLocal(val name: String, val executionType: ExecutionType) : Callable<S
         synchronized(mutex) {
             try {
                 underMutexFun()
-                throw MyException(executionType.name())
+                throw MyException(executionType.name)
             } catch (e: MyException) {
-                return e.getMessage()!!
+                return e.message!!
             }
         }
         return "fail"
@@ -79,7 +79,7 @@ class TestLocal(val name: String, val executionType: ExecutionType) : Callable<S
                 underMutexFun()
                 return "fail"
             } finally {
-                return executionType.name()
+                return executionType.name
             }
         }
         return "fail"
@@ -89,9 +89,9 @@ class TestLocal(val name: String, val executionType: ExecutionType) : Callable<S
         synchronized(mutex) {
             try {
                 underMutexFun()
-                throw MyException(executionType.name())
+                throw MyException(executionType.name)
             } catch (e: MyException) {
-                return e.getMessage()!!
+                return e.message!!
             } finally {
                 "123"
             }
@@ -103,11 +103,11 @@ class TestLocal(val name: String, val executionType: ExecutionType) : Callable<S
         synchronized(mutex) {
             try {
                 underMutexFun()
-                throw MyException(executionType.name())
+                throw MyException(executionType.name)
             } catch (e: MyException) {
                 return "fail1"
             } finally {
-                return executionType.name()
+                return executionType.name
             }
         }
         return "fail"
@@ -118,11 +118,11 @@ class TestLocal(val name: String, val executionType: ExecutionType) : Callable<S
             try {
                 try {
                     underMutexFun()
-                    throw MyException(executionType.name())
+                    throw MyException(executionType.name)
                 } catch (e: MyException) {
                     return "fail1"
                 } finally {
-                    return executionType.name()
+                    return executionType.name
                 }
             } finally {
                 val p = 1 + 1
@@ -150,7 +150,7 @@ fun testTemplate(type: ExecutionType, producer: (Int) -> Callable<String>): Stri
         }
 
         for (f in futures) {
-            if (f.get() != type.name()) return "failed result ${f.get()} != ${type.name()}"
+            if (f.get() != type.name) return "failed result ${f.get()} != ${type.name}"
         }
     } finally {
 

compiler/testData/codegen/boxWithStdlib/jdk/arrayList.kt

@@ -8,6 +8,6 @@ fun box(): String {
     val j: Int = a.get(1)
     if (i != 74) return "fail 1"
     if (j != 75) return "fail 2"
-    if (a.size() != 2) return "epic fail"
+    if (a.size != 2) return "epic fail"
     return "OK"
 }

compiler/testData/codegen/boxWithStdlib/jdk/hashMap.kt

@@ -7,9 +7,9 @@ fun box(): String {
     map.put("ccc", 3)
     map.put("dddd", 4)
     if (map.get("a") != 1) return "fail 1"
-    if (map.size() != 4) return "fail 2"
+    if (map.size != 4) return "fail 2"
     if (map.get("eeeee") != null) return "fail 3"
     if (!map.containsKey("bb")) return "fail 4"
-    if (map.entrySet().contains("ffffff")) return "fail 5"
+    if (map.entries.contains("ffffff" as Any)) return "fail 5"
     return "OK"
 }

compiler/testData/codegen/boxWithStdlib/jdk/iteratingOverHashMap.kt

@@ -9,7 +9,7 @@ fun box() : String {
 fun testIteratingOverMap1() : Boolean {
     val map = HashMap<String, Int>()
     map.put("a", 1)
-    for (entry in map.entrySet()) {
+    for (entry in map.entries) {
         entry.setValue(2)
     }
     return map.get("a") == 2
@@ -18,7 +18,7 @@ fun testIteratingOverMap1() : Boolean {
 fun testIteratingOverMap2() : Boolean {
     val map : MutableMap<String, Int> = HashMap<String, Int>()
     map.put("a", 1)
-    for (entry in map.entrySet()) {
+    for (entry in map.entries) {
         entry.setValue(2)
     }
     return map.get("a") == 2

compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt

@@ -7,6 +7,6 @@ class C {
 }
 
 fun box(): String {
-    val m = javaClass<C>().getMethod("foo", javaClass<String>())
+    val m = C::class.java.getMethod("foo", String::class.java)
     return m.invoke(null, "O") as String
 }

compiler/testData/codegen/boxWithStdlib/jvmOverloads/defaultsNotAtEnd.kt

@@ -6,6 +6,6 @@ class C {
 
 fun box(): String {
     val c = C()
-    val m = c.javaClass.getMethod("foo", javaClass<Int>(), javaClass<Int>())
+    val m = c.javaClass.getMethod("foo", Int::class.java, Int::class.java)
     return m.invoke(c, 1, 2) as String
 }

compiler/testData/codegen/boxWithStdlib/jvmOverloads/doubleParameters.kt

@@ -6,6 +6,6 @@ class C {
 
 fun box(): String {
     val c = C()
-    val m = c.javaClass.getMethod("foo", javaClass<Double>(), javaClass<Double>())
+    val m = c.javaClass.getMethod("foo", Double::class.java, Double::class.java)
     return m.invoke(c, 1.0, 2.0) as String
 }

compiler/testData/codegen/boxWithStdlib/jvmOverloads/extensionMethod.kt

@@ -6,6 +6,6 @@ class C {
 }
 
 fun box(): String {
-    val m = javaClass<C>().getClassLoader().loadClass("ExtensionMethodKt").getMethod("foo", javaClass<C>(), javaClass<String>())
+    val m = C::class.java.getClassLoader().loadClass("ExtensionMethodKt").getMethod("foo", C::class.java, String::class.java)
     return m.invoke(null, C(), "O") as String
 }

compiler/testData/codegen/boxWithStdlib/jvmOverloads/nonDefaultParameter.kt

@@ -6,6 +6,6 @@ class C {
 
 fun box(): String {
     val c = C()
-    val m = c.javaClass.getMethod("foo", javaClass<String>())
+    val m = c.javaClass.getMethod("foo", String::class.java)
     return m.invoke(c, "O") as String
 }

compiler/testData/codegen/boxWithStdlib/jvmOverloads/primaryConstructor.kt

@@ -3,6 +3,6 @@ class C @kotlin.jvm.JvmOverloads constructor(s1: String, s2: String = "K") {
 }
 
 fun box(): String {
-    val c = (javaClass<C>().getConstructor(javaClass<String>()).newInstance("O"))
+    val c = (C::class.java.getConstructor(String::class.java).newInstance("O"))
     return c.status
 }

compiler/testData/codegen/boxWithStdlib/jvmOverloads/secondaryConstructor.kt

@@ -7,6 +7,6 @@ class C(val i: Int) {
 }
 
 fun box(): String {
-    val c = (javaClass<C>().getConstructor(javaClass<String>()).newInstance("O"))
+    val c = (C::class.java.getConstructor(String::class.java).newInstance("O"))
     return c.status
 }

compiler/testData/codegen/boxWithStdlib/nonLocalReturns/use.kt

@@ -41,7 +41,7 @@ class TestLocal() : Closeable {
                 underMutexFun()
                 throw MyException("exception")
             } catch (e: MyException) {
-                status += e.getMessage()!!
+                status += e.message!!
                 return status
             }
         }
@@ -67,7 +67,7 @@ class TestLocal() : Closeable {
                 underMutexFun()
                 throw MyException("exception")
             } catch (e: MyException) {
-                status += e.getMessage()
+                status += e.message
                 return status
             } finally {
                 status += "finally"
@@ -82,7 +82,7 @@ class TestLocal() : Closeable {
                 underMutexFun()
                 throw MyException("exception")
             } catch (e: MyException) {
-                status += e.getMessage()
+                status += e.message
                 return Holder("fail")
             } finally {
                 status += "finally"

compiler/testData/codegen/boxWithStdlib/nonLocalReturns/useWithException.kt

@@ -44,7 +44,7 @@ class TestLocal() : Closeable {
                 underMutexFun()
                 throw MyException("exception")
             } catch (e: MyException) {
-                status += e.getMessage()!!
+                status += e.message!!
                 return status
             }
         }
@@ -70,7 +70,7 @@ class TestLocal() : Closeable {
                 underMutexFun()
                 throw MyException("exception")
             } catch (e: MyException) {
-                status += e.getMessage()
+                status += e.message
                 return status
             } finally {
                 status += "finally"
@@ -85,7 +85,7 @@ class TestLocal() : Closeable {
                 underMutexFun()
                 throw MyException("exception")
             } catch (e: MyException) {
-                status += e.getMessage()
+                status += e.message
                 return Holder("fail")
             } finally {
                 status += "finally"

compiler/testData/codegen/boxWithStdlib/privateConstructor/synthetic.kt

@@ -19,7 +19,7 @@ fun check(klass: Class<*>) {
 }
 
 fun box(): String {
-    check(javaClass<PrivateConstructor>())
+    check(PrivateConstructor::class.java)
     // Also check that synthetic accessors really work
     PrivateConstructor.Nested()
     return "OK"

compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 5 downTo 10
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for 5 downTo 10: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 5.toByte() downTo 10.toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for 5.toByte() downTo 10.toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 5.toShort() downTo 10.toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for 5.toShort() downTo 10.toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 5.toLong() downTo 10.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for 5.toLong() downTo 10.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'a' downTo 'z'
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for 'a' downTo 'z': $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 10..5
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for 10..5: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 10.toByte()..(-5).toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for 10.toByte()..(-5).toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 10.toShort()..(-5).toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for 10.toShort()..(-5).toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 10.toLong()..-5.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for 10.toLong()..-5.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'z'..'a'
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for 'z'..'a': $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt

@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = (MinI + 5) downTo MinI step 3
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MinI + 5, MinI + 2)) {
         return "Wrong elements for (MinI + 5) downTo MinI step 3: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = (MinB + 5).toByte() downTo MinB step 3
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MinB + 5).toInt(), (MinB + 2).toInt())) {
         return "Wrong elements for (MinB + 5).toByte() downTo MinB step 3: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = (MinS + 5).toShort() downTo MinS step 3
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MinS + 5).toInt(), (MinS + 2).toInt())) {
         return "Wrong elements for (MinS + 5).toShort() downTo MinS step 3: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = (MinL + 5).toLong() downTo MinL step 3
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MinL + 5).toLong(), (MinL + 2).toLong())) {
         return "Wrong elements for (MinL + 5).toLong() downTo MinL step 3: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = (MinC + 5) downTo MinC step 3
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MinC + 5), (MinC + 2))) {
         return "Wrong elements for (MinC + 5) downTo MinC step 3: $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 8 downTo 3 step 2
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(8, 6, 4)) {
         return "Wrong elements for 8 downTo 3 step 2: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 8.toByte() downTo 3.toByte() step 2
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(8, 6, 4)) {
         return "Wrong elements for 8.toByte() downTo 3.toByte() step 2: $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 8.toShort() downTo 3.toShort() step 2
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(8, 6, 4)) {
         return "Wrong elements for 8.toShort() downTo 3.toShort() step 2: $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 8.toLong() downTo 3.toLong() step 2.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(8, 6, 4)) {
         return "Wrong elements for 8.toLong() downTo 3.toLong() step 2.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'd' downTo 'a' step 2
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('d', 'b')) {
         return "Wrong elements for 'd' downTo 'a' step 2: $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 3..8 step 2
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for 3..8 step 2: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 3.toByte()..8.toByte() step 2
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for 3.toByte()..8.toByte() step 2: $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 3.toShort()..8.toShort() step 2
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for 3.toShort()..8.toShort() step 2: $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 3.toLong()..8.toLong() step 2.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 5, 7)) {
         return "Wrong elements for 3.toLong()..8.toLong() step 2.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'a'..'d' step 2
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('a', 'c')) {
         return "Wrong elements for 'a'..'d' step 2: $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt

@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = (MaxI - 5)..MaxI step 3
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI - 5, MaxI - 2)) {
         return "Wrong elements for (MaxI - 5)..MaxI step 3: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = (MaxB - 5).toByte()..MaxB step 3
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MaxB - 5).toInt(), (MaxB - 2).toInt())) {
         return "Wrong elements for (MaxB - 5).toByte()..MaxB step 3: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = (MaxS - 5).toShort()..MaxS step 3
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MaxS - 5).toInt(), (MaxS - 2).toInt())) {
         return "Wrong elements for (MaxS - 5).toShort()..MaxS step 3: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = (MaxL - 5).toLong()..MaxL step 3
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MaxL - 5).toLong(), (MaxL - 2).toLong())) {
         return "Wrong elements for (MaxL - 5).toLong()..MaxL step 3: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = (MaxC - 5)..MaxC step 3
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MaxC - 5), (MaxC - 2))) {
         return "Wrong elements for (MaxC - 5)..MaxC step 3: $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt

@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = (MaxI - 2)..MaxI
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI - 2, MaxI - 1, MaxI)) {
         return "Wrong elements for (MaxI - 2)..MaxI: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = (MaxB - 2).toByte()..MaxB
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MaxB - 2).toInt(), (MaxB - 1).toInt(), MaxB.toInt())) {
         return "Wrong elements for (MaxB - 2).toByte()..MaxB: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = (MaxS - 2).toShort()..MaxS
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MaxS - 2).toInt(), (MaxS - 1).toInt(), MaxS.toInt())) {
         return "Wrong elements for (MaxS - 2).toShort()..MaxS: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = (MaxL - 2).toLong()..MaxL
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MaxL - 2).toLong(), (MaxL - 1).toLong(), MaxL)) {
         return "Wrong elements for (MaxL - 2).toLong()..MaxL: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = (MaxC - 2)..MaxC
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MaxC - 2), (MaxC - 1), MaxC)) {
         return "Wrong elements for (MaxC - 2)..MaxC: $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt

@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = MaxI..MaxI
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI)) {
         return "Wrong elements for MaxI..MaxI: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = MaxB..MaxB
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(MaxB.toInt())) {
         return "Wrong elements for MaxB..MaxB: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = MaxS..MaxS
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(MaxS.toInt())) {
         return "Wrong elements for MaxS..MaxS: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = MaxL..MaxL
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(MaxL)) {
         return "Wrong elements for MaxL..MaxL: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = MaxC..MaxC
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>(MaxC)) {
         return "Wrong elements for MaxC..MaxC: $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt

@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = MaxI..MinI
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for MaxI..MinI: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = MaxB..MinB
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for MaxB..MinB: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = MaxS..MinS
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for MaxS..MinS: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = MaxL..MinL
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for MaxL..MinL: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = MaxC..MinC
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for MaxC..MinC: $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 5 downTo 5
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(5)) {
         return "Wrong elements for 5 downTo 5: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 5.toByte() downTo 5.toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(5)) {
         return "Wrong elements for 5.toByte() downTo 5.toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 5.toShort() downTo 5.toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(5)) {
         return "Wrong elements for 5.toShort() downTo 5.toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 5.toLong() downTo 5.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(5.toLong())) {
         return "Wrong elements for 5.toLong() downTo 5.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'k' downTo 'k'
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('k')) {
         return "Wrong elements for 'k' downTo 'k': $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 5..5
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(5)) {
         return "Wrong elements for 5..5: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 5.toByte()..5.toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(5)) {
         return "Wrong elements for 5.toByte()..5.toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 5.toShort()..5.toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(5)) {
         return "Wrong elements for 5.toShort()..5.toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 5.toLong()..5.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(5.toLong())) {
         return "Wrong elements for 5.toLong()..5.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'k'..'k'
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('k')) {
         return "Wrong elements for 'k'..'k': $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/openRange.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 1 until 5
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(1, 2, 3, 4)) {
         return "Wrong elements for 1 until 5: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 1.toByte() until 5.toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(1, 2, 3, 4)) {
         return "Wrong elements for 1.toByte() until 5.toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 1.toShort() until 5.toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(1, 2, 3, 4)) {
         return "Wrong elements for 1.toShort() until 5.toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 1.toLong() until 5.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(1, 2, 3, 4)) {
         return "Wrong elements for 1.toLong() until 5.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'a' until 'd'
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('a', 'b', 'c')) {
         return "Wrong elements for 'a' until 'd': $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt

@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = (MinI + 2) downTo MinI step 1
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MinI + 2, MinI + 1, MinI)) {
         return "Wrong elements for (MinI + 2) downTo MinI step 1: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = (MinB + 2).toByte() downTo MinB step 1
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MinB + 2).toInt(), (MinB + 1).toInt(), MinB.toInt())) {
         return "Wrong elements for (MinB + 2).toByte() downTo MinB step 1: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = (MinS + 2).toShort() downTo MinS step 1
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MinS + 2).toInt(), (MinS + 1).toInt(), MinS.toInt())) {
         return "Wrong elements for (MinS + 2).toShort() downTo MinS step 1: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = (MinL + 2).toLong() downTo MinL step 1
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MinL + 2).toLong(), (MinL + 1).toLong(), MinL)) {
         return "Wrong elements for (MinL + 2).toLong() downTo MinL step 1: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = (MinC + 2) downTo MinC step 1
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MinC + 2), (MinC + 1), MinC)) {
         return "Wrong elements for (MinC + 2) downTo MinC step 1: $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt

@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = (MaxI - 2)..MaxI step 2
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI - 2, MaxI)) {
         return "Wrong elements for (MaxI - 2)..MaxI step 2: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = (MaxB - 2).toByte()..MaxB step 2
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MaxB - 2).toInt(), MaxB.toInt())) {
         return "Wrong elements for (MaxB - 2).toByte()..MaxB step 2: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = (MaxS - 2).toShort()..MaxS step 2
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MaxS - 2).toInt(), MaxS.toInt())) {
         return "Wrong elements for (MaxS - 2).toShort()..MaxS step 2: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = (MaxL - 2).toLong()..MaxL step 2
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MaxL - 2).toLong(), MaxL)) {
         return "Wrong elements for (MaxL - 2).toLong()..MaxL step 2: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = (MaxC - 2)..MaxC step 2
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MaxC - 2), MaxC)) {
         return "Wrong elements for (MaxC - 2)..MaxC step 2: $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt

@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = MaxI..MaxI step 1
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI)) {
         return "Wrong elements for MaxI..MaxI step 1: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = MaxB..MaxB step 1
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(MaxB.toInt())) {
         return "Wrong elements for MaxB..MaxB step 1: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = MaxS..MaxS step 1
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(MaxS.toInt())) {
         return "Wrong elements for MaxS..MaxS step 1: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = MaxL..MaxL step 1
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(MaxL)) {
         return "Wrong elements for MaxL..MaxL step 1: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = MaxC..MaxC step 1
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>(MaxC)) {
         return "Wrong elements for MaxC..MaxC step 1: $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt

@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = MaxI..MinI step 1
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for MaxI..MinI step 1: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = MaxB..MinB step 1
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for MaxB..MinB step 1: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = MaxS..MinS step 1
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for MaxS..MinS step 1: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = MaxL..MinL step 1
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for MaxL..MinL step 1: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = MaxC..MinC step 1
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for MaxC..MinC step 1: $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt

@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = MinI..MinI step 1
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MinI)) {
         return "Wrong elements for MinI..MinI step 1: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = MinB..MinB step 1
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(MinB.toInt())) {
         return "Wrong elements for MinB..MinB step 1: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = MinS..MinS step 1
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(MinS.toInt())) {
         return "Wrong elements for MinS..MinS step 1: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = MinL..MinL step 1
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(MinL)) {
         return "Wrong elements for MinL..MinL step 1: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = MinC..MinC step 1
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>(MinC)) {
         return "Wrong elements for MinC..MinC step 1: $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = (5 downTo 3).reversed()
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 4, 5)) {
         return "Wrong elements for (5 downTo 3).reversed(): $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = (5.toByte() downTo 3.toByte()).reversed()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 4, 5)) {
         return "Wrong elements for (5.toByte() downTo 3.toByte()).reversed(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = (5.toShort() downTo 3.toShort()).reversed()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 4, 5)) {
         return "Wrong elements for (5.toShort() downTo 3.toShort()).reversed(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = (5.toLong() downTo 3.toLong()).reversed()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 4, 5)) {
         return "Wrong elements for (5.toLong() downTo 3.toLong()).reversed(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = ('c' downTo 'a').reversed()
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('a', 'b', 'c')) {
         return "Wrong elements for ('c' downTo 'a').reversed(): $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = (3 downTo 5).reversed()
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for (3 downTo 5).reversed(): $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = (3.toByte() downTo 5.toByte()).reversed()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for (3.toByte() downTo 5.toByte()).reversed(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = (3.toShort() downTo 5.toShort()).reversed()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for (3.toShort() downTo 5.toShort()).reversed(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = (3.toLong() downTo 5.toLong()).reversed()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for (3.toLong() downTo 5.toLong()).reversed(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = ('a' downTo 'c').reversed()
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for ('a' downTo 'c').reversed(): $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = (5..3).reversed()
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for (5..3).reversed(): $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = (5.toByte()..3.toByte()).reversed()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for (5.toByte()..3.toByte()).reversed(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = (5.toShort()..3.toShort()).reversed()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for (5.toShort()..3.toShort()).reversed(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = (5.toLong()..3.toLong()).reversed()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for (5.toLong()..3.toLong()).reversed(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = ('c'..'a').reversed()
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for ('c'..'a').reversed(): $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = (8 downTo 3 step 2).reversed()
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(4, 6, 8)) {
         return "Wrong elements for (8 downTo 3 step 2).reversed(): $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = (8.toByte() downTo 3.toByte() step 2).reversed()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(4, 6, 8)) {
         return "Wrong elements for (8.toByte() downTo 3.toByte() step 2).reversed(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = (8.toShort() downTo 3.toShort() step 2).reversed()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(4, 6, 8)) {
         return "Wrong elements for (8.toShort() downTo 3.toShort() step 2).reversed(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = (8.toLong() downTo 3.toLong() step 2.toLong()).reversed()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(4, 6, 8)) {
         return "Wrong elements for (8.toLong() downTo 3.toLong() step 2.toLong()).reversed(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = ('d' downTo 'a' step 2).reversed()
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('b', 'd')) {
         return "Wrong elements for ('d' downTo 'a' step 2).reversed(): $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = (3..5).reversed()
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(5, 4, 3)) {
         return "Wrong elements for (3..5).reversed(): $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = (3.toShort()..5.toShort()).reversed()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(5, 4, 3)) {
         return "Wrong elements for (3.toShort()..5.toShort()).reversed(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = (3.toLong()..5.toLong()).reversed()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Long>(5, 4, 3)) {
         return "Wrong elements for (3.toLong()..5.toLong()).reversed(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = ('a'..'c').reversed()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Char>('c', 'b', 'a')) {
         return "Wrong elements for ('a'..'c').reversed(): $list4"

compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = (3..9 step 2).reversed()
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for (3..9 step 2).reversed(): $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = (3.toByte()..9.toByte() step 2).reversed()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for (3.toByte()..9.toByte() step 2).reversed(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = (3.toShort()..9.toShort() step 2).reversed()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for (3.toShort()..9.toShort() step 2).reversed(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = (3.toLong()..9.toLong() step 2.toLong()).reversed()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(9, 7, 5, 3)) {
         return "Wrong elements for (3.toLong()..9.toLong() step 2.toLong()).reversed(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = ('c'..'g' step 2).reversed()
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('g', 'e', 'c')) {
         return "Wrong elements for ('c'..'g' step 2).reversed(): $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 9 downTo 3
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9 downTo 3: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 9.toByte() downTo 3.toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9.toByte() downTo 3.toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 9.toShort() downTo 3.toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9.toShort() downTo 3.toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 9.toLong() downTo 3.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9.toLong() downTo 3.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'g' downTo 'c'
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('g', 'f', 'e', 'd', 'c')) {
         return "Wrong elements for 'g' downTo 'c': $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 3..9
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3..9: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 3.toByte()..9.toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3.toByte()..9.toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 3.toShort()..9.toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3.toShort()..9.toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 3.toLong()..9.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3.toLong()..9.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'c'..'g'
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('c', 'd', 'e', 'f', 'g')) {
         return "Wrong elements for 'c'..'g': $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = (1 + 2)..(10 - 1)
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1 + 2)..(10 - 1): $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = (1.toByte() + 2.toByte()).toByte()..(10.toByte() - 1.toByte()).toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1.toByte() + 2.toByte()).toByte()..(10.toByte() - 1.toByte()).toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = (1.toShort() + 2.toShort()).toShort()..(10.toShort() - 1.toShort()).toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1.toShort() + 2.toShort()).toShort()..(10.toShort() - 1.toShort()).toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = (1.toLong() + 2.toLong())..(10.toLong() - 1.toLong())
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1.toLong() + 2.toLong())..(10.toLong() - 1.toLong()): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = ("ace"[1])..("age"[1])
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('c', 'd', 'e', 'f', 'g')) {
         return "Wrong elements for (\"ace\"[1])..(\"age\"[1]): $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 9 downTo 3 step 2
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for 9 downTo 3 step 2: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 9.toByte() downTo 3.toByte() step 2
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for 9.toByte() downTo 3.toByte() step 2: $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 9.toShort() downTo 3.toShort() step 2
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for 9.toShort() downTo 3.toShort() step 2: $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 9.toLong() downTo 3.toLong() step 2.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(9, 7, 5, 3)) {
         return "Wrong elements for 9.toLong() downTo 3.toLong() step 2.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'g' downTo 'c' step 2
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('g', 'e', 'c')) {
         return "Wrong elements for 'g' downTo 'c' step 2: $list5"

compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt

@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 3..9 step 2
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 5, 7, 9)) {
         return "Wrong elements for 3..9 step 2: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 3.toByte()..9.toByte() step 2
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 5, 7, 9)) {
         return "Wrong elements for 3.toByte()..9.toByte() step 2: $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 3.toShort()..9.toShort() step 2
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 5, 7, 9)) {
         return "Wrong elements for 3.toShort()..9.toShort() step 2: $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 3.toLong()..9.toLong() step 2.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 5, 7, 9)) {
         return "Wrong elements for 3.toLong()..9.toLong() step 2.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'c'..'g' step 2
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('c', 'e', 'g')) {
         return "Wrong elements for 'c'..'g' step 2: $list5"