From 8f25d08637749316fd30d96ad874f1400088abee Mon Sep 17 00:00:00 2001 From: Roberto Ierusalimschy Date: Mon, 3 Aug 2015 17:40:26 -0300 Subject: [PATCH] 'invalidateTMcache' not needed in all 'settable' uses --- lapi.c | 3 ++- lvm.c | 3 ++- lvm.h | 7 +++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lapi.c b/lapi.c index f3c2b2f3..80e89f12 100644 --- a/lapi.c +++ b/lapi.c @@ -1,5 +1,5 @@ /* -** $Id: lapi.c,v 2.251 2015/07/20 18:24:50 roberto Exp roberto $ +** $Id: lapi.c,v 2.252 2015/08/03 19:50:49 roberto Exp roberto $ ** Lua API ** See Copyright Notice in lua.h */ @@ -736,6 +736,7 @@ static void auxsetstr (lua_State *L, const TValue *t, const char *k) { TString *str = luaS_new(L, k); api_checknelems(L, 1); if (luaV_fastset(L, t, str, aux, luaH_getstr, L->top)) { + invalidateTMcache(hvalue(t)); setobj2t(L, cast(TValue *, aux), L->top - 1); L->top--; /* pop value */ } diff --git a/lvm.c b/lvm.c index 706acc43..6a6710b3 100644 --- a/lvm.c +++ b/lvm.c @@ -1,5 +1,5 @@ /* -** $Id: lvm.c,v 2.248 2015/07/20 18:24:50 roberto Exp roberto $ +** $Id: lvm.c,v 2.249 2015/08/03 19:50:49 roberto Exp roberto $ ** Lua virtual machine ** See Copyright Notice in lua.h */ @@ -217,6 +217,7 @@ void luaV_finishset (lua_State *L, const TValue *t, TValue *key, } t = tm; /* else repeat assignment over 'tm' */ if (luaV_fastset(L, t, key, oldval, luaH_get, val)) { + invalidateTMcache(hvalue(t)); setobj2t(L, cast(TValue *, oldval), val); return; } diff --git a/lvm.h b/lvm.h index 50927c70..ccdacd4a 100644 --- a/lvm.h +++ b/lvm.h @@ -1,5 +1,5 @@ /* -** $Id: lvm.h,v 2.36 2015/07/20 18:24:50 roberto Exp roberto $ +** $Id: lvm.h,v 2.37 2015/08/03 19:50:49 roberto Exp roberto $ ** Lua virtual machine ** See Copyright Notice in lua.h */ @@ -75,12 +75,11 @@ ? (aux = NULL, 0) \ : (aux = f(hvalue(t), k), \ ttisnil(aux) ? 0 \ - : (invalidateTMcache(hvalue(t)), \ - luaC_barrierback(L, hvalue(t), v), 1))) + : (luaC_barrierback(L, hvalue(t), v), 1))) #define luaV_settable(L,t,k,v) { const TValue *aux; \ if (luaV_fastset(L,t,k,aux,luaH_get,v)) \ - { setobj2t(L, cast(TValue *,aux), v); } \ + { invalidateTMcache(hvalue(t)); setobj2t(L, cast(TValue *,aux), v); } \ else luaV_finishset(L,t,k,v,aux); }