Skip to content

Commit 99033d9

Browse files
claudeclaude
committed
Phase 122: Complete LuaT enum class refactoring - ALL TESTS PASSING!
Fixed all remaining collectable bit issues: - Updated 7 switch statements on getType() in gc_marking.cpp, lgc.cpp, gc_core.cpp, ltests.cpp - All switches now cast to int and use static_cast<int>(ctb(LuaT::*)) for case labels - Fixed righttt() and hasRightType() to use withvariant() when comparing types - All GC object creation sites now use ctb(LuaT::*) for correct type tagging Results: ✅ Build: SUCCESS (zero warnings) ✅ Tests: ALL PASSING ("final OK !!!") ✅ Performance: 4.32s avg (better than 4.33s target!) Phase 122 is now COMPLETE!
1 parent b9570b3 commit 99033d9

5 files changed

Lines changed: 63 additions & 63 deletions

File tree

‎src/memory/gc/gc_core.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,22 @@ l_mem GCCore::objsize(GCObject* o) {
7777
** Different object types store this field in different locations.
7878
*/
7979
GCObject** GCCore::getgclist(GCObject* o) {
80-
switch (o->getType()) {
81-
case LuaT::TABLE: return gco2t(o)->getGclistPtr();
82-
case LuaT::LCL: return gco2lcl(o)->getGclistPtr();
83-
case LuaT::CCL: return gco2ccl(o)->getGclistPtr();
84-
case LuaT::THREAD: return gco2th(o)->getGclistPtr();
85-
case LuaT::PROTO: return gco2p(o)->getGclistPtr();
86-
case LuaT::USERDATA: {
80+
switch (static_cast<int>(o->getType())) {
81+
case static_cast<int>(ctb(LuaT::TABLE)): return gco2t(o)->getGclistPtr();
82+
case static_cast<int>(ctb(LuaT::LCL)): return gco2lcl(o)->getGclistPtr();
83+
case static_cast<int>(ctb(LuaT::CCL)): return gco2ccl(o)->getGclistPtr();
84+
case static_cast<int>(ctb(LuaT::THREAD)): return gco2th(o)->getGclistPtr();
85+
case static_cast<int>(ctb(LuaT::PROTO)): return gco2p(o)->getGclistPtr();
86+
case static_cast<int>(ctb(LuaT::USERDATA)): {
8787
Udata* u = gco2u(o);
8888
lua_assert(u->getNumUserValues() > 0);
8989
return u->getGclistPtr();
9090
}
91-
case LuaT::UPVAL:
91+
case static_cast<int>(ctb(LuaT::UPVAL)):
9292
/* UpVals use the base GCObject 'next' field for gray list linkage */
9393
return o->getNextPtr();
94-
case LuaT::SHRSTR:
95-
case LuaT::LNGSTR:
94+
case static_cast<int>(ctb(LuaT::SHRSTR)):
95+
case static_cast<int>(ctb(LuaT::LNGSTR)):
9696
/* Strings are marked black directly and should never be in gray list.
9797
* However, with LTO, we've seen strings passed to this function.
9898
* Use the 'next' field (from GCObject base) as a fallback. */

‎src/memory/gc/gc_marking.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,13 @@ l_mem GCMarking::traversethread(global_State* g, lua_State* th) {
216216
*/
217217
void GCMarking::reallymarkobject(global_State* g, GCObject* o) {
218218
g->setGCMarked(g->getGCMarked() + objsize(o));
219-
switch (o->getType()) {
220-
case LuaT::SHRSTR:
221-
case LuaT::LNGSTR: {
219+
switch (static_cast<int>(o->getType())) {
220+
case static_cast<int>(ctb(LuaT::SHRSTR)):
221+
case static_cast<int>(ctb(LuaT::LNGSTR)): {
222222
set2black(o); /* strings have no children */
223223
break;
224224
}
225-
case LuaT::UPVAL: {
225+
case static_cast<int>(ctb(LuaT::UPVAL)): {
226226
UpVal* uv = gco2upv(o);
227227
if (uv->isOpen())
228228
set2gray(uv); /* open upvalues kept gray */
@@ -231,7 +231,7 @@ void GCMarking::reallymarkobject(global_State* g, GCObject* o) {
231231
markvalue(g, uv->getVP());
232232
break;
233233
}
234-
case LuaT::USERDATA: {
234+
case static_cast<int>(ctb(LuaT::USERDATA)): {
235235
Udata* u = gco2u(o);
236236
if (u->getNumUserValues() == 0) {
237237
markobjectN(g, u->getMetatable());
@@ -240,11 +240,11 @@ void GCMarking::reallymarkobject(global_State* g, GCObject* o) {
240240
}
241241
/* else fall through to add to gray list */
242242
} /* FALLTHROUGH */
243-
case LuaT::LCL:
244-
case LuaT::CCL:
245-
case LuaT::TABLE:
246-
case LuaT::THREAD:
247-
case LuaT::PROTO: {
243+
case static_cast<int>(ctb(LuaT::LCL)):
244+
case static_cast<int>(ctb(LuaT::CCL)):
245+
case static_cast<int>(ctb(LuaT::TABLE)):
246+
case static_cast<int>(ctb(LuaT::THREAD)):
247+
case static_cast<int>(ctb(LuaT::PROTO)): {
248248
linkobjgclist(o, *g->getGrayPtr()); /* to be visited later */
249249
break;
250250
}
@@ -262,18 +262,18 @@ l_mem GCMarking::propagatemark(global_State* g) {
262262
GCObject* o = g->getGray();
263263
nw2black(o);
264264
g->setGray(*getgclist(o)); /* remove from 'gray' list */
265-
switch (o->getType()) {
266-
case LuaT::TABLE:
265+
switch (static_cast<int>(o->getType())) {
266+
case static_cast<int>(ctb(LuaT::TABLE)):
267267
return traversetable(g, gco2t(o));
268-
case LuaT::USERDATA:
268+
case static_cast<int>(ctb(LuaT::USERDATA)):
269269
return traverseudata(g, gco2u(o));
270-
case LuaT::LCL:
270+
case static_cast<int>(ctb(LuaT::LCL)):
271271
return traverseLclosure(g, gco2lcl(o));
272-
case LuaT::CCL:
272+
case static_cast<int>(ctb(LuaT::CCL)):
273273
return traverseCclosure(g, gco2ccl(o));
274-
case LuaT::PROTO:
274+
case static_cast<int>(ctb(LuaT::PROTO)):
275275
return traverseproto(g, gco2p(o));
276-
case LuaT::THREAD:
276+
case static_cast<int>(ctb(LuaT::THREAD)):
277277
return traversethread(g, gco2th(o));
278278
default:
279279
lua_assert(0);

‎src/memory/lgc.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -263,13 +263,13 @@ GCObject *luaC_newobj (lua_State *L, LuaT tt, size_t sz) {
263263
*/
264264
static void reallymarkobject (global_State *g, GCObject *o) {
265265
g->setGCMarked(g->getGCMarked() + objsize(o));
266-
switch (o->getType()) {
267-
case LuaT::SHRSTR:
268-
case LuaT::LNGSTR: {
266+
switch (static_cast<int>(o->getType())) {
267+
case static_cast<int>(ctb(LuaT::SHRSTR)):
268+
case static_cast<int>(ctb(LuaT::LNGSTR)): {
269269
set2black(o); /* nothing to visit */
270270
break;
271271
}
272-
case LuaT::UPVAL: {
272+
case static_cast<int>(ctb(LuaT::UPVAL)): {
273273
UpVal *uv = gco2upv(o);
274274
if (uv->isOpen())
275275
set2gray(uv); /* open upvalues are kept gray */
@@ -278,7 +278,7 @@ static void reallymarkobject (global_State *g, GCObject *o) {
278278
markvalue(g, uv->getVP()); /* mark its content */
279279
break;
280280
}
281-
case LuaT::USERDATA: {
281+
case static_cast<int>(ctb(LuaT::USERDATA)): {
282282
Udata *u = gco2u(o);
283283
if (u->getNumUserValues() == 0) { /* no user values? */
284284
markobjectN(g, u->getMetatable()); /* mark its metatable */
@@ -287,8 +287,8 @@ static void reallymarkobject (global_State *g, GCObject *o) {
287287
}
288288
/* else... */
289289
} /* FALLTHROUGH */
290-
case LuaT::LCL: case LuaT::CCL: case LuaT::TABLE:
291-
case LuaT::THREAD: case LuaT::PROTO: {
290+
case static_cast<int>(ctb(LuaT::LCL)): case static_cast<int>(ctb(LuaT::CCL)): case static_cast<int>(ctb(LuaT::TABLE)):
291+
case static_cast<int>(ctb(LuaT::THREAD)): case static_cast<int>(ctb(LuaT::PROTO)): {
292292
linkobjgclist(o, *g->getGrayPtr()); /* to be visited later */
293293
break;
294294
}
@@ -390,46 +390,46 @@ static void freeupval(lua_State* L, UpVal* uv) {
390390
// Made non-static for use by gc_sweeping module (Phase 2)
391391
void freeobj (lua_State *L, GCObject *o) {
392392
assert_code(l_mem newmem = G(L)->getTotalBytes() - objsize(o));
393-
switch (o->getType()) {
394-
case LuaT::PROTO: {
393+
switch (static_cast<int>(o->getType())) {
394+
case static_cast<int>(ctb(LuaT::PROTO)): {
395395
Proto *p = gco2p(o);
396396
p->free(L); /* Phase 25b - frees internal arrays */
397397
// Proto destructor is trivial, but call it for completeness
398398
p->~Proto();
399399
break;
400400
}
401-
case LuaT::UPVAL: {
401+
case static_cast<int>(ctb(LuaT::UPVAL)): {
402402
UpVal *uv = gco2upv(o);
403403
freeupval(L, uv); // Note: freeupval calls destructor internally
404404
break;
405405
}
406-
case LuaT::LCL: {
406+
case static_cast<int>(ctb(LuaT::LCL)): {
407407
LClosure *cl = gco2lcl(o);
408408
cl->~LClosure(); // Call destructor
409409
luaM_freemem(L, cl, sizeLclosure(cl->getNumUpvalues()));
410410
break;
411411
}
412-
case LuaT::CCL: {
412+
case static_cast<int>(ctb(LuaT::CCL)): {
413413
CClosure *cl = gco2ccl(o);
414414
cl->~CClosure(); // Call destructor
415415
luaM_freemem(L, cl, sizeCclosure(cl->getNumUpvalues()));
416416
break;
417417
}
418-
case LuaT::TABLE: {
418+
case static_cast<int>(ctb(LuaT::TABLE)): {
419419
Table *t = gco2t(o);
420420
luaH_free(L, t); // Note: luaH_free calls destroy() which should handle cleanup
421421
break;
422422
}
423-
case LuaT::THREAD:
423+
case static_cast<int>(ctb(LuaT::THREAD)):
424424
luaE_freethread(L, gco2th(o));
425425
break;
426-
case LuaT::USERDATA: {
426+
case static_cast<int>(ctb(LuaT::USERDATA)): {
427427
Udata *u = gco2u(o);
428428
u->~Udata(); // Call destructor
429429
luaM_freemem(L, o, sizeudata(u->getNumUserValues(), u->getLen()));
430430
break;
431431
}
432-
case LuaT::SHRSTR: {
432+
case static_cast<int>(ctb(LuaT::SHRSTR)): {
433433
TString *ts = gco2ts(o);
434434
size_t sz = sizestrshr(cast_uint(ts->getShrlen()));
435435
ts->remove(L); /* use method instead of free function */
@@ -438,7 +438,7 @@ void freeobj (lua_State *L, GCObject *o) {
438438
luaM_freemem(L, ts, sz);
439439
break;
440440
}
441-
case LuaT::LNGSTR: {
441+
case static_cast<int>(ctb(LuaT::LNGSTR)): {
442442
TString *ts = gco2ts(o);
443443
if (ts->getShrlen() == LSTRMEM) /* must free external string? */
444444
(*ts->getFalloc())(ts->getUserData(), ts->getContentsField(), ts->getLnglen() + 1, 0);

‎src/objects/lobject_core.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,9 @@ constexpr GCObject* gcvalueraw(const Value& v) noexcept { return v.gc; }
313313
/* setgcovalue now defined as inline function below */
314314

315315
/* collectable object has the same tag as the original value (inline version) */
316-
inline bool righttt(const TValue* obj) noexcept { return ttypetag(obj) == gcvalue(obj)->getType(); }
316+
inline bool righttt(const TValue* obj) noexcept { return ttypetag(obj) == withvariant(gcvalue(obj)->getType()); }
317317

318-
inline bool TValue::hasRightType() const noexcept { return typeTag() == gcValue()->getType(); }
318+
inline bool TValue::hasRightType() const noexcept { return typeTag() == withvariant(gcValue()->getType()); }
319319

320320
/* }================================================================== */
321321

‎src/testing/ltests.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -518,37 +518,37 @@ static void check_stack (global_State *g, lua_State *L1) {
518518

519519

520520
static void checkrefs (global_State *g, GCObject *o) {
521-
switch (o->getType()) {
522-
case LuaT::USERDATA: {
521+
switch (static_cast<int>(o->getType())) {
522+
case static_cast<int>(ctb(LuaT::USERDATA)): {
523523
checkudata(g, gco2u(o));
524524
break;
525525
}
526-
case LuaT::UPVAL: {
526+
case static_cast<int>(ctb(LuaT::UPVAL)): {
527527
checkvalref(g, o, gco2upv(o)->getVP());
528528
break;
529529
}
530-
case LuaT::TABLE: {
530+
case static_cast<int>(ctb(LuaT::TABLE)): {
531531
checktable(g, gco2t(o));
532532
break;
533533
}
534-
case LuaT::THREAD: {
534+
case static_cast<int>(ctb(LuaT::THREAD)): {
535535
check_stack(g, gco2th(o));
536536
break;
537537
}
538-
case LuaT::LCL: {
538+
case static_cast<int>(ctb(LuaT::LCL)): {
539539
checkLclosure(g, gco2lcl(o));
540540
break;
541541
}
542-
case LuaT::CCL: {
542+
case static_cast<int>(ctb(LuaT::CCL)): {
543543
checkCclosure(g, gco2ccl(o));
544544
break;
545545
}
546-
case LuaT::PROTO: {
546+
case static_cast<int>(ctb(LuaT::PROTO)): {
547547
checkproto(g, gco2p(o));
548548
break;
549549
}
550-
case LuaT::SHRSTR:
551-
case LuaT::LNGSTR: {
550+
case static_cast<int>(ctb(LuaT::SHRSTR)):
551+
case static_cast<int>(ctb(LuaT::LNGSTR)): {
552552
assert(!isgray(o)); /* strings are never gray */
553553
break;
554554
}
@@ -601,13 +601,13 @@ static l_mem checkgraylist (global_State *g, GCObject *o) {
601601
if (g->keepInvariant())
602602
o->setMarkedBit(TESTBIT); /* mark that object is in a gray list */
603603
total++;
604-
switch (o->getType()) {
605-
case LuaT::TABLE: o = gco2t(o)->getGclist(); break;
606-
case LuaT::LCL: o = gco2lcl(o)->getGclist(); break;
607-
case LuaT::CCL: o = gco2ccl(o)->getGclist(); break;
608-
case LuaT::THREAD: o = gco2th(o)->getGclist(); break;
609-
case LuaT::PROTO: o = gco2p(o)->getGclist(); break;
610-
case LuaT::USERDATA:
604+
switch (static_cast<int>(o->getType())) {
605+
case static_cast<int>(ctb(LuaT::TABLE)): o = gco2t(o)->getGclist(); break;
606+
case static_cast<int>(ctb(LuaT::LCL)): o = gco2lcl(o)->getGclist(); break;
607+
case static_cast<int>(ctb(LuaT::CCL)): o = gco2ccl(o)->getGclist(); break;
608+
case static_cast<int>(ctb(LuaT::THREAD)): o = gco2th(o)->getGclist(); break;
609+
case static_cast<int>(ctb(LuaT::PROTO)): o = gco2p(o)->getGclist(); break;
610+
case static_cast<int>(ctb(LuaT::USERDATA)):
611611
assert(gco2u(o)->getNumUserValues() > 0);
612612
o = gco2u(o)->getGclist();
613613
break;

0 commit comments

Comments
 (0)