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

[K2] Properly check if binary logical expression is constant

Browse Source
This commit is contained in:
Ivan Kylchik
2023-12-15 15:51:16 +01:00
committed by Space Team
parent f8e9e99d87
commit 0d127f6daf
12 changed files with 150 additions and 0 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
+18
View File
@@ -23951,12 +23951,30 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.kt");
}
@Test
@TestMetadata("binaryLogic.kt")
public void testBinaryLogic() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/binaryLogic.kt");
}
@Test
@TestMetadata("compare.kt")
public void testCompare() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/compare.kt");
}
@Test
@TestMetadata("complexBooleanInStringConcat_after.kt")
public void testComplexBooleanInStringConcat_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_after.kt");
}
@Test
@TestMetadata("complexBooleanInStringConcat_before.kt")
public void testComplexBooleanInStringConcat_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_before.kt");
}
@Test
@TestMetadata("constInteraction.kt")
public void testConstInteraction() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
Generated
+18
View File
@@ -23951,12 +23951,30 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.kt");
}
@Test
@TestMetadata("binaryLogic.kt")
public void testBinaryLogic() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/binaryLogic.kt");
}
@Test
@TestMetadata("compare.kt")
public void testCompare() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/compare.kt");
}
@Test
@TestMetadata("complexBooleanInStringConcat_after.kt")
public void testComplexBooleanInStringConcat_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_after.kt");
}
@Test
@TestMetadata("complexBooleanInStringConcat_before.kt")
public void testComplexBooleanInStringConcat_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_before.kt");
}
@Test
@TestMetadata("constInteraction.kt")
public void testConstInteraction() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+18
View File
@@ -23945,12 +23945,30 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.kt");
}
@Test
@TestMetadata("binaryLogic.kt")
public void testBinaryLogic() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/binaryLogic.kt");
}
@Test
@TestMetadata("compare.kt")
public void testCompare() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/compare.kt");
}
@Test
@TestMetadata("complexBooleanInStringConcat_after.kt")
public void testComplexBooleanInStringConcat_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_after.kt");
}
@Test
@TestMetadata("complexBooleanInStringConcat_before.kt")
public void testComplexBooleanInStringConcat_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_before.kt");
}
@Test
@TestMetadata("constInteraction.kt")
public void testConstInteraction() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+18
View File
@@ -23951,12 +23951,30 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.kt");
}
@Test
@TestMetadata("binaryLogic.kt")
public void testBinaryLogic() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/binaryLogic.kt");
}
@Test
@TestMetadata("compare.kt")
public void testCompare() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/compare.kt");
}
@Test
@TestMetadata("complexBooleanInStringConcat_after.kt")
public void testComplexBooleanInStringConcat_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_after.kt");
}
@Test
@TestMetadata("complexBooleanInStringConcat_before.kt")
public void testComplexBooleanInStringConcat_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_before.kt");
}
@Test
@TestMetadata("constInteraction.kt")
public void testConstInteraction() throws Exception {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConstChecks.kt
+4
View File
@@ -103,6 +103,10 @@ internal fun checkConstantArguments(
checkConstantArguments(exp, session)?.let { return it }
}
}
expression is FirBinaryLogicExpression -> {
checkConstantArguments(expression.leftOperand, session)?.let { return it }
checkConstantArguments(expression.rightOperand, session)?.let { return it }
}
expression is FirGetClassCall -> {
var coneType = (expression as? FirCall)?.argument?.getExpandedType()
compiler/testData/diagnostics/tests/modifiers/const/binaryLogic.fir.kt
Vendored
+12
View File
@@ -0,0 +1,12 @@
val nonConstBool = true
const val constBool = false
const val andExpr1 = true && false
const val andExpr2 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>nonConstBool && false<!>
const val andExpr3 = true && constBool
const val andExpr4 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>nonConstBool && constBool<!>
const val orExpr1 = true || false
const val orExpr2 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>nonConstBool || false<!>
const val orExpr3 = true || constBool
const val orExpr4 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>nonConstBool || constBool<!>
compiler/testData/diagnostics/tests/modifiers/const/binaryLogic.kt
Vendored
+12
View File
@@ -0,0 +1,12 @@
val nonConstBool = true
const val constBool = false
const val andExpr1 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>true && false<!>
const val andExpr2 = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConstBool && false<!>
const val andExpr3 = true && constBool
const val andExpr4 = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConstBool && constBool<!>
const val orExpr1 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>true || false<!>
const val orExpr2 = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConstBool || false<!>
const val orExpr3 = true || constBool
const val orExpr4 = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConstBool || constBool<!>
compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_after.fir.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// LANGUAGE: +ProhibitSimplificationOfNonTrivialConstBooleanExpressions
val nonConstBool = true
const val constBool = false
const val s1 = """ ${ true && false } """
const val s2 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>""" ${ nonConstBool && false } """<!>
const val s3 = """ ${ constBool && false } """
compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_after.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// LANGUAGE: +ProhibitSimplificationOfNonTrivialConstBooleanExpressions
val nonConstBool = true
const val constBool = false
const val s1 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>""" ${ true && false } """<!>
const val s2 = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>""" ${ nonConstBool && false } """<!>
const val s3 = """ ${ constBool && false } """
compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_before.fir.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// LANGUAGE: -ProhibitSimplificationOfNonTrivialConstBooleanExpressions
val nonConstBool = true
const val constBool = false
const val s1 = """ ${ true && false } """
const val s2 = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>""" ${ nonConstBool && false } """<!>
const val s3 = """ ${ constBool && false } """
compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_before.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// LANGUAGE: -ProhibitSimplificationOfNonTrivialConstBooleanExpressions
val nonConstBool = true
const val constBool = false
const val s1 = """ ${ true && false } """
const val s2 = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>""" ${ nonConstBool && false } """<!>
const val s3 = """ ${ constBool && false } """
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+18
View File
@@ -23951,12 +23951,30 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.kt");
}
@Test
@TestMetadata("binaryLogic.kt")
public void testBinaryLogic() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/binaryLogic.kt");
}
@Test
@TestMetadata("compare.kt")
public void testCompare() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/compare.kt");
}
@Test
@TestMetadata("complexBooleanInStringConcat_after.kt")
public void testComplexBooleanInStringConcat_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_after.kt");
}
@Test
@TestMetadata("complexBooleanInStringConcat_before.kt")
public void testComplexBooleanInStringConcat_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/complexBooleanInStringConcat_before.kt");
}
@Test
@TestMetadata("constInteraction.kt")
public void testConstInteraction() throws Exception {