azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: Make internal monitorEnter/monitorExit functions private to remove them from the public API

Browse Source 
#KT-11485
This commit is contained in:
Ilya Gorbunov
2016-03-30 17:41:07 +03:00
parent bbd6417d3c
commit 9caa17dc74
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt
+2 -4
View File
@@ -16,8 +16,6 @@
package kotlin.jvm.internal.unsafe package kotlin.jvm.internal.unsafe
@kotlin.internal.InlineExposed private fun monitorEnter(@Suppress("UNUSED_PARAMETER") monitor: Any): Unit = throw UnsupportedOperationException("This function can only be used privately")
internal fun monitorEnter(@Suppress("UNUSED_PARAMETER") monitor: Any): Unit = throw UnsupportedOperationException("This function can only be used privately")
@kotlin.internal.InlineExposed private fun monitorExit(@Suppress("UNUSED_PARAMETER") monitor: Any): Unit = throw UnsupportedOperationException("This function can only be used privately")
internal fun monitorExit(@Suppress("UNUSED_PARAMETER") monitor: Any): Unit = throw UnsupportedOperationException("This function can only be used privately")
libraries/stdlib/src/kotlin/util/Synchronized.kt
+2 -2
View File
@@ -10,13 +10,13 @@ import kotlin.jvm.internal.unsafe.*
*/ */
@kotlin.internal.InlineOnly @kotlin.internal.InlineOnly
public inline fun <R> synchronized(lock: Any, block: () -> R): R { public inline fun <R> synchronized(lock: Any, block: () -> R): R {
@Suppress("NON_PUBLIC_CALL_FROM_PUBLIC_INLINE") @Suppress("NON_PUBLIC_CALL_FROM_PUBLIC_INLINE", "INVISIBLE_MEMBER")
monitorEnter(lock) monitorEnter(lock)
try { try {
return block() return block()
} }
finally { finally {
@Suppress("NON_PUBLIC_CALL_FROM_PUBLIC_INLINE") @Suppress("NON_PUBLIC_CALL_FROM_PUBLIC_INLINE", "INVISIBLE_MEMBER")
monitorExit(lock) monitorExit(lock)
} }
} }
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt
-5
View File
@@ -1705,11 +1705,6 @@ public final class kotlin/io/TextStreamsKt {
public static final fun useLines (Ljava/io/Reader;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object; public static final fun useLines (Ljava/io/Reader;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
} }
public final class kotlin/jvm/internal/unsafe/MonitorKt {
public static final fun monitorEnter (Ljava/lang/Object;)V
public static final fun monitorExit (Ljava/lang/Object;)V
}
public final class kotlin/properties/Delegates { public final class kotlin/properties/Delegates {
public static final field INSTANCE Lkotlin/properties/Delegates; public static final field INSTANCE Lkotlin/properties/Delegates;
public final fun notNull ()Lkotlin/properties/ReadWriteProperty; public final fun notNull ()Lkotlin/properties/ReadWriteProperty;