Merge branch 'master' into v2.1

diff --cc src/lj_cparse.c
index 6c3bb2f98700a43678f95e20d1ab196b06f3dfd7,2ef7dbe1fe0778bba29b827fbddfdad1dd0af554..9774f3a515a486eddf2067130804d5926b9ab39f
--- 1/src/lj_cparse.c
--- 2/src/lj_cparse.c
+++ b/src/lj_cparse.c
@@@ -1765,12 -1746,14 +1765,14 @@@ static void cp_pragma(CPState *cp, BCLi
      cp_next(cp);
      cp_check(cp, '(');
      if (cp->tok == CTOK_IDENT) {
 -      if (cp->str->hash == H_(738e923c,a1b65954)) {  /* push */
 +      if (cp_str_is(cp->str, "push")) {
-       if (cp->curpack < CPARSE_MAX_PACKSTACK) {
+       if (cp->curpack < CPARSE_MAX_PACKSTACK-1) {
          cp->packstack[cp->curpack+1] = cp->packstack[cp->curpack];
          cp->curpack++;
+       } else {
+         cp_errmsg(cp, cp->tok, LJ_ERR_XLEVELS);
        }
 -      } else if (cp->str->hash == H_(6c71cf27,6c71cf27)) {  /* pop */
 +      } else if (cp_str_is(cp->str, "pop")) {
        if (cp->curpack > 0) cp->curpack--;
        } else {
        cp_errmsg(cp, cp->tok, LJ_ERR_XSYMBOL);