diff options
Diffstat (limited to 'upb')
-rw-r--r-- | upb/bindings/lua/upb.c | 12 | ||||
-rw-r--r-- | upb/table.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/upb/bindings/lua/upb.c b/upb/bindings/lua/upb.c index b35af24..02057d4 100644 --- a/upb/bindings/lua/upb.c +++ b/upb/bindings/lua/upb.c @@ -1358,6 +1358,18 @@ static size_t align_up(size_t val, size_t align) { // If we always read/write as a consistent type to each value, this shouldn't // violate aliasing. +// +// Note that the slightly prettier option of: +// +// *(type*)(&msg->data[ofs]) +// +// ...is potentially more questionable wrt the C standard and aliasing. +// Does the expression &msg->data[ofs] "access the stored value"? If so, +// this would violate aliasing. So instead we use the expression: +// +// (char*)msg + sizeof(lupb_msg) + ofs +// +// ...which unambigiously is doing nothing but calculating a pointer address. #define DEREF(msg, ofs, type) *(type*)((char*)msg + sizeof(lupb_msg) + ofs) lupb_msg *lupb_msg_check(lua_State *L, int narg) { diff --git a/upb/table.c b/upb/table.c index 9914a03..1bccfc7 100644 --- a/upb/table.c +++ b/upb/table.c @@ -542,7 +542,7 @@ void upb_inttable_compact(upb_inttable *t) { counts[log2ceil(key)]++; } - size_t arr_size = 1; + size_t arr_size; int arr_count = upb_inttable_count(t); if (upb_inttable_count(t) >= max_key * MIN_DENSITY) { |