Differentiate between IR_KPTR and IR_KKPTR.

IR_KPTR holds a const pointer to possibly non-const content.
IR_KKPTR holds a const pointer to definitely const content.
Note that only content known by the VM to be const qualifies.
Content tagged as const by users (e.g. const char *) doesn't.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lj_asm.c b/src/lj_asm.c
index db126d74..bda86fc4 100644
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -636,7 +636,7 @@ static Reg ra_rematk(ASMState *as, IRIns *ir)
 #endif
   } else {
     lua_assert(ir->o == IR_KINT || ir->o == IR_KGC ||
-               ir->o == IR_KPTR || ir->o == IR_KNULL);
+               ir->o == IR_KPTR || ir->o == IR_KKPTR || ir->o == IR_KNULL);
     emit_loadi(as, r, ir->i);
   }
   return r;
@@ -946,7 +946,7 @@ static void ra_left(ASMState *as, Reg dest, IRRef lref)
 #endif
       } else {
         lua_assert(ir->o == IR_KINT || ir->o == IR_KGC ||
-                   ir->o == IR_KPTR || ir->o == IR_KNULL);
+                   ir->o == IR_KPTR || ir->o == IR_KKPTR || ir->o == IR_KNULL);
         emit_loadi(as, dest, ir->i);
         return;
       }
@@ -1312,7 +1312,7 @@ static void asm_fusexref(ASMState *as, IRRef ref, RegSet allow)
 {
   IRIns *ir = IR(ref);
   as->mrm.idx = RID_NONE;
-  if (ir->o == IR_KPTR) {
+  if (ir->o == IR_KPTR || ir->o == IR_KKPTR) {
     as->mrm.ofs = ir->i;
     as->mrm.base = RID_NONE;
   } else if (ir->o == IR_STRREF) {