KotlinSafeCallOperatorFilter should not be affected by presence of ps… · jacoco/jacoco@faa289d · GitHub
Skip to content

Commit faa289d

Browse files
GodinGodin
authored
KotlinSafeCallOperatorFilter should not be affected by presence of pseudo instructions (#1956)
1 parent 7994089 commit faa289d

4 files changed

Lines changed: 48 additions & 4 deletions

File tree

‎org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinSafeCallOperatorTarget.kt‎

Lines changed: 23 additions & 0 deletions

‎org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinSafeCallOperatorFilterTest.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void should_filter_optimized_safe_call_chain() {
8989
* fun example(a: A?): String? =
9090
* a
9191
* ?.b
92-
* ?.c
92+
* ?.c // line 6
9393
* </pre>
9494
*/
9595
@Test
@@ -108,6 +108,9 @@ public void should_filter_unoptimized_safe_call_chain() {
108108
m.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "A", "getB", "()LB;", false);
109109

110110
m.visitVarInsn(Opcodes.ASTORE, 1);
111+
final Label lineNumberLabel = new Label();
112+
m.visitLabel(lineNumberLabel);
113+
m.visitLineNumber(6, lineNumberLabel);
111114
m.visitVarInsn(Opcodes.ALOAD, 1);
112115
m.visitJumpInsn(Opcodes.IFNULL, label1);
113116
final AbstractInsnNode ifNullInstruction2 = m.instructions.getLast();

‎org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinSafeCallOperatorFilter.java‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ private static Collection<ArrayList<JumpInsnNode>> findChains(
108108
continue;
109109
}
110110
} else if (target.getOpcode() == Opcodes.ACONST_NULL) {
111-
if (i.getPrevious().getOpcode() != Opcodes.ALOAD) {
111+
final AbstractInsnNode p1 = preceding(i);
112+
if (p1.getOpcode() != Opcodes.ALOAD) {
112113
continue;
113114
}
114115
if (chain != null) {
115-
final AbstractInsnNode p1 = i.getPrevious();
116-
final AbstractInsnNode p2 = p1.getPrevious();
116+
final AbstractInsnNode p2 = preceding(p1);
117117
if (p2 == null || p2.getOpcode() != Opcodes.ASTORE
118118
|| ((VarInsnNode) p1).var != ((VarInsnNode) p2).var) {
119119
continue;
@@ -131,4 +131,19 @@ private static Collection<ArrayList<JumpInsnNode>> findChains(
131131
return chains.values();
132132
}
133133

134+
/**
135+
* @return non pseudo-instruction preceding given
136+
*/
137+
private static AbstractInsnNode preceding(AbstractInsnNode i) {
138+
if (i == null) {
139+
return null;
140+
}
141+
do {
142+
i = i.getPrevious();
143+
} while (i != null && (i.getType() == AbstractInsnNode.LABEL
144+
|| i.getType() == AbstractInsnNode.LINE
145+
|| i.getType() == AbstractInsnNode.FRAME));
146+
return i;
147+
}
148+
134149
}

‎org.jacoco.doc/docroot/doc/changes.html‎

Lines changed: 3 additions & 0 deletions

0 commit comments

Comments
 (0)