From: Mike Pall <mike>
Date: Tue, 15 Feb 2011 00:02:08 +0000 (+0100)
Subject: Add workaround for lj_meta_tset() newkey inconsistency.
X-Git-Tag: v2.0.0-beta7~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dca589af02ee20edfd797ca041ab8d2daf4caed;p=thirdparty%2FLuaJIT.git

Add workaround for lj_meta_tset() newkey inconsistency.
---

diff --git a/src/lj_record.c b/src/lj_record.c
index 26e87ab3..6517a1b7 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -1021,7 +1021,8 @@ TRef lj_record_idx(jit_State *J, RecordIndex *ix)
   xref = rec_idx_key(J, ix);
   xrefop = IR(tref_ref(xref))->o;
   loadop = xrefop == IR_AREF ? IR_ALOAD : IR_HLOAD;
-  oldv = ix->oldv;
+  /* NYI: workaround until lj_meta_tset() inconsistency is solved. */
+  oldv = xrefop == IR_KKPTR ? (cTValue *)ir_kptr(IR(tref_ref(xref))) : ix->oldv;
 
   if (ix->val == 0) {  /* Indexed load */
     IRType t = itype2irt(oldv);