From 3819c30e5553b98ceb7d8d2da20c9da25cbdc62a Mon Sep 17 00:00:00 2001
From: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Fri, 4 Jun 2010 10:05:29 -0300
Subject: [PATCH] better names for barrier macros

---
 lapi.c   | 8 ++++----
 ltable.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lapi.c b/lapi.c
index 95be89d5..c811be99 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.c,v 2.129 2010/05/14 13:15:26 roberto Exp roberto $
+** $Id: lapi.c,v 2.130 2010/05/31 16:08:55 roberto Exp roberto $
 ** Lua API
 ** See Copyright Notice in lua.h
 */
@@ -689,7 +689,7 @@ LUA_API void lua_rawset (lua_State *L, int idx) {
   t = index2addr(L, idx);
   api_check(L, ttistable(t), "table expected");
   setobj2t(L, luaH_set(L, hvalue(t), L->top-2), L->top-1);
-  luaC_barriert(L, hvalue(t), L->top-1);
+  luaC_barrierback(L, gcvalue(t), L->top-1);
   L->top -= 2;
   lua_unlock(L);
 }
@@ -702,7 +702,7 @@ LUA_API void lua_rawseti (lua_State *L, int idx, int n) {
   o = index2addr(L, idx);
   api_check(L, ttistable(o), "table expected");
   setobj2t(L, luaH_setint(L, hvalue(o), n), L->top-1);
-  luaC_barriert(L, hvalue(o), L->top-1);
+  luaC_barrierback(L, gcvalue(o), L->top-1);
   L->top--;
   lua_unlock(L);
 }
@@ -725,7 +725,7 @@ LUA_API int lua_setmetatable (lua_State *L, int objindex) {
     case LUA_TTABLE: {
       hvalue(obj)->metatable = mt;
       if (mt)
-        luaC_objbarriert(L, hvalue(obj), mt);
+        luaC_objbarrierback(L, gcvalue(obj), mt);
       break;
     }
     case LUA_TUSERDATA: {
diff --git a/ltable.c b/ltable.c
index 3e8b2060..7a909b27 100644
--- a/ltable.c
+++ b/ltable.c
@@ -1,5 +1,5 @@
 /*
-** $Id: ltable.c,v 2.49 2010/04/13 20:48:12 roberto Exp roberto $
+** $Id: ltable.c,v 2.50 2010/04/18 13:22:48 roberto Exp roberto $
 ** Lua tables (hash)
 ** See Copyright Notice in lua.h
 */
@@ -423,7 +423,7 @@ static TValue *newkey (lua_State *L, Table *t, const TValue *key) {
     }
   }
   setobj2t(L, gkey(mp), key);
-  luaC_barriert(L, t, key);
+  luaC_barrierback(L, obj2gco(t), key);
   lua_assert(ttisnil(gval(mp)));
   return gval(mp);
 }