aboutsummaryrefslogtreecommitdiff
path: root/src/lj_jit.h
diff options
context:
space:
mode:
authorMike Pall <mike>2020-08-05 15:26:59 +0200
committerMike Pall <mike>2020-08-05 15:26:59 +0200
commit10ddae75af15c8415b162953dcd9dfcee517ce0a (patch)
tree7454a0ef19e05cccb0ad61ae59d4c80287ff211c /src/lj_jit.h
parent98682accbb6141ecfd98cfd50298105abb288822 (diff)
parent2211f6f960b65d200a3142798cf86576405c24cb (diff)
downloadluajit-10ddae75af15c8415b162953dcd9dfcee517ce0a.tar.gz
luajit-10ddae75af15c8415b162953dcd9dfcee517ce0a.tar.bz2
luajit-10ddae75af15c8415b162953dcd9dfcee517ce0a.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_jit.h')
-rw-r--r--src/lj_jit.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lj_jit.h b/src/lj_jit.h
index b0d90fcd..655b84c3 100644
--- a/src/lj_jit.h
+++ b/src/lj_jit.h
@@ -503,11 +503,7 @@ typedef struct jit_State {
503 BCLine prev_line; /* Previous line. */ 503 BCLine prev_line; /* Previous line. */
504 int prof_mode; /* Profiling mode: 0, 'f', 'l'. */ 504 int prof_mode; /* Profiling mode: 0, 'f', 'l'. */
505#endif 505#endif
506} 506} jit_State;
507#if LJ_TARGET_ARM
508LJ_ALIGN(16) /* For DISPATCH-relative addresses in assembler part. */
509#endif
510jit_State;
511 507
512#ifdef LUA_USE_ASSERT 508#ifdef LUA_USE_ASSERT
513#define lj_assertJ(c, ...) lj_assertG_(J2G(J), (c), __VA_ARGS__) 509#define lj_assertJ(c, ...) lj_assertG_(J2G(J), (c), __VA_ARGS__)