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

CliTrace: rewrite smart cast-vulnerable piece of code

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-12-10 09:36:54 +03:00
parent c8c83c04c0
commit bf8de487a0
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliTrace.kt
+11 -3
View File
@@ -77,15 +77,23 @@ open class CliBindingTrace @TestOnly constructor() : BindingTraceContext() {
this.kotlinCodeAnalyzer = kotlinCodeAnalyzer this.kotlinCodeAnalyzer = kotlinCodeAnalyzer
} }
@Suppress("UNCHECKED_CAST")
override fun <K, V> get(slice: ReadOnlySlice<K, V>, key: K): V? { override fun <K, V> get(slice: ReadOnlySlice<K, V>, key: K): V? {
val value = super.get(slice, key) val value = super.get(slice, key)
if (value == null) { if (value == null) {
if (BindingContext.FUNCTION === slice || BindingContext.VARIABLE === slice) { if (key is KtDeclaration) {
if (key is KtDeclaration) { // NB: intentional code duplication, see https://youtrack.jetbrains.com/issue/KT-43296
if (BindingContext.FUNCTION === slice) {
if (!KtPsiUtil.isLocal(key)) { if (!KtPsiUtil.isLocal(key)) {
kotlinCodeAnalyzer!!.resolveToDescriptor(key) kotlinCodeAnalyzer!!.resolveToDescriptor(key)
return super.get(slice, key) return super.get(slice, key) as V?
}
}
if (BindingContext.VARIABLE === slice) {
if (!KtPsiUtil.isLocal(key)) {
kotlinCodeAnalyzer!!.resolveToDescriptor(key)
return super.get(slice, key) as V?
} }
} }
} }