From 5867d27fb73f5675d986d6081b0f40e039ea74a6 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Mon, 20 Feb 2017 16:17:23 +0300
Subject: [PATCH] [Standard Library] Take the javaClass deprecation back as its
 replacement is often inconvenient.

---
 .../testData/diagnostics/testsWithStdLib/javaClassOnCompanion.kt | 1 -
 compiler/testData/diagnostics/testsWithStdLib/kt9078.kt          | 1 -
 core/runtime.jvm/src/kotlin/jvm/JvmClassMapping.kt               | 1 -
 3 files changed, 3 deletions(-)

diff --git a/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.kt b/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.kt
index 53d08317f25..ae7324b91d9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.kt
@@ -1,4 +1,3 @@
-// !DIAGNOSTICS: -DEPRECATION
 package test
 
 class A {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/kt9078.kt b/compiler/testData/diagnostics/testsWithStdLib/kt9078.kt
index 3725ca98e7e..17ac0a0e3af 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/kt9078.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/kt9078.kt
@@ -1,4 +1,3 @@
-// !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 6a7c8a09a32..af77270c42f 100644
--- a/core/runtime.jvm/src/kotlin/jvm/JvmClassMapping.kt
+++ b/core/runtime.jvm/src/kotlin/jvm/JvmClassMapping.kt
@@ -92,7 +92,6 @@ 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 inline val <T: Any> T.javaClass : Class<T>
     @Suppress("UsePropertyAccessSyntax")
     get() = (this as java.lang.Object).getClass() as Class<T>