Reduce duplication of code (#808)

3 files changed, 7 insertions, 40 deletions

diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinWhenFilter.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinWhenFilter.java
index e9ffe045..dff035cd 100644
--- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinWhenFilter.java
+++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinWhenFilter.java
@@ -93,20 +93,9 @@ public final class KotlinWhenFilter implements IFilter {
 		}
 		final Set<AbstractInsnNode> newTargets = new HashSet<AbstractInsnNode>();
 		for (LabelNode label : labels) {
-			newTargets.add(instructionAfterLabel(label));
+			newTargets.add(AbstractMatcher.skipNonOpcodes(label));
 		}
 		output.replaceBranches(switchNode, newTargets);
 	}
 
-	private static AbstractInsnNode instructionAfterLabel(
-			final LabelNode label) {
-		AbstractInsnNode i = label.getNext();
-		while (i.getType() == AbstractInsnNode.FRAME
-				|| i.getType() == AbstractInsnNode.LABEL
-				|| i.getType() == AbstractInsnNode.LINE) {
-			i = i.getNext();
-		}
-		return i;
-	}
-
 }
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
index b8694c24..895ba4e8 100644
--- 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
@@ -67,7 +67,7 @@ public final class KotlinWhenStringFilter implements IFilter {
 			}
 
 			final Set<AbstractInsnNode> replacements = new HashSet<AbstractInsnNode>();
-			replacements.add(instructionAfterLabel(defaultLabel));
+			replacements.add(skipNonOpcodes(defaultLabel));
 
 			for (int i = 0; i < hashCodes; i++) {
 				while (true) {
@@ -83,8 +83,8 @@ public final class KotlinWhenStringFilter implements IFilter {
 						return;
 					}
 
-					replacements.add(instructionAfterLabel(
-							((JumpInsnNode) cursor).label));
+					replacements
+							.add(skipNonOpcodes(((JumpInsnNode) cursor).label));
 
 					if (jump.label == defaultLabel) {
 						// end of comparisons for same hashCode
@@ -98,15 +98,4 @@ public final class KotlinWhenStringFilter implements IFilter {
 		}
 	}
 
-	private static AbstractInsnNode instructionAfterLabel(
-			final LabelNode label) {
-		AbstractInsnNode i = label.getNext();
-		while (i.getType() == AbstractInsnNode.FRAME
-				|| i.getType() == AbstractInsnNode.LABEL
-				|| i.getType() == AbstractInsnNode.LINE) {
-			i = i.getNext();
-		}
-		return i;
-	}
-
 }
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
index 6c52d3b9..caa66e72 100644
--- 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
@@ -67,7 +67,7 @@ public final class StringSwitchEcjFilter implements IFilter {
 			}
 
 			final Set<AbstractInsnNode> replacements = new HashSet<AbstractInsnNode>();
-			replacements.add(instructionAfterLabel(defaultLabel));
+			replacements.add(skipNonOpcodes(defaultLabel));
 
 			for (int i = 0; i < hashCodes; i++) {
 				while (true) {
@@ -80,8 +80,8 @@ public final class StringSwitchEcjFilter implements IFilter {
 						return;
 					}
 
-					replacements.add(instructionAfterLabel(
-							((JumpInsnNode) cursor).label));
+					replacements
+							.add(skipNonOpcodes(((JumpInsnNode) cursor).label));
 
 					if (cursor.getNext().getOpcode() == Opcodes.GOTO) {
 						// end of comparisons for same hashCode
@@ -99,15 +99,4 @@ public final class StringSwitchEcjFilter implements IFilter {
 		}
 	}
 
-	private static AbstractInsnNode instructionAfterLabel(
-			final LabelNode label) {
-		AbstractInsnNode i = label.getNext();
-		while (i.getType() == AbstractInsnNode.FRAME
-				|| i.getType() == AbstractInsnNode.LABEL
-				|| i.getType() == AbstractInsnNode.LINE) {
-			i = i.getNext();
-		}
-		return i;
-	}
-
 }