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

[FIR] Incorrect warnings about inline function impact

Browse Source 
^KT-65959 Fixed
This commit is contained in:
Vladimir Sukharev
2024-03-07 21:47:05 +01:00
committed by Space Team
parent 232c3aeadc
commit aa1cce78c3
11 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
Generated
+6
View File
@@ -21188,6 +21188,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/inline/valueClasses.kt");
}
@Test
@TestMetadata("valueOfKFunctionTypeAsArgumentOfInlineFunction.kt")
public void testValueOfKFunctionTypeAsArgumentOfInlineFunction() {
runTest("compiler/testData/diagnostics/tests/inline/valueOfKFunctionTypeAsArgumentOfInlineFunction.kt");
}
@Test
@TestMetadata("vararg.kt")
public void testVararg() {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
Generated
+6
View File
@@ -21188,6 +21188,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/inline/valueClasses.kt");
}
@Test
@TestMetadata("valueOfKFunctionTypeAsArgumentOfInlineFunction.kt")
public void testValueOfKFunctionTypeAsArgumentOfInlineFunction() {
runTest("compiler/testData/diagnostics/tests/inline/valueOfKFunctionTypeAsArgumentOfInlineFunction.kt");
}
@Test
@TestMetadata("vararg.kt")
public void testVararg() {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -21182,6 +21182,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/inline/valueClasses.kt");
}
@Test
@TestMetadata("valueOfKFunctionTypeAsArgumentOfInlineFunction.kt")
public void testValueOfKFunctionTypeAsArgumentOfInlineFunction() {
runTest("compiler/testData/diagnostics/tests/inline/valueOfKFunctionTypeAsArgumentOfInlineFunction.kt");
}
@Test
@TestMetadata("vararg.kt")
public void testVararg() {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -21188,6 +21188,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/inline/valueClasses.kt");
}
@Test
@TestMetadata("valueOfKFunctionTypeAsArgumentOfInlineFunction.kt")
public void testValueOfKFunctionTypeAsArgumentOfInlineFunction() {
runTest("compiler/testData/diagnostics/tests/inline/valueOfKFunctionTypeAsArgumentOfInlineFunction.kt");
}
@Test
@TestMetadata("vararg.kt")
public void testVararg() {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInlineDeclarationChecker.kt
+1 -1
View File
@@ -457,7 +457,7 @@ object FirInlineDeclarationChecker : FirFunctionChecker(MppCheckerKind.Common) {
function.valueParameters.any { param ->
val type = param.returnTypeRef.coneType
!param.isNoinline && !type.isNullable
&& (type.isBasicFunctionType(session) || type.isSuspendOrKSuspendFunctionType(session))
&& type.isNonKFunctionType(session)
}
if (hasInlinableParameters) return
if (function.isInlineOnly(session)) return
compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/FunctionalTypeUtils.kt
+5
View File
@@ -59,6 +59,11 @@ fun ConeKotlinType.isBasicFunctionType(session: FirSession): Boolean {
return isFunctionTypeWithPredicate(session) { it == FunctionTypeKind.Function }
}
// Function, SuspendFunction, KSuspendFunction, [Custom]Function, K[Custom]Function
fun ConeKotlinType.isNonKFunctionType(session: FirSession): Boolean {
return isFunctionTypeWithPredicate(session) { it != FunctionTypeKind.KFunction }
}
// SuspendFunction, KSuspendFunction
fun ConeKotlinType.isSuspendOrKSuspendFunctionType(session: FirSession): Boolean {
return isFunctionTypeWithPredicate(session) {
compiler/testData/diagnostics/tests/inline/valueOfKFunctionTypeAsArgumentOfInlineFunction.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
// FIR_IDENTICAL
// ISSUE: KT-65959
import kotlin.reflect.KFunction0
<!NOTHING_TO_INLINE!>inline<!> fun foo(block: KFunction0<Unit>) {
block()
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -21188,6 +21188,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/inline/valueClasses.kt");
}
@Test
@TestMetadata("valueOfKFunctionTypeAsArgumentOfInlineFunction.kt")
public void testValueOfKFunctionTypeAsArgumentOfInlineFunction() {
runTest("compiler/testData/diagnostics/tests/inline/valueOfKFunctionTypeAsArgumentOfInlineFunction.kt");
}
@Test
@TestMetadata("vararg.kt")
public void testVararg() {
plugins/fir-plugin-prototype/testData/diagnostics/checkers/ValueOfCustomFunctionTypeAsArgumentOfInlineFunction.fir.txt
Vendored
+4
View File
@@ -0,0 +1,4 @@
FILE: ValueOfCustomFunctionTypeAsArgumentOfInlineFunction.kt
@R|org/jetbrains/kotlin/fir/plugin/MyComposable|() public final inline fun <T> inlineFunction(block: R|@R|org/jetbrains/kotlin/fir/plugin/MyComposable|() some/MyComposableFunction0<T>|): R|T| {
^inlineFunction R|<local>/block|.R|SubstitutionOverride<some/MyComposableFunction0.invoke: R|T|>|()
}
plugins/fir-plugin-prototype/testData/diagnostics/checkers/ValueOfCustomFunctionTypeAsArgumentOfInlineFunction.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// ISSUE: KT-65959
import org.jetbrains.kotlin.fir.plugin.MyComposable
@MyComposable
inline fun <T> inlineFunction(block: @MyComposable () -> T): T {
return block()
}
plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPsiPluginDiagnosticTestGenerated.java
Generated
+6
View File
@@ -62,6 +62,12 @@ public class FirPsiPluginDiagnosticTestGenerated extends AbstractFirPsiPluginDia
public void testSimple() {
runTest("plugins/fir-plugin-prototype/testData/diagnostics/checkers/simple.kt");
}
@Test
@TestMetadata("ValueOfCustomFunctionTypeAsArgumentOfInlineFunction.kt")
public void testValueOfCustomFunctionTypeAsArgumentOfInlineFunction() {
runTest("plugins/fir-plugin-prototype/testData/diagnostics/checkers/ValueOfCustomFunctionTypeAsArgumentOfInlineFunction.kt");
}
}
@Nested