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

Do not assert that function is inline in MemberDescriptor.isInlineOnly

Browse Source 
This is a more accurate fix of the problem described in 946acd2416
This commit is contained in:
Alexander Udalov
2019-02-26 11:16:01 +01:00
parent b8bc79e17c
commit e2106d4d08
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/inlineOnly.kt
+3 -6
View File
@@ -21,12 +21,9 @@ fun MemberDescriptor.isEffectivelyInlineOnly(): Boolean =
isInlineOnlyOrReifiable() || (this is FunctionDescriptor && isSuspend && isInline && isInlineOnlyOrReifiable() || (this is FunctionDescriptor && isSuspend && isInline &&
(valueParameters.any { it.isCrossinline } || visibility == Visibilities.PRIVATE)) (valueParameters.any { it.isCrossinline } || visibility == Visibilities.PRIVATE))
fun MemberDescriptor.isInlineOnly(): Boolean { fun MemberDescriptor.isInlineOnly(): Boolean =
if (this !is FunctionDescriptor || this is FunctionDescriptor && isInline &&
!(hasInlineOnlyAnnotation() || DescriptorUtils.getDirectMember(this).hasInlineOnlyAnnotation())) return false (hasInlineOnlyAnnotation() || DescriptorUtils.getDirectMember(this).hasInlineOnlyAnnotation())
assert(isInline) { "Function is not inline: $this" }
return true
}
private fun CallableMemberDescriptor.isReifiable() = typeParameters.any { it.isReified } private fun CallableMemberDescriptor.isReifiable() = typeParameters.any { it.isReified }
compiler/testData/codegen/boxInline/smap/inlineOnly/noSmapWithProperty.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// IGNORE_BACKEND: JVM_IR
// FILE: 1.kt // FILE: 1.kt
// WITH_RUNTIME // WITH_RUNTIME
package test package test
inline fun stub() { inline fun stub() {