Instrumentation should not damage structured locking (#627)

1 files changed, 14 insertions, 9 deletions

diff --git a/org.jacoco.core/src/org/jacoco/core/internal/flow/MethodProbesAdapter.java b/org.jacoco.core/src/org/jacoco/core/internal/flow/MethodProbesAdapter.java
index cff89112..5b3cb02c 100644
--- a/org.jacoco.core/src/org/jacoco/core/internal/flow/MethodProbesAdapter.java
+++ b/org.jacoco.core/src/org/jacoco/core/internal/flow/MethodProbesAdapter.java
@@ -62,19 +62,24 @@ public final class MethodProbesAdapter extends MethodVisitor {
 	}
 
 	@Override
-	public void visitTryCatchBlock(Label start, final Label end,
+	public void visitTryCatchBlock(final Label start, final Label end,
 			final Label handler, final String type) {
-		// If a probe will be inserted before the start label, we'll need to use
-		// a different label for the try-catch block.
-		if (tryCatchProbeLabels.containsKey(start)) {
-			start = tryCatchProbeLabels.get(start);
-		} else if (LabelInfo.needsProbe(start)) {
+		probesVisitor.visitTryCatchBlock(getTryCatchLabel(start), getTryCatchLabel(end),
+				handler, type);
+	}
+
+	private Label getTryCatchLabel(Label label) {
+		if (tryCatchProbeLabels.containsKey(label)) {
+			label = tryCatchProbeLabels.get(label);
+		} else if (LabelInfo.needsProbe(label)) {
+			// If a probe will be inserted before the label, we'll need to use a
+			// different label to define the range of the try-catch block.
 			final Label probeLabel = new Label();
 			LabelInfo.setSuccessor(probeLabel);
-			tryCatchProbeLabels.put(start, probeLabel);
-			start = probeLabel;
+			tryCatchProbeLabels.put(label, probeLabel);
+			label = probeLabel;
 		}
-		probesVisitor.visitTryCatchBlock(start, end, handler, type);
+		return label;
 	}
 
 	@Override