diff --git a/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.kt b/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.kt
index ae7324b91d9..53d08317f25 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.kt
@@ -1,3 +1,4 @@
+// !DIAGNOSTICS: -DEPRECATION
 package test
 
 class A {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/kt9078.kt b/compiler/testData/diagnostics/testsWithStdLib/kt9078.kt
index 17ac0a0e3af..3725ca98e7e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/kt9078.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/kt9078.kt
@@ -1,3 +1,4 @@
+// !DIAGNOSTICS: -DEPRECATION
 // KT-9078 (NPE in control flow analysis); EA-71535
 abstract class KFunctionKt9005WorkAround<out R: Any?>(private val _functionInstance: Function<R>) {
     private val _reflectedFunction: kotlin.reflect.KFunction<R> = _functionInstance.<!UNRESOLVED_REFERENCE!>reflect<!>() ?: throw IllegalStateException("")
diff --git a/core/runtime.jvm/src/kotlin/jvm/JvmClassMapping.kt b/core/runtime.jvm/src/kotlin/jvm/JvmClassMapping.kt
index b098885542e..d4037f571bd 100644
--- a/core/runtime.jvm/src/kotlin/jvm/JvmClassMapping.kt
+++ b/core/runtime.jvm/src/kotlin/jvm/JvmClassMapping.kt
@@ -92,6 +92,7 @@ public val <T : Any> Class<T>.kotlin: KClass<T>
 /**
  * Returns the runtime Java class of this object.
  */
+@Deprecated("Use 'instance::class.java' instead to get java class of the instance.", ReplaceWith("this::class.java"))
 public val <T: Any> T.javaClass : Class<T>
     @Suppress("UsePropertyAccessSyntax")
     get() = (this as java.lang.Object).getClass() as Class<T>
@@ -107,7 +108,7 @@ public val <T: Any> KClass<T>.javaClass: Class<KClass<T>>
  */
 @Suppress("REIFIED_TYPE_PARAMETER_NO_INLINE")
 public fun <reified T : Any> Array<*>.isArrayOf(): Boolean =
-        T::class.java.isAssignableFrom(this.javaClass.componentType)
+        T::class.java.isAssignableFrom(this::class.java.componentType)
 
 /**
  * Returns a [KClass] instance corresponding to the annotation type of this annotation.