From 56137d58ff7abe8cb22ee3469366e08888c84f28 Mon Sep 17 00:00:00 2001
From: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Fri, 18 Jul 2014 09:17:54 -0300
Subject: added check for conversion 'obj2gco' (and corrections for small
 problems detected by this check)

---
 lapi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lapi.c')

diff --git a/lapi.c b/lapi.c
index be6955a1..63e0e750 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.c,v 2.225 2014/07/15 21:26:50 roberto Exp roberto $
+** $Id: lapi.c,v 2.226 2014/07/17 13:53:37 roberto Exp roberto $
 ** Lua API
 ** See Copyright Notice in lua.h
 */
@@ -820,7 +820,7 @@ LUA_API int lua_setmetatable (lua_State *L, int objindex) {
     case LUA_TUSERDATA: {
       uvalue(obj)->metatable = mt;
       if (mt) {
-        luaC_objbarrier(L, rawuvalue(obj), mt);
+        luaC_objbarrier(L, uvalue(obj), mt);
         luaC_checkfinalizer(L, gcvalue(obj), mt);
       }
       break;
@@ -958,7 +958,7 @@ LUA_API int lua_load (lua_State *L, lua_Reader reader, void *data,
       const TValue *gt = luaH_getint(reg, LUA_RIDX_GLOBALS);
       /* set global table as 1st upvalue of 'f' (may be LUA_ENV) */
       setobj(L, f->upvals[0]->v, gt);
-      luaC_barrier(L, f->upvals[0], gt);
+      luaC_upvalbarrier(L, f->upvals[0]);
     }
   }
   lua_unlock(L);
-- 
cgit v1.2.3-55-g6feb