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

Revert "Don't generate reified inline function as privates"

Browse Source 
This reverts commit 56859f7
This commit is contained in:
Mikhael Bogdanov
2018-05-07 14:14:07 +02:00
parent 56859f7b87
commit 8834ea74f2
7 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt
+4 -6
View File
@@ -69,13 +69,11 @@ private val REPLACE_WITH_IMPORTS_NAME = Name.identifier("imports")
private val INLINE_ONLY_ANNOTATION_FQ_NAME = FqName("kotlin.internal.InlineOnly")
fun MemberDescriptor.isInlineOnlyOrReifiable(checkInlineOnly: Boolean = true): Boolean =
this is CallableMemberDescriptor &&
(isReifiable() || DescriptorUtils.getDirectMember(this).isReifiable() || (checkInlineOnly && isInlineOnly()))
fun MemberDescriptor.isInlineOnlyOrReifiable(): Boolean =
this is CallableMemberDescriptor && (isReifiable() || DescriptorUtils.getDirectMember(this).isReifiable() || isInlineOnly())
@JvmOverloads
fun MemberDescriptor.isEffectivelyInlineOnly(checkInlineOnly: Boolean = true): Boolean =
isInlineOnlyOrReifiable(checkInlineOnly) || safeAs<FunctionDescriptor>()?.let { it.isSuspend && it.isInline } == true
fun MemberDescriptor.isEffectivelyInlineOnly(): Boolean =
isInlineOnlyOrReifiable() || safeAs<FunctionDescriptor>()?.let { it.isSuspend && it.isInline } == true
fun MemberDescriptor.isInlineOnly(): Boolean {
if (this !is FunctionDescriptor ||