aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/extensions.html5
-rw-r--r--src/lj_opt_mem.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/extensions.html b/doc/extensions.html
index f288fbde..8300753e 100644
--- a/doc/extensions.html
+++ b/doc/extensions.html
@@ -251,8 +251,9 @@ enabled:
251<ul> 251<ul>
252<li><tt>goto</tt> and <tt>::labels::</tt>.</li> 252<li><tt>goto</tt> and <tt>::labels::</tt>.</li>
253<li>Hex escapes <tt>'\x3F'</tt> and <tt>'\*'</tt> escape in strings.</li> 253<li>Hex escapes <tt>'\x3F'</tt> and <tt>'\*'</tt> escape in strings.</li>
254<li><tt>load(string|reader, chunkname [,mode [,env]])</tt>. 254<li><tt>load(string|reader [, chunkname [,mode [,env]]])</tt>.</li>
255<tt>loadstring()</tt> is an alias.</li> 255<li><tt>loadstring()</tt> is an alias for <tt>load()</tt>.</li>
256<li><tt>loadfile(filename [,mode [,env]])</tt>.</li>
256<li><tt>math.log(x [,base])</tt>. 257<li><tt>math.log(x [,base])</tt>.
257<li><tt>string.rep(s, n [,sep])</tt>. 258<li><tt>string.rep(s, n [,sep])</tt>.
258<li><tt>string.format()</tt>: <tt>%q</tt> reversible. 259<li><tt>string.format()</tt>: <tt>%q</tt> reversible.
diff --git a/src/lj_opt_mem.c b/src/lj_opt_mem.c
index bf77666b..98974ce3 100644
--- a/src/lj_opt_mem.c
+++ b/src/lj_opt_mem.c
@@ -347,7 +347,7 @@ TRef LJ_FASTCALL lj_opt_dse_ahstore(jit_State *J)
347 IRIns *ir; 347 IRIns *ir;
348 /* Check for any intervening guards (includes conflicting loads). */ 348 /* Check for any intervening guards (includes conflicting loads). */
349 for (ir = IR(J->cur.nins-1); ir > store; ir--) 349 for (ir = IR(J->cur.nins-1); ir > store; ir--)
350 if (irt_isguard(ir->t)) 350 if (irt_isguard(ir->t) || ir->o == IR_CALLL)
351 goto doemit; /* No elimination possible. */ 351 goto doemit; /* No elimination possible. */
352 /* Remove redundant store from chain and replace with NOP. */ 352 /* Remove redundant store from chain and replace with NOP. */
353 *refp = store->prev; 353 *refp = store->prev;