# HG changeset patch
# User Michael Starzinger <michi@complang.tuwien.ac.at>
# Date 1302644518 -7200
# Node ID ce0b5a00da7b43efb361c5208abbde69b54d0259
# Parent  48dd23cd38276a2b9f6e3a37f85841848df8757b
Fixed merging of join points for labels.

* rewriter/DexRewriter.java (visitLabel): Join points of jump targets are
merged before exception handlers are considered.

diff -r 48dd23cd3827 -r ce0b5a00da7b src/main/java/org/icedrobot/daneel/rewriter/DexRewriter.java
--- a/src/main/java/org/icedrobot/daneel/rewriter/DexRewriter.java	Tue Apr 12 22:56:37 2011 +0200
+++ b/src/main/java/org/icedrobot/daneel/rewriter/DexRewriter.java	Tue Apr 12 23:41:58 2011 +0200
@@ -845,15 +845,14 @@
         public void visitLabel(Label label) {
             fixStackAfterAMethodCallOrAnExceptionHandler();
             exceptionOnTop = exceptionHandlerSet.contains(label);
-            
+            createOrMergeJoinPoint(label);
+            mv.visitLabel(getASMLabel(label));
+
             // if it's the start of a try, find the corresponding handler
             Label handler = exceptionTryStartToHandlerMap.get(label);
             if (handler != null) {
                 createOrMergeJoinPoint(handler);
             }
-            
-            createOrMergeJoinPoint(label);
-            mv.visitLabel(getASMLabel(label));
         }
         
         @Override