Merge branch 'master' into v2.1

2020-08-05 15:26:59 +02:00
parent 98682accbb 2211f6f960
commit 10ddae75af
2 changed files with 9 additions and 5 deletions
--- a/src/lj_jit.h
+++ b/src/lj_jit.h
@@ -503,11 +503,7 @@ typedef struct jit_State {
  BCLine prev_line;	/* Previous line. */
  int prof_mode;	/* Profiling mode: 0, 'f', 'l'. */
 #endif
-}
-#if LJ_TARGET_ARM
-LJ_ALIGN(16)		/* For DISPATCH-relative addresses in assembler part. */
-#endif
-jit_State;
+} jit_State;

 #ifdef LUA_USE_ASSERT
 #define lj_assertJ(c, ...)	lj_assertG_(J2G(J), (c), __VA_ARGS__)