Merge branch 'master' into v2.1

diff --cc src/lj_dispatch.h
Simple merge

diff --cc src/lj_jit.h
index b0d90fcd13b2aa39c33a24bb9e4b2272066f0215,4a4b0b1b47c717ad3143508b30f215273bf0eab6..655b84c3dda8eaf492323c1fbfe75f20e54ea309
--- 1/src/lj_jit.h
--- 2/src/lj_jit.h
+++ b/src/lj_jit.h
@@@ -497,22 -406,14 +497,18 @@@ typedef struct jit_State 
    size_t szallmcarea; /* Total size of all allocated mcode areas. */
  
    TValue errinfo;     /* Additional info element for trace errors. */
- }
- #if LJ_TARGET_ARM
- LJ_ALIGN(16)          /* For DISPATCH-relative addresses in assembler part. */
- #endif
- jit_State;
 +
 +#if LJ_HASPROFILE
 +  GCproto *prev_pt;   /* Previous prototype. */
 +  BCLine prev_line;   /* Previous line. */
 +  int prof_mode;      /* Profiling mode: 0, 'f', 'l'. */
 +#endif
+ } jit_State;
  
 -/* Trivial PRNG e.g. used for penalty randomization. */
 -static LJ_AINLINE uint32_t LJ_PRNG_BITS(jit_State *J, int bits)
 -{
 -  /* Yes, this LCG is very weak, but that doesn't matter for our use case. */
 -  J->prngstate = J->prngstate * 1103515245 + 12345;
 -  return J->prngstate >> (32-bits);
 -}
 +#ifdef LUA_USE_ASSERT
 +#define lj_assertJ(c, ...)    lj_assertG_(J2G(J), (c), __VA_ARGS__)
 +#else
 +#define lj_assertJ(c, ...)    ((void)J)
 +#endif
  
  #endif