Add filter for try-with-resources statement (#500)

1 files changed, 11 insertions, 28 deletions

diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/SynchronizedFilter.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/SynchronizedFilter.java
index 655226e7..eec00948 100644
--- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/SynchronizedFilter.java
+++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/SynchronizedFilter.java
@@ -38,9 +38,8 @@ public final class SynchronizedFilter implements IFilter {
 		}
 	}
 
-	private static class Matcher {
+	private static class Matcher extends AbstractMatcher {
 		private final AbstractInsnNode start;
-		private AbstractInsnNode cursor;
 
 		private Matcher(final AbstractInsnNode start) {
 			this.start = start;
@@ -55,36 +54,20 @@ public final class SynchronizedFilter implements IFilter {
 
 		private boolean nextIsJavac() {
 			cursor = start;
-			return nextIs(Opcodes.ASTORE) && nextIs(Opcodes.ALOAD)
-					&& nextIs(Opcodes.MONITOREXIT) && nextIs(Opcodes.ALOAD)
-					&& nextIs(Opcodes.ATHROW);
+			nextIsVar(Opcodes.ASTORE, "t");
+			nextIs(Opcodes.ALOAD);
+			nextIs(Opcodes.MONITOREXIT);
+			nextIsVar(Opcodes.ALOAD, "t");
+			nextIs(Opcodes.ATHROW);
+			return cursor != null;
 		}
 
 		private boolean nextIsEcj() {
 			cursor = start;
-			return nextIs(Opcodes.ALOAD) && nextIs(Opcodes.MONITOREXIT)
-					&& nextIs(Opcodes.ATHROW);
-		}
-
-		/**
-		 * Moves {@link #cursor} to next instruction and returns
-		 * <code>true</code> if it has given opcode.
-		 */
-		private boolean nextIs(int opcode) {
-			next();
-			return cursor != null && cursor.getOpcode() == opcode;
-		}
-
-		/**
-		 * Moves {@link #cursor} to next instruction.
-		 */
-		private void next() {
-			do {
-				cursor = cursor.getNext();
-			} while (cursor != null
-					&& (cursor.getType() == AbstractInsnNode.FRAME
-							|| cursor.getType() == AbstractInsnNode.LABEL
-							|| cursor.getType() == AbstractInsnNode.LINE));
+			nextIs(Opcodes.ALOAD);
+			nextIs(Opcodes.MONITOREXIT);
+			nextIs(Opcodes.ATHROW);
+			return  cursor != null;
 		}
 	}