From 4614e74e3f089ad0c8f71ee0db876bc3adaf2e62 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Wed, 14 Oct 2015 20:20:26 +0300
Subject: [PATCH] isFromJavaOrBuiltins() is now public (compilation fix)

---
 .../src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 13803185115..da516d78351 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
@@ -238,7 +238,7 @@ private fun CallableMemberDescriptor.firstOverridden(
     )
 }
 
-private fun CallableMemberDescriptor.isFromJavaOrBuiltins() = isFromJava || isFromBuiltins()
+public fun CallableMemberDescriptor.isFromJavaOrBuiltins() = isFromJava || isFromBuiltins()
 
 private fun Map<FqName, Name>.getInversedShortNamesMap(): Map<Name, List<Name>> =
         entrySet().groupBy { it.value }.mapValues { entry -> entry.value.map { it.key.shortName() } }
\ No newline at end of file