jump address error when value taken from if statement without else cl…

…ause; close #712
mruby · Jan 9, 2013 · f134e8e · f134e8e · mattn · Jan 10, 2013
1 parent eab894e
commit f134e8e
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/codegen.c b/src/codegen.c
@@ -1106,18 +1106,24 @@ codegen(codegen_scope *s, node *tree, int val)
       if (e) {
         if (val) pop();
         pos2 = new_label(s);
-        genop(s, MKOP_sBx(OP_JMP, 0));
-        dispatch(s, pos1);
+        genop(s, MKOP_sBx(OP_JMP, 0)); 
+       dispatch(s, pos1);
         codegen(s, e, val);
         dispatch(s, pos2);
       }
       else {
         if (val) {
           pop();
+	  pos2 = new_label(s);
+	  genop(s, MKOP_sBx(OP_JMP, 0));
+	  dispatch(s, pos1);
           genop(s, MKOP_A(OP_LOADNIL, cursp()));
+	  dispatch(s, pos2);
           push();
         }
-        dispatch(s, pos1);
+	else {
+	  dispatch(s, pos1);
+	}
       }
     }
     break;