More proper code to check if lambda is inlined. Parameter of inline function can be annotated with "noInline".

This commit is contained in:
Evgeny Gerashchenko
2015-04-07 19:56:44 +03:00
parent d24d750d34
commit 015da2f8ca
5 changed files with 42 additions and 6 deletions
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.utils.sure
import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
import org.jetbrains.kotlin.resolve.InlineDescriptorUtils
import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext
// resolved call
@@ -183,9 +184,6 @@ public fun JetExpression.getFunctionResolvedCallWithAssert(context: BindingConte
public fun JetFunctionLiteral.isInlined(bindingContext: BindingContext): Boolean {
val parent = this.getParent()
assert(parent is JetFunctionLiteralExpression) { "parent of JetFunctionLiteral is " + parent }
val resolvedCall = (parent as JetFunctionLiteralExpression).getParentResolvedCall(bindingContext, true)
if (resolvedCall == null) return false
val callable = resolvedCall.getResultingDescriptor()
return callable is SimpleFunctionDescriptor && callable.getInlineStrategy().isInline()
return InlineDescriptorUtils.isInlineLambda(parent as JetFunctionLiteralExpression, bindingContext, false)
}