Avoid needless dereferencing

PlutoLang · Jul 16, 2023 · 02245a7 · 02245a7
1 parent 64350ed
commit 02245a7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/lcode.cpp b/src/lcode.cpp
@@ -1132,9 +1132,9 @@ static int jumponcond (FuncState *fs, expdesc *e, int cond) {
 }
 
 
-LUAI_FUNC bool luaK_isalwaytrue (FuncState *fs, expdesc *e) {
+LUAI_FUNC bool luaK_isalwaytrue (LexState *ls, expdesc *e) {
   if (e->k == VCONST) {
-    Vardesc *vd = &fs->ls->dyd->actvar.arr[e->u.info];
+    Vardesc *vd = &ls->dyd->actvar.arr[e->u.info];
     lua_assert(vd->kind == RDKCTC);
     if (ttisnumber(&vd->k) || ttisstring(&vd->k)) {
       return true;
@@ -1148,9 +1148,9 @@ LUAI_FUNC bool luaK_isalwaytrue (FuncState *fs, expdesc *e) {
 }
 
 
-LUAI_FUNC bool luaK_isalwayfalse (FuncState *fs, expdesc *e) {
+LUAI_FUNC bool luaK_isalwayfalse (LexState *ls, expdesc *e) {
   if (e->k == VCONST) {
-    Vardesc *vd = &fs->ls->dyd->actvar.arr[e->u.info];
+    Vardesc *vd = &ls->dyd->actvar.arr[e->u.info];
     lua_assert(vd->kind == RDKCTC);
     if (ttisnil(&vd->k)) {
       return true;
@@ -1170,7 +1170,7 @@ LUAI_FUNC bool luaK_isalwayfalse (FuncState *fs, expdesc *e) {
 void luaK_goiftrue (FuncState *fs, expdesc *e) {
   int pc;  /* pc of new jump */
   luaK_dischargevars(fs, e);
-  if (luaK_isalwaytrue(fs, e)) {
+  if (luaK_isalwaytrue(fs->ls, e)) {
     pc = NO_JUMP;  /* always true; do nothing */
   }
   else switch (e->k) {
@@ -1196,7 +1196,7 @@ void luaK_goiftrue (FuncState *fs, expdesc *e) {
 void luaK_goiffalse (FuncState *fs, expdesc *e) {
   int pc;  /* pc of new jump */
   luaK_dischargevars(fs, e);
-  if (luaK_isalwayfalse(fs, e)) {
+  if (luaK_isalwayfalse(fs->ls, e)) {
     pc = NO_JUMP;  /* always false; do nothing */
   }
   else switch (e->k) {

diff --git a/src/lcode.h b/src/lcode.h
@@ -76,8 +76,8 @@ LUAI_FUNC void luaK_exp2val (FuncState *fs, expdesc *e);
 LUAI_FUNC int luaK_exp2RK (FuncState *fs, expdesc *e);
 LUAI_FUNC void luaK_self (FuncState *fs, expdesc *e, expdesc *key);
 LUAI_FUNC void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k);
-LUAI_FUNC bool luaK_isalwaytrue (FuncState *fs, expdesc *e);
-LUAI_FUNC bool luaK_isalwayfalse (FuncState *fs, expdesc *e);
+LUAI_FUNC bool luaK_isalwaytrue (LexState *ls, expdesc *e);
+LUAI_FUNC bool luaK_isalwayfalse (LexState *ls, expdesc *e);
 LUAI_FUNC void luaK_goifnil (FuncState *fs, expdesc *e);
 LUAI_FUNC void luaK_goiftrue (FuncState *fs, expdesc *e);
 LUAI_FUNC void luaK_goiffalse (FuncState *fs, expdesc *e);

diff --git a/src/lparser.cpp b/src/lparser.cpp
@@ -3698,7 +3698,7 @@ static void test_then_block (LexState *ls, int *escapelist, TypeHint *prop) {
   int jf;  /* instruction to skip 'then' code (if condition is false) */
   luaX_next(ls);  /* skip IF or ELSEIF */
   expr(ls, &v);  /* read condition */
-  if (luaK_isalwayfalse(fs, &v))
+  if (luaK_isalwayfalse(ls, &v))
     throw_warn(ls, "unreachable code", "this condition will never be truthy.", WT_UNREACHABLE_CODE);
   checknext(ls, TK_THEN);
   if (ls->t.token == TK_BREAK && luaX_lookahead(ls) != TK_INT) {  /* 'if x then break' and not 'if x then break int' ? */
@@ -3747,9 +3747,9 @@ static void ifstat (LexState *ls, int line, TypeHint *prop = nullptr) {
 static void constexprifstat (LexState *ls, int line, TypeHint *prop = nullptr) {
   expdesc c;
   expr(ls, &c);
-  const bool disposition = luaK_isalwaytrue(ls->fs, &c);
+  const bool disposition = luaK_isalwaytrue(ls, &c);
   if (disposition == false) {
-    if (!luaK_isalwayfalse(ls->fs, &c)) {
+    if (!luaK_isalwayfalse(ls, &c)) {
       luaX_syntaxerror(ls, "Compile-time 'if' must have a condition that can be evaluated at compile-time");
     }
   }