diff options
| author | Mike Pall <mike> | 2016-10-13 18:38:22 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-10-13 18:38:22 +0200 |
| commit | 3f43f09413c49a1f4cffc0e060d755e84c5df85e (patch) | |
| tree | 211f67458aa2197ff6daf12a4cd313acdac01be0 /src | |
| parent | 54b78e7c66bff326a0223aac1fd5373515ca3014 (diff) | |
| parent | a68c4118572529e0223cad3d4f2d214a54b1ab7a (diff) | |
| download | luajit-3f43f09413c49a1f4cffc0e060d755e84c5df85e.tar.gz luajit-3f43f09413c49a1f4cffc0e060d755e84c5df85e.tar.bz2 luajit-3f43f09413c49a1f4cffc0e060d755e84c5df85e.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_gc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_gc.c b/src/lj_gc.c index 7c707462..2f9d5ff1 100644 --- a/src/lj_gc.c +++ b/src/lj_gc.c | |||
| @@ -310,7 +310,7 @@ static size_t propagatemark(global_State *g) | |||
| 310 | if (gc_traverse_tab(g, t) > 0) | 310 | if (gc_traverse_tab(g, t) > 0) |
| 311 | black2gray(o); /* Keep weak tables gray. */ | 311 | black2gray(o); /* Keep weak tables gray. */ |
| 312 | return sizeof(GCtab) + sizeof(TValue) * t->asize + | 312 | return sizeof(GCtab) + sizeof(TValue) * t->asize + |
| 313 | sizeof(Node) * (t->hmask + 1); | 313 | (t->hmask ? sizeof(Node) * (t->hmask + 1) : 0); |
| 314 | } else if (LJ_LIKELY(gct == ~LJ_TFUNC)) { | 314 | } else if (LJ_LIKELY(gct == ~LJ_TFUNC)) { |
| 315 | GCfunc *fn = gco2func(o); | 315 | GCfunc *fn = gco2func(o); |
| 316 | gc_traverse_func(g, fn); | 316 | gc_traverse_func(g, fn); |