move userdata to lua_Callbacks

luau-lang · Nov 7, 2021 · 150c921 · 150c921
1 parent 2a26c09
commit 150c921
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/VM/include/lua.h b/VM/include/lua.h
@@ -356,6 +356,8 @@ struct lua_Callbacks
     void (*debugstep)(lua_State* L, lua_Debug* ar);      /* gets called after each instruction in single step mode */
     void (*debuginterrupt)(lua_State* L, lua_Debug* ar); /* gets called when thread execution is interrupted by break in another thread */
     void (*debugprotectederror)(lua_State* L);           /* gets called when protected call results in an error */
+
+    void* userdata; /* arbitrary userdata pointer that is never overwritten by Luau */
 };
 
 LUA_API lua_Callbacks* lua_callbacks(lua_State* L);

diff --git a/VM/src/lstate.cpp b/VM/src/lstate.cpp
@@ -181,7 +181,6 @@ lua_State* lua_newstate(lua_Alloc f, void* ud)
 
     g->cb = lua_Callbacks();
     g->gcstats = GCStats();
-    g->userdata = NULL;
 
     if (luaD_rawrunprotected(L, f_luaopen, NULL) != 0)
     {

diff --git a/VM/src/lstate.h b/VM/src/lstate.h
@@ -189,8 +189,6 @@ typedef struct global_State
 
     GCStats gcstats;
 
-    void* userdata;
-
 } global_State;
 // clang-format on