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

Pseudocode label now cannot be bound to a non-owning pseudocode #KT-13555 Fixed

Browse Source 
Also EA-77641 Fixed
(cherry picked from commit 07643ce)
This commit is contained in:
Mikhail Glukhikh
2016-08-24 15:14:10 +03:00
committed by Mikhail Glukhikh
parent 08f8a2b75c
commit 25eefdb6ec
6 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.kt
+6 -1
View File
@@ -192,6 +192,11 @@ class PseudocodeImpl(override val correspondingElement: KtElement) : Pseudocode
}
fun bindLabel(label: PseudocodeLabel) {
assert(this == label.pseudocode) {
"Attempt to bind label $label to instruction from different pseudocode: " +
"\nowner pseudocode = ${label.pseudocode.mutableInstructionList}, " +
"\nbound pseudocode = ${this.mutableInstructionList}"
}
label.targetInstructionIndex = mutableInstructionList.size
}
@@ -380,7 +385,7 @@ class PseudocodeImpl(override val correspondingElement: KtElement) : Pseudocode
if (label === startLabel || label === finishLabel) continue
if (startIndex <= index && index <= finishIndex) {
originalToCopy.put(label, label.copy(labelCount++))
originalToCopy.put(label, label.copy(this, labelCount++))
originalLabelsForInstruction.put(getJumpTarget(label), label)
}
}
compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeLabel.kt
+2 -2
View File
@@ -43,7 +43,7 @@ class PseudocodeLabel internal constructor(
return instructionList[index]
}
fun copy(newLabelIndex: Int): PseudocodeLabel {
return PseudocodeLabel(pseudocode, "L" + newLabelIndex, "copy of $name, $comment")
fun copy(newPseudocode: PseudocodeImpl, newLabelIndex: Int): PseudocodeLabel {
return PseudocodeLabel(newPseudocode, "L" + newLabelIndex, "copy of $name, $comment")
}
}
compiler/testData/cfg/controlStructures/localAndNonlocalReturnsWithFinally.instructions
Vendored
+11 -11
View File
@@ -54,7 +54,7 @@ L0:
jmp?(L2) NEXT:[mark({ for (i in 1..2) { } return bar() }), mark({ if (n < 0) return 0 n.let { return it } })]
3 mark({ if (n < 0) return 0 n.let { return it } })
mark(if (n < 0) return 0)
r(n) -> <v1> PREV:[mark(if (n < 0) return 0), jmp(L15)]
r(n) -> <v1>
r(0) -> <v2>
mark(n < 0)
call(n < 0, compareTo|<v1>, <v2>) -> <v3>
@@ -62,7 +62,7 @@ L0:
r(0) -> <v4>
L4 [start finally]:
4 mark({ for (i in 1..2) { } return bar() })
5 r(1) -> <v5> PREV:[mark({ for (i in 1..2) { } return bar() }), jmp?(L16)]
5 r(1) -> <v5>
r(2) -> <v6>
mark(1..2)
call(1..2, rangeTo|<v5>, <v6>) -> <v7>
@@ -149,7 +149,7 @@ L29 [copy of L8, body exit point]:
ret(*|<v9>) L1 NEXT:[<END>]
- 2 merge(try { if (n < 0) return 0 n.let { return it } } finally { for (i in 1..2) { } return bar() }|<v15>) -> <v16> PREV:[]
L1:
1 <END> NEXT:[<SINK>] PREV:[ret(*|<v9>) L1, ret(*|<v9>) L1, ret(*|<v9>) L1]
1 <END> NEXT:[<SINK>] PREV:[ret(*|<v9>) L1, ret(*|<v9>) L1, ret(*|<v9>) L1, ret(*|<v9>) L1]
error:
<ERROR> PREV:[]
sink:
@@ -170,24 +170,24 @@ L13:
v(i)
L15 [copy of L5, loop entry point]:
L19 [copy of L9, condition entry point]:
jmp?(L16) NEXT:[r(1) -> <v5>, magic[LOOP_RANGE_ITERATION](1..2|<v7>) -> <v8>]
jmp?(L16) NEXT:[read (Unit), magic[LOOP_RANGE_ITERATION](1..2|<v7>) -> <v8>] PREV:[v(i), jmp(L15)]
magic[LOOP_RANGE_ITERATION](1..2|<v7>) -> <v8>
w(i|<v8>)
mark(for (i in 1..2) { })
L17 [copy of L7, body entry point]:
6 mark({ })
read (Unit)
5 jmp(L15) NEXT:[r(n) -> <v1>]
5 jmp(L15) NEXT:[jmp?(L16)]
L16 [copy of L6, loop exit point]:
L18 [copy of L8, body exit point]:
- read (Unit) PREV:[]
- 4 mark(bar()) PREV:[]
- call(bar(), bar) -> <v9> PREV:[]
- ret(*|<v9>) L1 NEXT:[<END>] PREV:[]
- 5 ret(*|<v0>) L1 NEXT:[<END>] PREV:[]
read (Unit) PREV:[jmp?(L16)]
4 mark(bar())
call(bar(), bar) -> <v9>
ret(*|<v9>) L1 NEXT:[<END>]
- 5 ret(*|<v0>) L1 NEXT:[<END>] PREV:[]
- 4 ret(*|!<v1>) L14 PREV:[]
L14:
<END> NEXT:[<SINK>] PREV:[]
<END> NEXT:[<SINK>] PREV:[]
error:
<ERROR> PREV:[]
sink:
compiler/testData/diagnostics/tests/controlFlowAnalysis/nonLocalReturnWithFinally.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
fun test(name: String?) {
try {
name?.let {
return
}
}
finally {
name?.hashCode()
}
}
compiler/testData/diagnostics/tests/controlFlowAnalysis/nonLocalReturnWithFinally.txt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package
public fun test(/*0*/ name: kotlin.String?): kotlin.Unit
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+6
View File
@@ -3564,6 +3564,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("nonLocalReturnWithFinally.kt")
public void testNonLocalReturnWithFinally() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/nonLocalReturnWithFinally.kt");
doTest(fileName);
}
@TestMetadata("privateSetter.kt")
public void testPrivateSetter() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/privateSetter.kt");