KotlinSafeCallOperatorFilter should not be affected by presence of pseudo instructions (#1956)

Godin · web-flow · commit faa289d2a370 · 2025-09-30T13:25:18.000+02:00
diff --git a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinSafeCallOperatorTarget.kt b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinSafeCallOperatorTarget.kt
@@ -57,6 +57,28 @@ object KotlinSafeCallOperatorTarget {
     }
 
     private fun safeCallChainMultiline() {
+        fun nullOnly(a: A?): String? =
+            a // assertNotCovered()
+                ?.b // assertPartlyCovered(1, 1)
+                ?.c // assertPartlyCovered(1, 1)
+
+        fun nonNullOnly(a: A?): String? =
+            a // assertFullyCovered()
+                ?.b // assertPartlyCovered(1, 1)
+                ?.c // assertFullyCovered(1, 1)
+
+        fun fullCoverage(a: A?): String? =
+            a // assertFullyCovered()
+                ?.b // assertFullyCovered(0, 2)
+                ?.c // assertFullyCovered(0, 2)
+
+        nullOnly(null)
+        nonNullOnly(A(B("")))
+        fullCoverage(null)
+        fullCoverage(A(B("")))
+    }
+
+    private fun safeCallChainMultiline2() {
         fun nullOnly(a: A?): String? =
             a?.also { // assertPartlyCovered(1, 1)
                 nop(it) // assertNotCovered()
@@ -125,6 +147,7 @@ object KotlinSafeCallOperatorTarget {
         safeCall()
         safeCallChain()
         safeCallChainMultiline()
+        safeCallChainMultiline2()
         safeCallChainException()
         safeCallFollowedByElvis()
         safeCallChainFollowedByElvis()
diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinSafeCallOperatorFilterTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinSafeCallOperatorFilterTest.java
@@ -89,7 +89,7 @@ public void should_filter_optimized_safe_call_chain() {
 	 * fun example(a: A?): String? =
 	 *     a
 	 *         ?.b
-	 *         ?.c
+	 *         ?.c // line 6
 	 * </pre>
 	 */
 	@Test
@@ -108,6 +108,9 @@ public void should_filter_unoptimized_safe_call_chain() {
 		m.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "A", "getB", "()LB;", false);
 
 		m.visitVarInsn(Opcodes.ASTORE, 1);
+		final Label lineNumberLabel = new Label();
+		m.visitLabel(lineNumberLabel);
+		m.visitLineNumber(6, lineNumberLabel);
 		m.visitVarInsn(Opcodes.ALOAD, 1);
 		m.visitJumpInsn(Opcodes.IFNULL, label1);
 		final AbstractInsnNode ifNullInstruction2 = m.instructions.getLast();
diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinSafeCallOperatorFilter.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinSafeCallOperatorFilter.java
@@ -108,12 +108,12 @@ private static Collection<ArrayList<JumpInsnNode>> findChains(
 					continue;
 				}
 			} else if (target.getOpcode() == Opcodes.ACONST_NULL) {
-				if (i.getPrevious().getOpcode() != Opcodes.ALOAD) {
+				final AbstractInsnNode p1 = preceding(i);
+				if (p1.getOpcode() != Opcodes.ALOAD) {
 					continue;
 				}
 				if (chain != null) {
-					final AbstractInsnNode p1 = i.getPrevious();
-					final AbstractInsnNode p2 = p1.getPrevious();
+					final AbstractInsnNode p2 = preceding(p1);
 					if (p2 == null || p2.getOpcode() != Opcodes.ASTORE
 							|| ((VarInsnNode) p1).var != ((VarInsnNode) p2).var) {
 						continue;
@@ -131,4 +131,19 @@ private static Collection<ArrayList<JumpInsnNode>> findChains(
 		return chains.values();
 	}
 
+	/**
+	 * @return non pseudo-instruction preceding given
+	 */
+	private static AbstractInsnNode preceding(AbstractInsnNode i) {
+		if (i == null) {
+			return null;
+		}
+		do {
+			i = i.getPrevious();
+		} while (i != null && (i.getType() == AbstractInsnNode.LABEL
+				|| i.getType() == AbstractInsnNode.LINE
+				|| i.getType() == AbstractInsnNode.FRAME));
+		return i;
+	}
+
 }
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
@@ -32,6 +32,9 @@ <h3>New Features</h3>
   <li>Part of bytecode generated by the Kotlin compiler for elvis operator that
       follows safe call operator is filtered out during generation of report
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/1814">#1814</a>).</li>
+  <li>Part of bytecode generated by the Kotlin compiler for more cases of chained
+      safe call operators is filtered out during generation of report
+      (GitHub <a href="https://github.com/jacoco/jacoco/issues/1956">#1956</a>).</li>
   <li>Part of bytecode generated by the Kotlin compiler for invocations of
       <code>suspendCoroutineUninterceptedOrReturn</code> intrinsic is filtered out
       during generation of report
