add a new nextIsLdcStartingWith function to the AbstractMatcher to si…

…mplify matching code
jacoco · Nov 22, 2021 · 0ffc688 · 0ffc688
1 parent 814ccfc
commit 0ffc688
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 24 deletions.
diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/AbstractMatcher.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/AbstractMatcher.java
@@ -145,6 +145,24 @@ final void nextIsLdc(final String cst) {
  cursor = null;
  }
 
+ /**
+ * Moves {@link #cursor} to next instruction if it is <code>LDC</code> with
+ * <code>cst</code> that starts with <code>cstPrefix</code>, otherwise sets
+ * it to <code>null</code>.
+ */
+ final void nextIsLdcStartingWith(final String cstPrefix) {
+ nextIs(Opcodes.LDC);
+ if (cursor == null) {
+ return;
+ }
+ LdcInsnNode ldcNode = (LdcInsnNode) cursor;
+ if (ldcNode.cst instanceof String
+ && ((String) ldcNode.cst).startsWith(cstPrefix)) {
+ return;
+ }
+ cursor = null;
+ }
+
  /**
  * Moves {@link #cursor} to next instruction if it has given opcode,
  * otherwise sets it to <code>null</code>.

diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinCoroutineFilter.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinCoroutineFilter.java
@@ -152,14 +152,7 @@ private void match(final MethodNode methodNode,
  cursor = s.dflt;
  nextIsType(Opcodes.NEW, "java/lang/IllegalStateException");
  nextIs(Opcodes.DUP);
- nextIs(Opcodes.LDC);
- if (cursor == null) {
- return;
- }
- if (!((LdcInsnNode) cursor).cst.equals(
- "call to 'resume' before 'invoke' with coroutine")) {
- return;
- }
+ nextIsLdc("call to 'resume' before 'invoke' with coroutine");
  nextIsInvoke(Opcodes.INVOKESPECIAL,
  "java/lang/IllegalStateException", "<init>",
  "(Ljava/lang/String;)V");

diff --git a/...acoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinDefaultArgumentsFilter.java b/...acoco.core/src/org/jacoco/core/internal/analysis/filter/KotlinDefaultArgumentsFilter.java
@@ -87,13 +87,8 @@ public void match(final MethodNode methodNode,
  nextIs(Opcodes.IFNULL);
  nextIsType(Opcodes.NEW, "java/lang/UnsupportedOperationException");
  nextIs(Opcodes.DUP);
- nextIs(Opcodes.LDC);
- if (cursor == null
- || !(((LdcInsnNode) cursor).cst instanceof String)
- || !(((String) ((LdcInsnNode) cursor).cst).startsWith(
- "Super calls with default arguments not supported in this target"))) {
- cursor = null;
- }
+ nextIsLdcStartingWith(
+ "Super calls with default arguments not supported in this target");
  nextIsInvoke(Opcodes.INVOKESPECIAL,
  "java/lang/UnsupportedOperationException", "<init>",
  "(Ljava/lang/String;)V");

diff --git a/...oco.core/src/org/jacoco/core/internal/analysis/filter/KotlinUnsafeCastOperatorFilter.java b/...oco.core/src/org/jacoco/core/internal/analysis/filter/KotlinUnsafeCastOperatorFilter.java
@@ -48,15 +48,7 @@ public void match(final String exceptionType,
  final JumpInsnNode jumpInsnNode = (JumpInsnNode) cursor;
  nextIsType(Opcodes.NEW, exceptionType);
  nextIs(Opcodes.DUP);
- nextIs(Opcodes.LDC);
- if (cursor == null) {
- return;
- }
- final LdcInsnNode ldc = (LdcInsnNode) cursor;
- if (!(ldc.cst instanceof String && ((String) ldc.cst)
- .startsWith("null cannot be cast to non-null type"))) {
- return;
- }
+ nextIsLdcStartingWith("null cannot be cast to non-null type");
  nextIsInvoke(Opcodes.INVOKESPECIAL, exceptionType, "<init>",
  "(Ljava/lang/String;)V");
  nextIs(Opcodes.ATHROW);