MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin-dfa] Box/unbox result of try/catch (KTIJ-29010)

Browse Source 
GitOrigin-RevId: 40a12cce011a186e1cc730df757d5e5db2ecbef1
This commit is contained in:
Tagir Valeev
2024-03-12 17:35:26 +00:00
committed by intellij-monorepo-bot
parent 44bd206e34
commit fd50f306c9
5 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/code-insight/inspections-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/inspections/dfa/KtControlFlowBuilder.kt
+4 -1
View File
@@ -1005,7 +1005,8 @@ class KtControlFlowBuilder(val factory: DfaValueFactory, val context: KtExpressi
val finallyDescriptor = if (finallyBlock != null) EnterFinallyTrap(finallyBlock, finallyStart) else null
finallyDescriptor?.let { trapTracker.pushTrap(it) }
val tempVar = flow.createTempVariable(DfType.TOP)
val kotlinType = statement.getKotlinType()
val tempVar = flow.createTempVariable(kotlinType.toDfType())
val sections = statement.catchClauses
val clauses = LinkedHashMap<CatchClauseDescriptor, DeferredOffset>()
if (sections.isNotEmpty()) {
@@ -1019,6 +1020,7 @@ class KtControlFlowBuilder(val factory: DfaValueFactory, val context: KtExpressi
}
processExpression(tryBlock)
addImplicitConversion(tryBlock, kotlinType)
addInstruction(JvmAssignmentInstruction(null, tempVar))
val gotoEnd = createTransfer(statement, tryBlock, tempVar, true)
@@ -1035,6 +1037,7 @@ class KtControlFlowBuilder(val factory: DfaValueFactory, val context: KtExpressi
setOffset(offset)
val catchBlock = section.catchBody
processExpression(catchBlock)
addImplicitConversion(catchBlock, kotlinType)
addInstruction(JvmAssignmentInstruction(null, tempVar))
controlTransfer(gotoEnd, singleFinally)
}
plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/K2DataFlowInspectionTest.kt
+1
View File
@@ -92,6 +92,7 @@ class K2DataFlowInspectionTest : AbstractK2InspectionTest() {
fun testSuppressionsK2() = doTest()
fun testTopLevelDeclaration() = doTest()
fun testTryCatch() = doTest()
fun testTryCatchReturnValue() = doTest()
fun testTryCatchInsideFinally() = doTest()
fun testTryFinally() = doTest()
fun testTypeCastK2() = doTest()
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/dfa/KtControlFlowBuilder.kt
+4 -1
View File
@@ -208,7 +208,8 @@ class KtControlFlowBuilder(val factory: DfaValueFactory, val context: KtExpressi
val finallyDescriptor = if (finallyBlock != null) EnterFinallyTrap(finallyBlock, finallyStart) else null
finallyDescriptor?.let { trapTracker.pushTrap(it) }
val tempVar = flow.createTempVariable(DfType.TOP)
val kotlinType = statement.getKotlinType()
val tempVar = flow.createTempVariable(kotlinType.toDfType())
val sections = statement.catchClauses
val clauses = LinkedHashMap<CatchClauseDescriptor, DeferredOffset>()
if (sections.isNotEmpty()) {
@@ -222,6 +223,7 @@ class KtControlFlowBuilder(val factory: DfaValueFactory, val context: KtExpressi
}
processExpression(tryBlock)
addImplicitConversion(tryBlock, kotlinType)
addInstruction(JvmAssignmentInstruction(null, tempVar))
val gotoEnd = createTransfer(statement, tryBlock, tempVar, true)
@@ -238,6 +240,7 @@ class KtControlFlowBuilder(val factory: DfaValueFactory, val context: KtExpressi
setOffset(offset)
val catchBlock = section.catchBody
processExpression(catchBlock)
addImplicitConversion(catchBlock, kotlinType)
addInstruction(JvmAssignmentInstruction(null, tempVar))
controlTransfer(gotoEnd, singleFinally)
}
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/KtDataFlowInspectionTest.kt
+1
View File
@@ -93,6 +93,7 @@ class KtDataFlowInspectionTest : KotlinLightCodeInsightFixtureTestCase() {
fun testSuppressions() = doTest()
fun testTopLevelDeclaration() = doTest()
fun testTryCatch() = doTest()
fun testTryCatchReturnValue() = doTest()
fun testTryCatchInsideFinally() = doTest()
fun testTryFinally() = doTest()
fun testTypeCast() = doTest()
plugins/kotlin/idea/tests/testData/inspections/dfa/TryCatchReturnValue.kt
+4
View File
@@ -0,0 +1,4 @@
// WITH_STDLIB
fun main() {
if (<warning descr="Condition '1 == try { 1 } catch (e: Exception) { null }' is always true">1 == try { 1 } catch (e: Exception) { null }</warning>) {}
}