jump address error when value taken from if statement without else clause; close #712

f134e8e1 · Yukihiro Matz Matsumoto · eab894e5 · f134e8e1
Commit f134e8e1 authored Jan 10, 2013 by Yukihiro Matz Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

src/codegen.c src/codegen.c +9 -3

No files found.
--- 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));
+        genop(s, MKOP_sBx(OP_JMP, 0)); 
-        dispatch(s, pos1);
+       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;