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

Use correct function to check for function type in InlineParameterChecker

Browse Source 
There's no use of noinline/crossinline modifiers on parameters of _subtypes_ of
function types

 #KT-11411 Fixed
This commit is contained in:
Alexander Udalov
2016-03-14 15:17:45 +03:00
parent c18fab82e5
commit 33ff1e1e29
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/InlineParameterChecker.kt
+2 -2
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.resolve
import org.jetbrains.kotlin.builtins.isFunctionTypeOrSubtype
import org.jetbrains.kotlin.builtins.isFunctionType
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.diagnostics.DiagnosticSink
import org.jetbrains.kotlin.diagnostics.Errors
@@ -34,7 +34,7 @@ object InlineParameterChecker : DeclarationChecker {
val inline = declaration.hasModifier(KtTokens.INLINE_KEYWORD)
for (parameter in declaration.valueParameters) {
val parameterDescriptor = bindingContext.get(BindingContext.VALUE_PARAMETER, parameter)
if (!inline || (parameterDescriptor != null && !parameterDescriptor.type.isFunctionTypeOrSubtype)) {
if (!inline || (parameterDescriptor != null && !parameterDescriptor.type.isFunctionType)) {
parameter.reportIncorrectInline(KtTokens.NOINLINE_KEYWORD, diagnosticHolder)
parameter.reportIncorrectInline(KtTokens.CROSSINLINE_KEYWORD, diagnosticHolder)
}
compiler/testData/diagnostics/tests/modifiers/inlineParameters.kt
Vendored
+9
View File
@@ -9,3 +9,12 @@ fun gav(<!ILLEGAL_INLINE_PARAMETER_MODIFIER!>noinline<!> x: (Int) -> Unit, <!ILL
inline fun correct(noinline x: (Int) -> Unit, crossinline y: (String) -> Int) {}
<!NOTHING_TO_INLINE!>inline<!> fun incompatible(<!INCOMPATIBLE_MODIFIERS!>noinline<!> <!INCOMPATIBLE_MODIFIERS!>crossinline<!> x: () -> String) {}
class FunctionSubtype : () -> Unit {
override fun invoke() {}
}
<!NOTHING_TO_INLINE!>inline<!> fun functionSubtype(
<!ILLEGAL_INLINE_PARAMETER_MODIFIER!>noinline<!> f: FunctionSubtype,
<!ILLEGAL_INLINE_PARAMETER_MODIFIER!>crossinline<!> g: FunctionSubtype
) { }
compiler/testData/diagnostics/tests/modifiers/inlineParameters.txt
Vendored
+9
View File
@@ -3,5 +3,14 @@ package
public inline fun bar(/*0*/ y: kotlin.Int, /*1*/ crossinline x: kotlin.String): kotlin.Unit
public inline fun correct(/*0*/ noinline x: (kotlin.Int) -> kotlin.Unit, /*1*/ crossinline y: (kotlin.String) -> kotlin.Int): kotlin.Unit
public inline fun foo(/*0*/ noinline x: kotlin.Int): kotlin.Unit
public inline fun functionSubtype(/*0*/ noinline f: FunctionSubtype, /*1*/ crossinline g: FunctionSubtype): kotlin.Unit
public fun gav(/*0*/ noinline x: (kotlin.Int) -> kotlin.Unit, /*1*/ crossinline y: (kotlin.String) -> kotlin.Int): kotlin.Unit
public inline fun incompatible(/*0*/ crossinline noinline x: () -> kotlin.String): kotlin.Unit
public final class FunctionSubtype : () -> kotlin.Unit {
public constructor FunctionSubtype()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ fun invoke(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}