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

'isInlineOnlyOrReified' renamed to 'isInlineOnlyOrReifiable'

Browse Source
This commit is contained in:
Mikhael Bogdanov
2017-01-10 11:01:47 +01:00
parent dc4cdbf82d
commit ff734ce9ea
6 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt
+1 -1
View File
@@ -70,7 +70,7 @@ private operator fun Collection<ValueParameterDescriptor>.get(parameterName: Str
private val INLINE_ONLY_ANNOTATION_FQ_NAME = FqName("kotlin.internal.InlineOnly")
fun MemberDescriptor.isInlineOnlyOrReified(): Boolean =
fun MemberDescriptor.isInlineOnlyOrReifiable(): Boolean =
this is CallableMemberDescriptor && (isReifiable() || DescriptorUtils.getDirectMember(this).isReifiable() || isInlineOnly())
fun MemberDescriptor.isInlineOnly(): Boolean {
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt
+2 -2
View File
@@ -19,7 +19,7 @@ package kotlin.reflect.jvm.internal
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.descriptors.annotations.isInlineOnlyOrReified
import org.jetbrains.kotlin.descriptors.annotations.isInlineOnlyOrReifiable
import java.lang.reflect.Constructor
import java.lang.reflect.Member
import java.lang.reflect.Method
@@ -60,7 +60,7 @@ internal class KFunctionImpl private constructor(
private fun isPrivateInBytecode(): Boolean =
Visibilities.isPrivate(descriptor.visibility) ||
descriptor.isInlineOnlyOrReified()
descriptor.isInlineOnlyOrReifiable()
private fun isDeclared(): Boolean = isPrivateInBytecode()