aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2010-02-08 16:08:58 +0100
committerMike Pall <mike>2010-02-08 16:08:58 +0100
commit2ddea3838d476975453973a8164f99699dd78ee0 (patch)
tree86bb2e6d3c4d326ce86d727dae5feca8648834f5 /src
parentf86f9e8eec9c0f2c191be44ad4835329a559c990 (diff)
downloadluajit-2ddea3838d476975453973a8164f99699dd78ee0.tar.gz
luajit-2ddea3838d476975453973a8164f99699dd78ee0.tar.bz2
luajit-2ddea3838d476975453973a8164f99699dd78ee0.zip
Fix constructor bytecode generation for conditional values.
Diffstat (limited to 'src')
-rw-r--r--src/lj_parse.c2
1 files changed, 1 insertions, 1 deletions
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)
1348 if (val.k == VKSTR) 1348 if (val.k == VKSTR)
1349 lj_gc_objbarriert(fs->L, t, val.u.sval); 1349 lj_gc_objbarriert(fs->L, t, val.u.sval);
1350 } else { 1350 } else {
1351 if (val.k != VCALL) { expr_toanyreg(fs, &val); vcall = 0; }
1351 if (expr_isk(&key)) expr_index(fs, e, &key); 1352 if (expr_isk(&key)) expr_index(fs, e, &key);
1352 if (val.k != VCALL) vcall = 0;
1353 bcemit_store(fs, e, &val); 1353 bcemit_store(fs, e, &val);
1354 } 1354 }
1355 fs->freereg = freg; 1355 fs->freereg = freg;