From 2ddea3838d476975453973a8164f99699dd78ee0 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Mon, 8 Feb 2010 16:08:58 +0100
Subject: [PATCH] Fix constructor bytecode generation for conditional values.

---
 src/lj_parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lj_parse.c b/src/lj_parse.c
index 678dc4fa..5cb3ac3b 100644
--- a/src/lj_parse.c
+++ b/src/lj_parse.c
@@ -1348,8 +1348,8 @@ static void expr_table(LexState *ls, ExpDesc *e)
       if (val.k == VKSTR)
 	lj_gc_objbarriert(fs->L, t, val.u.sval);
     } else {
+      if (val.k != VCALL) { expr_toanyreg(fs, &val); vcall = 0; }
       if (expr_isk(&key)) expr_index(fs, e, &key);
-      if (val.k != VCALL) vcall = 0;
       bcemit_store(fs, e, &val);
     }
     fs->freereg = freg;