RETF modifies BASE. Treat it like a store or it gets CSEd.

diff --git a/src/lj_ir.h b/src/lj_ir.h
index e110607d2a2bd7e5e8f7e8fa58fdecc82fea0656..75519ed4133c64899618f1f5ce34e237e0a685ab 100644 (file)
--- a/src/lj_ir.h
+++ b/src/lj_ir.h
@@ -34,7 +34,7 @@
   _(NE,                GC, ref, ref) \
   \
   _(ABC,       G , ref, ref) \
-  _(RETF,      G , ref, ref) \
+  _(RETF,      SG, ref, ref) \
   \
   _(LT,                G , ref, ref) \
   _(GE,                G , ref, ref) \
@@ -288,6 +288,7 @@ typedef enum {
 #define IRM_GC                 (IRM_G|IRM_C)
 #define IRM_RG                 (IRM_R|IRM_G)
 #define IRM_LG                 (IRM_L|IRM_G)
+#define IRM_SG                 (IRM_S|IRM_G)
 
 #define irm_op1(m)             (cast(IRMode, (m)&3))
 #define irm_op2(m)             (cast(IRMode, ((m)>>2)&3))

diff --git a/src/lj_opt_fold.c b/src/lj_opt_fold.c
index a8550e1f55b50ad2e56b2b23f9b79ee1c2e70c9e..818979b8c0078ee12834bf007c83c318bd06863f 100644 (file)
--- a/src/lj_opt_fold.c
+++ b/src/lj_opt_fold.c
@@ -1326,6 +1326,7 @@ LJFOLDX(lj_opt_dse_fstore)
 LJFOLD(NEWREF any any)  /* Treated like a store. */
 LJFOLD(CALLS any any)
 LJFOLD(CALLL any any)  /* Safeguard fallback. */
+LJFOLD(RETF any any)  /* Modifies BASE. */
 LJFOLD(TNEW any any)
 LJFOLD(TDUP any)
 LJFOLDX(lj_ir_emit)