rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid taking the address of a 'TValue' field 

That structure can be packed in the future.
This commit is contained in:
Roberto Ierusalimschy 2021-10-11 13:52:26 -03:00
parent 87a9573b2e
commit 0e5071b5fb
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lobject.h
View File

@ -68,7 +68,7 @@ typedef struct TValue {
#define val_(o) ((o)->value_) #define val_(o) ((o)->value_)
#define valraw(o) (&val_(o)) #define valraw(o) (val_(o))
/* raw type tag of a TValue */ /* raw type tag of a TValue */

18
ltable.c
View File

@ -150,22 +150,22 @@ static int l_hashfloat (lua_Number n) {
** and value in 'vkl') so that we can call it on keys inserted into ** and value in 'vkl') so that we can call it on keys inserted into
** nodes. ** nodes.
*/ */
static Node *mainposition (const Table *t, int ktt, const Value *kvl) { static Node *mainposition (const Table *t, int ktt, const Value kvl) {
switch (withvariant(ktt)) { switch (withvariant(ktt)) {
case LUA_VNUMINT: { case LUA_VNUMINT: {
lua_Integer key = ivalueraw(*kvl); lua_Integer key = ivalueraw(kvl);
return hashint(t, key); return hashint(t, key);
} }
case LUA_VNUMFLT: { case LUA_VNUMFLT: {
lua_Number n = fltvalueraw(*kvl); lua_Number n = fltvalueraw(kvl);
return hashmod(t, l_hashfloat(n)); return hashmod(t, l_hashfloat(n));
} }
case LUA_VSHRSTR: { case LUA_VSHRSTR: {
TString *ts = tsvalueraw(*kvl); TString *ts = tsvalueraw(kvl);
return hashstr(t, ts); return hashstr(t, ts);
} }
case LUA_VLNGSTR: { case LUA_VLNGSTR: {
TString *ts = tsvalueraw(*kvl); TString *ts = tsvalueraw(kvl);
return hashpow2(t, luaS_hashlongstr(ts)); return hashpow2(t, luaS_hashlongstr(ts));
} }
case LUA_VFALSE: case LUA_VFALSE:
@ -173,15 +173,15 @@ static Node *mainposition (const Table *t, int ktt, const Value *kvl) {
case LUA_VTRUE: case LUA_VTRUE:
return hashboolean(t, 1); return hashboolean(t, 1);
case LUA_VLIGHTUSERDATA: { case LUA_VLIGHTUSERDATA: {
void *p = pvalueraw(*kvl); void *p = pvalueraw(kvl);
return hashpointer(t, p); return hashpointer(t, p);
} }
case LUA_VLCF: { case LUA_VLCF: {
lua_CFunction f = fvalueraw(*kvl); lua_CFunction f = fvalueraw(kvl);
return hashpointer(t, f); return hashpointer(t, f);
} }
default: { default: {
GCObject *o = gcvalueraw(*kvl); GCObject *o = gcvalueraw(kvl);
return hashpointer(t, o); return hashpointer(t, o);
} }
} }
@ -691,7 +691,7 @@ void luaH_newkey (lua_State *L, Table *t, const TValue *key, TValue *value) {
return; return;
} }
lua_assert(!isdummy(t)); lua_assert(!isdummy(t));
othern = mainposition(t, keytt(mp), &keyval(mp)); othern = mainposition(t, keytt(mp), keyval(mp));
if (othern != mp) { /* is colliding node out of its main position? */ if (othern != mp) { /* is colliding node out of its main position? */
/* yes; move colliding node into free position */ /* yes; move colliding node into free position */
while (othern + gnext(othern) != mp) /* find previous */ while (othern + gnext(othern) != mp) /* find previous */