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

Minor: readability improvements after code review

Browse Source
This commit is contained in:
Dmitry Petrov
2017-08-30 14:18:21 +03:00
parent 21e3051a78
commit 742fecf69c
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/nullCheck/RedundantNullCheckMethodTransformer.kt
+1 -3
View File
@@ -31,7 +31,6 @@ import org.jetbrains.kotlin.codegen.pseudoInsns.PseudoInsn
import org.jetbrains.kotlin.codegen.pseudoInsns.isPseudo import org.jetbrains.kotlin.codegen.pseudoInsns.isPseudo
import org.jetbrains.kotlin.resolve.jvm.AsmTypes import org.jetbrains.kotlin.resolve.jvm.AsmTypes
import org.jetbrains.kotlin.utils.SmartList import org.jetbrains.kotlin.utils.SmartList
import org.jetbrains.kotlin.utils.addToStdlib.cast
import org.jetbrains.org.objectweb.asm.Label import org.jetbrains.org.objectweb.asm.Label
import org.jetbrains.org.objectweb.asm.Opcodes import org.jetbrains.org.objectweb.asm.Opcodes
import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.Type
@@ -397,12 +396,11 @@ class RedundantNullCheckMethodTransformer : MethodTransformer() {
// <...> -- v is not null here because codegen told us so // <...> -- v is not null here because codegen told us so
val previous = insn.previous val previous = insn.previous
if (previous.opcode != Opcodes.ASTORE) return if (previous.opcode != Opcodes.ASTORE) return
val varIndex = previous.cast<VarInsnNode>().`var`
methodNode.instructions.run { methodNode.instructions.run {
insert(insn, listOfSynthetics { insert(insn, listOfSynthetics {
anew(varType) anew(varType)
store(varIndex, varType) store((previous as VarInsnNode).`var`, varType)
}) })
} }
} }
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
+1 -1
View File
@@ -366,7 +366,7 @@ object KeywordCompletion {
} }
val modifierTargets = ModifierCheckerCore.possibleTargetMap[keywordTokenType]?.intersect(possibleTargets) val modifierTargets = ModifierCheckerCore.possibleTargetMap[keywordTokenType]?.intersect(possibleTargets)
if (modifierTargets != null && possibleTargets.isNotEmpty() && if (modifierTargets != null && possibleTargets.isNotEmpty() &&
!modifierTargets.any { modifierTargets.none {
isModifierTargetSupportedAtLanguageLevel(keywordTokenType, it, languageVersionSettings) isModifierTargetSupportedAtLanguageLevel(keywordTokenType, it, languageVersionSettings)
}) return false }) return false