Merge branch 'master' into v2.1

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:
 <ul>
 <li><tt>goto</tt> and <tt>::labels::</tt>.</li>
 <li>Hex escapes <tt>'\x3F'</tt> and <tt>'\*'</tt> escape in strings.</li>
-<li><tt>load(string|reader, chunkname [,mode [,env]])</tt>.
-<tt>loadstring()</tt> is an alias.</li>
+<li><tt>load(string|reader [, chunkname [,mode [,env]]])</tt>.</li>
+<li><tt>loadstring()</tt> is an alias for <tt>load()</tt>.</li>
+<li><tt>loadfile(filename [,mode [,env]])</tt>.</li>
 <li><tt>math.log(x [,base])</tt>.
 <li><tt>string.rep(s, n [,sep])</tt>.
 <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)
         IRIns *ir;
         /* Check for any intervening guards (includes conflicting loads). */
         for (ir = IR(J->cur.nins-1); ir > store; ir--)
-          if (irt_isguard(ir->t))
+          if (irt_isguard(ir->t) || ir->o == IR_CALLL)
             goto doemit;  /* No elimination possible. */
         /* Remove redundant store from chain and replace with NOP. */
         *refp = store->prev;