Merge branch 'master' into v2.1

2013-05-24 01:32:10 +02:00
parent f1f7e40318 d686217926
commit 4c1f9dd0f7
1 changed files with 1 additions and 0 deletions
--- a/src/lj_opt_fold.c
+++ b/src/lj_opt_fold.c
@@ -1978,6 +1978,7 @@ LJFOLDF(merge_eqne_snew_kgc)
 #define FOLD_SNEW_TYPE8		IRT_U8  /* Prefer unsigned loads. */
 #endif

+  PHIBARRIER(fleft);
  if (len <= FOLD_SNEW_MAX_LEN) {
    IROp op = (IROp)fins->o;
    IRRef strref = fleft->op1;