Merge branch 'master' into v2.1

2019-04-29 18:04:47 +02:00
parent b33e3f2d44 9bd5a722be
commit 178512fab9
2 changed files with 25 additions and 23 deletions
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -2130,8 +2130,8 @@ static void asm_setup_regsp(ASMState *as)
 #if LJ_SOFTFP
    case IR_MIN: case IR_MAX:
      if ((ir+1)->o != IR_HIOP) break;
-      /* fallthrough */
 #endif
+    /* fallthrough */
    /* C calls evict all scratch regs and return results in RID_RET. */
    case IR_SNEW: case IR_XSNEW: case IR_NEWREF: case IR_BUFPUT:
      if (REGARG_NUMGPR < 3 && as->evenspill < 3)