StringSwitchEcjFilter and KotlinWhenStringFilter should use correct V…

…arInsnNode (#746)
jacoco · Aug 20, 2018 · 964778b · 964778b
1 parent 6bbb012
commit 964778b
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 7 deletions.
diff --git a/...co.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinWhenStringFilterTest.java b/...co.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinWhenStringFilterTest.java
@@ -43,8 +43,12 @@ public void should_filter() {
 		final Label case3 = new Label();
 		final Label defaultCase = new Label();
 
+		// filter should not remember this unrelated slot
+		m.visitLdcInsn("");
+		m.visitVarInsn(Opcodes.ASTORE, 1);
 		m.visitVarInsn(Opcodes.ALOAD, 1);
 
+		// switch (...)
 		m.visitVarInsn(Opcodes.ASTORE, 2);
 		m.visitVarInsn(Opcodes.ALOAD, 2);
 		m.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/String", "hashCode",

diff --git a/...oco.core.test/src/org/jacoco/core/internal/analysis/filter/StringSwitchEcjFilterTest.java b/...oco.core.test/src/org/jacoco/core/internal/analysis/filter/StringSwitchEcjFilterTest.java
@@ -42,8 +42,13 @@ public void should_filter() {
 		final Label h1 = new Label();
 		final Label h2 = new Label();
 
+		// filter should not remember this unrelated slot
+		m.visitLdcInsn("");
+		m.visitVarInsn(Opcodes.ASTORE, 1);
 		m.visitVarInsn(Opcodes.ALOAD, 1);
 
+		// switch (...)
+		m.visitInsn(Opcodes.DUP);
 		m.visitVarInsn(Opcodes.ASTORE, 2);
 		m.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/String", "hashCode",
 				"()I", false);
@@ -112,8 +117,13 @@ public void should_filter_when_default_is_first() {
 		final Label caseDefault = new Label();
 		final Label h1 = new Label();
 
+		// filter should not remember this unrelated slot
+		m.visitLdcInsn("");
+		m.visitVarInsn(Opcodes.ASTORE, 1);
 		m.visitVarInsn(Opcodes.ALOAD, 1);
 
+		// switch (...)
+		m.visitInsn(Opcodes.DUP);
 		m.visitVarInsn(Opcodes.ASTORE, 2);
 		m.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/String", "hashCode",
 				"()I", false);

diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinWhenStringFilter.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinWhenStringFilter.java
@@ -21,6 +21,7 @@
 import org.objectweb.asm.tree.LookupSwitchInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.TableSwitchInsnNode;
+import org.objectweb.asm.tree.VarInsnNode;
 
 /**
  * Filters bytecode that Kotlin compiler generates for <code>when</code>
@@ -41,15 +42,16 @@ private static class Matcher extends AbstractMatcher {
 		public void match(final AbstractInsnNode start,
 				final IFilterOutput output) {
 
+			if (Opcodes.ALOAD != start.getOpcode()) {
+				return;
+			}
 			cursor = start;
-
-			nextIsVar(Opcodes.ASTORE, "s");
-			nextIsVar(Opcodes.ALOAD, "s");
 			nextIsInvokeVirtual("java/lang/String", "hashCode");
 			nextIsSwitch();
 			if (cursor == null) {
 				return;
 			}
+			vars.put("s", (VarInsnNode) start);
 
 			final AbstractInsnNode s = cursor;
 			final int hashCodes;

diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/StringSwitchEcjFilter.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/StringSwitchEcjFilter.java
@@ -21,6 +21,7 @@
 import org.objectweb.asm.tree.LookupSwitchInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.TableSwitchInsnNode;
+import org.objectweb.asm.tree.VarInsnNode;
 
 /**
  * Filters code that is generated by ECJ for a <code>switch</code> statement
@@ -41,14 +42,16 @@ private static class Matcher extends AbstractMatcher {
 		public void match(final AbstractInsnNode start,
 				final IFilterOutput output) {
 
+			if (Opcodes.ASTORE != start.getOpcode()) {
+				return;
+			}
 			cursor = start;
-
-			nextIsVar(Opcodes.ASTORE, "s");
 			nextIsInvokeVirtual("java/lang/String", "hashCode");
 			nextIsSwitch();
 			if (cursor == null) {
 				return;
 			}
+			vars.put("s", (VarInsnNode) start);
 
 			final AbstractInsnNode s = cursor;
 			final int hashCodes;

diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
@@ -36,7 +36,8 @@ <h3>New Features</h3>
       <code>java.lang.String</code> values is filtered out during generation of
       report
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/735">#735</a>,
-      <a href="https://github.com/jacoco/jacoco/issues/741">#741</a>).</li>
+      <a href="https://github.com/jacoco/jacoco/issues/741">#741</a>,
+      <a href="https://github.com/jacoco/jacoco/issues/746">#746</a>).</li>
   <li>Methods added by the Kotlin compiler are filtered out during generation
       of report. Idea and implementation by Nikolay Krasko
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/689">#689</a>).</li>
@@ -52,7 +53,8 @@ <h3>New Features</h3>
   <li>Additional bytecode generated by Kotlin compiler for <code>when</code>
       expressions on <code>kotlin.String</code> values is filtered out during
       generation of report
-      (GitHub <a href="https://github.com/jacoco/jacoco/issues/737">#737</a>).</li>
+      (GitHub <a href="https://github.com/jacoco/jacoco/issues/737">#737</a>,
+      <a href="https://github.com/jacoco/jacoco/issues/746">#746</a>).</li>
   <li>Classes and methods annotated with runtime visible and invisible annotation
       whose simple name is <code>Generated</code> are filtered out during
       generation of report