Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
7b61bf91
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7b61bf91
编写于
6月 11, 2020
作者:
D
Denis Zharkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FIR: Add nullability smartcast after !is check
^KT-39072 Fixed
上级
24948a8b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
57 addition
and
4 deletion
+57
-4
compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/boundSafeCallAndIsCheck.kt
...a/resolve/smartcasts/safeCalls/boundSafeCallAndIsCheck.kt
+17
-0
compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/boundSafeCallAndIsCheck.txt
.../resolve/smartcasts/safeCalls/boundSafeCallAndIsCheck.txt
+25
-0
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
...org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
+5
-0
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
.../kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
+5
-0
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
...g/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
+5
-4
未找到文件。
compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/boundSafeCallAndIsCheck.kt
0 → 100644
浏览文件 @
7b61bf91
interface
A
{
val
b
:
B
}
interface
B
interface
C
:
B
{
fun
q
():
Boolean
}
fun
A
.
foo
():
String
=
""
fun
main
(
a
:
A
?)
{
val
lb
=
a
?.
b
if
(
lb
!
is
C
)
return
a
.
foo
().
length
}
compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/boundSafeCallAndIsCheck.txt
0 → 100644
浏览文件 @
7b61bf91
FILE: boundSafeCallAndIsCheck.kt
public abstract interface A : R|kotlin/Any| {
public abstract val b: R|B|
public get(): R|B|
}
public abstract interface B : R|kotlin/Any| {
}
public abstract interface C : R|B| {
public abstract fun q(): R|kotlin/Boolean|
}
public final fun R|A|.foo(): R|kotlin/String| {
^foo String()
}
public final fun main(a: R|A?|): R|kotlin/Unit| {
lval lb: R|B?| = R|<local>/a|?.{ $subj$.R|/A.b| }
when () {
(R|<local>/lb| !is R|C|) -> {
^main Unit
}
}
R|<local>/a|.R|/foo|().R|kotlin/String.length|
}
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
浏览文件 @
7b61bf91
...
...
@@ -2152,6 +2152,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
runTest
(
"compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/assignSafeCall.kt"
);
}
@TestMetadata
(
"boundSafeCallAndIsCheck.kt"
)
public
void
testBoundSafeCallAndIsCheck
()
throws
Exception
{
runTest
(
"compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/boundSafeCallAndIsCheck.kt"
);
}
@TestMetadata
(
"safeCallAndEqualityToBool.kt"
)
public
void
testSafeCallAndEqualityToBool
()
throws
Exception
{
runTest
(
"compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.kt"
);
...
...
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
浏览文件 @
7b61bf91
...
...
@@ -2152,6 +2152,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
runTest
(
"compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/assignSafeCall.kt"
);
}
@TestMetadata
(
"boundSafeCallAndIsCheck.kt"
)
public
void
testBoundSafeCallAndIsCheck
()
throws
Exception
{
runTest
(
"compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/boundSafeCallAndIsCheck.kt"
);
}
@TestMetadata
(
"safeCallAndEqualityToBool.kt"
)
public
void
testSafeCallAndEqualityToBool
()
throws
Exception
{
runTest
(
"compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.kt"
);
...
...
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
浏览文件 @
7b61bf91
...
...
@@ -237,7 +237,8 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
when
(
val
operation
=
typeOperatorCall
.
operation
)
{
FirOperation
.
IS
,
FirOperation
.
NOT_IS
->
{
val
expressionVariable
=
variableStorage
.
createSyntheticVariable
(
typeOperatorCall
)
val
isNotNullCheck
=
operation
==
FirOperation
.
IS
&&
type
.
nullability
==
ConeNullability
.
NOT_NULL
val
isNotNullCheck
=
type
.
nullability
==
ConeNullability
.
NOT_NULL
val
isRegularIs
=
operation
==
FirOperation
.
IS
if
(
operandVariable
.
isReal
())
{
val
hasTypeInfo
=
operandVariable
typeEq
type
val
hasNotTypeInfo
=
operandVariable
typeNotEq
type
...
...
@@ -252,13 +253,13 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
flow
.
addTypeStatement
(
operandVariable
typeEq
any
)
}
if
(
isNotNullCheck
)
{
flow
.
addImplication
((
expressionVariable
eq
true
)
implies
(
operandVariable
typeEq
any
))
flow
.
addImplication
((
expressionVariable
eq
true
)
implies
(
operandVariable
notEq
null
))
flow
.
addImplication
((
expressionVariable
eq
isRegularIs
)
implies
(
operandVariable
typeEq
any
))
flow
.
addImplication
((
expressionVariable
eq
isRegularIs
)
implies
(
operandVariable
notEq
null
))
}
}
else
{
if
(
isNotNullCheck
)
{
flow
.
addImplication
((
expressionVariable
eq
true
)
implies
(
operandVariable
notEq
null
))
flow
.
addImplication
((
expressionVariable
eq
isRegularIs
)
implies
(
operandVariable
notEq
null
))
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录