Minor: readability improvements after code review

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
@@ -31,7 +31,6 @@ import org.jetbrains.kotlin.codegen.pseudoInsns.PseudoInsn
import org.jetbrains.kotlin.codegen.pseudoInsns.isPseudo
import org.jetbrains.kotlin.resolve.jvm.AsmTypes
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.Opcodes
import org.jetbrains.org.objectweb.asm.Type
@@ -397,12 +396,11 @@ class RedundantNullCheckMethodTransformer : MethodTransformer() {
// <...> -- v is not null here because codegen told us so
val previous = insn.previous
if (previous.opcode != Opcodes.ASTORE) return
val varIndex = previous.cast<VarInsnNode>().`var`
methodNode.instructions.run {
insert(insn, listOfSynthetics {
anew(varType)
store(varIndex, varType)
store((previous as VarInsnNode).`var`, varType)
})
}
}
@@ -366,7 +366,7 @@ object KeywordCompletion {
}
val modifierTargets = ModifierCheckerCore.possibleTargetMap[keywordTokenType]?.intersect(possibleTargets)
if (modifierTargets != null && possibleTargets.isNotEmpty() &&
!modifierTargets.any {
modifierTargets.none {
isModifierTargetSupportedAtLanguageLevel(keywordTokenType, it, languageVersionSettings)
}) return false