Merge branch 'master' into v2.1

2014-04-08 12:12:27 +02:00
parent d3e3700180 4ed3ee1f04
commit 347b49ec7d
2 changed files with 5 additions and 3 deletions
--- a/src/lj_crecord.c
+++ b/src/lj_crecord.c
@@ -1453,7 +1453,9 @@ void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)
 	  ct = ctype_child(cts, cct);
 	  tr = lj_ir_kint(J, (int32_t)ofs);
 	}  /* else: interpreter will throw. */
-      }  /* else: interpreter will throw. */
+      } else {
+	tr = emitir(IRT(IR_ADD, IRT_PTR), tr, lj_ir_kintp(J, sizeof(GCstr)));
+      }
    } else if (!tref_isnum(tr)) {
      tr = 0;
    }