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

Cleanup: simplify for

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-05-18 18:03:35 +03:00
parent ebd57fafd7
commit ceb4aa7ac0
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInfo.kt
+3 -3
View File
@@ -43,9 +43,9 @@ class InitControlFlowInfo(map: MutableMap<VariableDescriptor, VariableControlFlo
// merge = input of MergeInstruction
// returns true if definite initialization in when happens here
fun checkDefiniteInitializationInWhen(merge: InitControlFlowInfo): Boolean {
for (entry in entries) {
if (entry.value.initState == InitState.INITIALIZED_EXHAUSTIVELY &&
merge[entry.key]?.initState == InitState.INITIALIZED) {
for ((key, value) in entries) {
if (value.initState == InitState.INITIALIZED_EXHAUSTIVELY &&
merge[key]?.initState == InitState.INITIALIZED) {
return true
}
}
compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.kt
+3 -4
View File
@@ -109,10 +109,9 @@ class PseudocodeVariablesData(val pseudocode: Pseudocode, private val bindingCon
if (instruction is MagicInstruction) {
if (instruction.kind === MagicKind.EXHAUSTIVE_WHEN_ELSE) {
val exitInstructionData = enterInstructionData.copy()
for (entry in enterInstructionData.entries) {
if (!entry.value.definitelyInitialized()) {
exitInstructionData.put(entry.key,
VariableControlFlowState.createInitializedExhaustively(entry.value.isDeclared))
for ((key, value) in enterInstructionData) {
if (!value.definitelyInitialized()) {
exitInstructionData.put(key, VariableControlFlowState.createInitializedExhaustively(value.isDeclared))
}
}
return exitInstructionData