--- a/src/main/java/org/icedrobot/daneel/rewriter/DexRewriter.java	Tue Apr 12 23:47:46 2011 +0200
+++ b/src/main/java/org/icedrobot/daneel/rewriter/DexRewriter.java	Wed Apr 13 09:53:30 2011 +0200
@@ -840,21 +840,28 @@
             mv.visitVarInsn(ISTORE, vdest);
             interpreter.store(vdest, INT_TYPE);
         }
-        
+
         @Override
         public void visitLabel(Label label) {
-            fixStackAfterAMethodCallOrAnExceptionHandler();
+            // Only fix the stack if label is a jump target, otherwise it might
+            // just be a marker between invoke-* and move-result* instructions.
+            if (label.isJumpTarget())
+                fixStackAfterAMethodCallOrAnExceptionHandler();
+
+            // Exception handlers have the exception on top of the stack.
             exceptionOnTop = exceptionHandlerSet.contains(label);
+
+            // Merge register states at current jump target labels.
             createOrMergeJoinPoint(label);
             mv.visitLabel(getASMLabel(label));
 
-            // if it's the start of a try, find the corresponding handler
+            // If it's the start of a try, find the corresponding handler.
             Label handler = exceptionTryStartToHandlerMap.get(label);
             if (handler != null) {
                 createOrMergeJoinPoint(handler);
             }
         }
-        
+
         @Override
         public void visitInstrGoto(Opcode opcode, Label label) {
             fixStackAfterAMethodCallOrAnExceptionHandler();

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/test/java/org/icedrobot/daneel/rewriter/LabelBeforeMoveResultTest.java	Wed Apr 13 09:53:30 2011 +0200
@@ -0,0 +1,79 @@
+/*
+ * Daneel - Dalvik to Java bytecode compiler
+ * Copyright (C) 2011  IcedRobot team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * This file is subject to the "Classpath" exception:
+ *
+ * Linking this library statically or dynamically with other modules is
+ * making a combined work based on this library.  Thus, the terms and
+ * conditions of the GNU General Public License cover the whole
+ * combination.
+ *
+ * As a special exception, the copyright holders of this library give you
+ * permission to link this library with independent modules to produce an
+ * executable, regardless of the license terms of these independent
+ * modules, and to copy and distribute the resulting executable under terms
+ * of your choice, provided that you also meet, for each linked independent
+ * module, the terms and conditions of the license of that module.  An
+ * independent module is a module which is not derived from or based on
+ * this library.  If you modify this library, you may extend this exception
+ * to your version of the library, but you are not obligated to do so.  If
+ * you do not wish to do so, delete this exception statement from your
+ * version.
+ */
+
+package org.icedrobot.daneel.rewriter;
+
+import static org.junit.Assert.assertTrue;
+
+import org.icedrobot.daneel.DexifyingRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * This is a regression test for a bug when there is a marker label between the
+ * {@code invoke-}* and {@code move-result}* instructions. That happens when the
+ * invocation is covered by a try-catch block which ends immediately after the
+ * invocation.
+ * 
+ * @see DexRewriter.MethodRewriter#visitLabel(org.icedrobot.daneel.dex.Label)
+ */
+@RunWith(DexifyingRunner.class)
+public class LabelBeforeMoveResultTest {
+
+    @Test
+    public void test() {
+        assertTrue(DEXCode.check());
+    }
+
+    // Keep this class named "DEXCode" to push it through Daneel.
+    private static class DEXCode {
+
+        private static Object f() throws Exception {
+            throw new Exception("just checking");
+        }
+
+        public static boolean check() {
+            Object o;
+            try {
+                o = f();
+            } catch (Exception e) {
+                o = null;
+            }
+            return (o == null);
+        }
+    };
+}