From 032ba4407051e93619878951560ab65f3f4ea8c2 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Thu, 15 Oct 2015 21:12:32 +0300
Subject: [PATCH] Minor. Add optimization for
 getOverriddenBuiltinWithDifferentJvmName

---
 .../org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt
index 3eebe7d1828..d3ac7c3f7a4 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt
@@ -176,6 +176,9 @@ object BuiltinMethodsWithDifferentJvmName {
 
 @Suppress("UNCHECKED_CAST")
 fun <T : CallableMemberDescriptor> T.getOverriddenBuiltinWithDifferentJvmName(): T? {
+    if (name !in BuiltinMethodsWithDifferentJvmName.ORIGINAL_SHORT_NAMES
+            && propertyIfAccessor.name !in BuiltinSpecialProperties.SHORT_NAMES) return null
+
     return when (this) {
         is PropertyDescriptor, is PropertyAccessorDescriptor ->
             firstOverridden { BuiltinSpecialProperties.hasBuiltinSpecialPropertyFqName(it.propertyIfAccessor) } as T?