Cleanup: fix some compiler warnings (mostly deprecations, javaClass)

compiler/tests-common/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt

@@ -130,7 +130,7 @@ class LazyOperationsLog(
 
         val id = objectId(o)
 
-        val aClass = o.javaClass
+        val aClass = o::class.java
         sb.append(if (aClass.isAnonymousClass) aClass.name.substringAfterLast('.') else aClass.simpleName).append("@$id")
 
         fun Any.appendQuoted() {
@@ -139,15 +139,15 @@ class LazyOperationsLog(
 
         when {
             o is Named -> o.name.appendQuoted()
-            o.javaClass.simpleName == "LazyJavaClassifierType" -> {
+            o::class.java.simpleName == "LazyJavaClassifierType" -> {
                 val javaType = o.field<JavaTypeImpl<*>>("javaType")
                 javaType.psi.presentableText.appendQuoted()
             }
-            o.javaClass.simpleName == "LazyJavaClassTypeConstructor" -> {
+            o::class.java.simpleName == "LazyJavaClassTypeConstructor" -> {
                 val javaClass = o.field<Any>("this\$0").field<JavaClassImpl>("jClass")
                 javaClass.psi.name!!.appendQuoted()
             }
-            o.javaClass.simpleName == "DeserializedType" -> {
+            o::class.java.simpleName == "DeserializedType" -> {
                 val typeDeserializer = o.field<TypeDeserializer>("typeDeserializer")
                 val context = typeDeserializer.field<DeserializationContext>("c")
                 val typeProto = o.field<ProtoBuf.Type>("typeProto")
@@ -191,7 +191,7 @@ class LazyOperationsLog(
 }
 
 private fun <T> Any.field(name: String): T {
-    val field = this.javaClass.getDeclaredField(name)
+    val field = this::class.java.getDeclaredField(name)
     field.isAccessible = true
     @Suppress("UNCHECKED_CAST")
     return field.get(this) as T

compiler/tests-common/org/jetbrains/kotlin/checkers/LoggingStorageManager.kt

@@ -54,7 +54,7 @@ class LoggingStorageManager(
         }
 
     private fun computeCallerData(lambda: Any, wrapper: Any, arguments: List<Any?>, result: Any?): CallData {
-        val lambdaClass = lambda.javaClass
+        val lambdaClass = lambda::class.java
 
         val outerClass: Class<out Any?>? = lambdaClass.enclosingClass
 
@@ -79,7 +79,7 @@ class LoggingStorageManager(
                                   val value = field.get(outerInstance)
                                   if (value == null) return@firstOrNull false
 
-                                  val valueClass = value.javaClass
+                                  val valueClass = value::class.java
                                   val functionField = valueClass.findFunctionField()
                                   if (functionField == null) return@firstOrNull false
 
@@ -93,7 +93,7 @@ class LoggingStorageManager(
             if (wrappedLambdaField != null) {
                 wrappedLambdaField.isAccessible = true
                 val wrappedLambda = wrappedLambdaField.get(lambda)
-                return CallData(outerInstance, null, enclosingEntity(wrappedLambda.javaClass), arguments, result)
+                return CallData(outerInstance, null, enclosingEntity(wrappedLambda::class.java), arguments, result)
             }
         }
 
@@ -102,7 +102,7 @@ class LoggingStorageManager(
         return CallData(outerInstance, containingField, enclosingEntity, arguments, result)
     }
 
-    private fun enclosingEntity(_class: Class<Any>): GenericDeclaration? {
+    private fun enclosingEntity(_class: Class<out Any>): GenericDeclaration? {
         val result = _class.enclosingConstructor
             ?: _class.enclosingMethod
             ?: _class.enclosingClass
@@ -117,8 +117,7 @@ class LoggingStorageManager(
         while (true) {
             result.addAll(c.declaredFields.toList())
             @Suppress("UNCHECKED_CAST")
-            val superClass = (c as Class<Any>).superclass as Class<Any>?
-            if (superClass == null) break
+            val superClass = (c as Class<Any>).superclass ?: break
             if (c == superClass) break
             c = superClass
         }

compiler/tests-common/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt

@@ -37,7 +37,7 @@ abstract class AbstractCompileTimeConstantEvaluatorTest : AbstractAnnotationDesc
     // Test directives should look like [// val testedPropertyName: expectedValue]
     fun doConstantTest(path: String) {
         doTest(path) {
-            property, context ->
+            property, _ ->
             val compileTimeConstant = property.compileTimeInitializer
             if (compileTimeConstant is StringValue) {
                 "\\\"${compileTimeConstant.value}\\\""