1 files changed, 7 insertions, 4 deletions

diff --git a/src/lj_target.h b/src/lj_target.h
index a80cc027..c302d301 100644
--- a/src/lj_target.h
+++ b/src/lj_target.h
@@ -144,12 +144,15 @@ typedef uint32_t RegCost;
 
 #ifdef EXITSTUBS_PER_GROUP
 /* Return the address of an exit stub. */
-static LJ_AINLINE MCode *exitstub_addr(jit_State *J, ExitNo exitno)
+static LJ_AINLINE char *exitstub_addr_(char **group, uint32_t exitno)
 {
-  lua_assert(J->exitstubgroup[exitno / EXITSTUBS_PER_GROUP] != NULL);
-  return (MCode *)((char *)J->exitstubgroup[exitno / EXITSTUBS_PER_GROUP] +
-                   EXITSTUB_SPACING*(exitno % EXITSTUBS_PER_GROUP));
+  lua_assert(group[exitno / EXITSTUBS_PER_GROUP] != NULL);
+  return (char *)group[exitno / EXITSTUBS_PER_GROUP] +
+         EXITSTUB_SPACING*(exitno % EXITSTUBS_PER_GROUP);
 }
+/* Avoid dependence on lj_jit.h if only including lj_target.h. */
+#define exitstub_addr(J, exitno) \
+  ((MCode *)exitstub_addr_((char **)((J)->exitstubgroup), (exitno)))
 #endif
 
 #endif