@@ -46,33 +46,33 @@ void GCCollector::atomic(lua_State* L) {
4646 lua_assert (g->getEphemeron () == nullptr && g->getWeak () == nullptr );
4747 lua_assert (!iswhite (mainthread (g)));
4848 g->setGCState (GCState::Atomic);
49- markobject (g, L); /* mark running thread */
49+ markobject (* g, L); /* mark running thread */
5050 /* registry and global metatables may be changed by API */
51- markvalue (g, g->getRegistry ());
52- GCMarking::markmt (g); /* mark global metatables */
51+ markvalue (* g, g->getRegistry ());
52+ GCMarking::markmt (* g); /* mark global metatables */
5353 propagateall (*g); /* empties 'gray' list */
5454 /* remark occasional upvalues of (maybe) dead threads */
55- GCMarking::remarkupvals (g);
55+ GCMarking::remarkupvals (* g);
5656 propagateall (*g); /* propagate changes */
5757 g->setGray (grayagain);
5858 propagateall (*g); /* traverse 'grayagain' list */
59- GCWeak::convergeephemerons (g);
59+ GCWeak::convergeephemerons (* g);
6060 /* at this point, all strongly accessible objects are marked. */
6161 /* Clear values from weak tables, before checking finalizers */
62- GCWeak::clearbyvalues (g, g->getWeak (), nullptr );
63- GCWeak::clearbyvalues (g, g->getAllWeak (), nullptr );
62+ GCWeak::clearbyvalues (* g, g->getWeak (), nullptr );
63+ GCWeak::clearbyvalues (* g, g->getAllWeak (), nullptr );
6464 origweak = g->getWeak (); origall = g->getAllWeak ();
65- GCFinalizer::separatetobefnz (g, 0 ); /* separate objects to be finalized */
66- GCMarking::markbeingfnz (g); /* mark objects that will be finalized */
65+ GCFinalizer::separatetobefnz (* g, 0 ); /* separate objects to be finalized */
66+ GCMarking::markbeingfnz (* g); /* mark objects that will be finalized */
6767 propagateall (*g); /* remark, to propagate 'resurrection' */
68- GCWeak::convergeephemerons (g);
68+ GCWeak::convergeephemerons (* g);
6969 /* at this point, all resurrected objects are marked. */
7070 /* remove dead objects from weak tables */
71- GCWeak::clearbykeys (g, g->getEphemeron ()); /* clear keys from all ephemeron */
72- GCWeak::clearbykeys (g, g->getAllWeak ()); /* clear keys from all 'allweak' */
71+ GCWeak::clearbykeys (* g, g->getEphemeron ()); /* clear keys from all ephemeron */
72+ GCWeak::clearbykeys (* g, g->getAllWeak ()); /* clear keys from all 'allweak' */
7373 /* clear values from resurrected weak tables */
74- GCWeak::clearbyvalues (g, g->getWeak (), origweak);
75- GCWeak::clearbyvalues (g, g->getAllWeak (), origall);
74+ GCWeak::clearbyvalues (* g, g->getWeak (), origweak);
75+ GCWeak::clearbyvalues (* g, g->getAllWeak (), origall);
7676 TString::clearCache (g);
7777 g->setCurrentWhite (cast_byte (otherwhite (g))); /* flip current white */
7878 lua_assert (g->getGray () == nullptr );
@@ -85,7 +85,7 @@ void GCCollector::atomic(lua_State* L) {
8585*/
8686void GCCollector::finishgencycle (lua_State* L, global_State* g) {
8787 g->correctGrayLists ();
88- GCFinalizer::checkSizes (L, g);
88+ GCFinalizer::checkSizes (L, * g);
8989 g->setGCState (GCState::Propagate); /* skip restart */
9090 if (!g->getGCEmergency ())
9191 GCFinalizer::callallpendingfinalizers (L);
@@ -140,33 +140,33 @@ void GCCollector::youngcollection(lua_State* L, global_State* g) {
140140 GCObject *dummy; /* dummy out parameter to 'sweepgen' */
141141 lua_assert (g->getGCState () == GCState::Propagate);
142142 if (g->getFirstOld1 ()) { /* are there regular OLD1 objects? */
143- GCMarking::markold (g, g->getFirstOld1 (), g->getReallyOld ()); /* mark them */
143+ GCMarking::markold (* g, g->getFirstOld1 (), g->getReallyOld ()); /* mark them */
144144 g->setFirstOld1 (nullptr ); /* no more OLD1 objects (for now) */
145145 }
146- GCMarking::markold (g, g->getFinObj (), g->getFinObjROld ());
147- GCMarking::markold (g, g->getToBeFnz (), nullptr );
146+ GCMarking::markold (* g, g->getFinObj (), g->getFinObjROld ());
147+ GCMarking::markold (* g, g->getToBeFnz (), nullptr );
148148
149149 atomic (L); /* will lose 'g->marked' */
150150
151151 /* sweep nursery and get a pointer to its last live element */
152152 g->setGCState (GCState::SweepAllGC);
153- psurvival = GCSweeping::sweepgen (L, g, g->getAllGCPtr (), g->getSurvival (), g->getFirstOld1Ptr (), &addedold1);
153+ psurvival = GCSweeping::sweepgen (L, * g, g->getAllGCPtr (), g->getSurvival (), g->getFirstOld1Ptr (), &addedold1);
154154 /* sweep 'survival' */
155- GCSweeping::sweepgen (L, g, psurvival, g->getOld1 (), g->getFirstOld1Ptr (), &addedold1);
155+ GCSweeping::sweepgen (L, * g, psurvival, g->getOld1 (), g->getFirstOld1Ptr (), &addedold1);
156156 g->setReallyOld (g->getOld1 ());
157157 g->setOld1 (*psurvival); /* 'survival' survivals are old now */
158158 g->setSurvival (g->getAllGC ()); /* all news are survivals */
159159
160160 /* repeat for 'finobj' lists */
161161 dummy = nullptr ; /* no 'firstold1' optimization for 'finobj' lists */
162- psurvival = GCSweeping::sweepgen (L, g, g->getFinObjPtr (), g->getFinObjSur (), &dummy, &addedold1);
162+ psurvival = GCSweeping::sweepgen (L, * g, g->getFinObjPtr (), g->getFinObjSur (), &dummy, &addedold1);
163163 /* sweep 'survival' */
164- GCSweeping::sweepgen (L, g, psurvival, g->getFinObjOld1 (), &dummy, &addedold1);
164+ GCSweeping::sweepgen (L, * g, psurvival, g->getFinObjOld1 (), &dummy, &addedold1);
165165 g->setFinObjROld (g->getFinObjOld1 ());
166166 g->setFinObjOld1 (*psurvival); /* 'survival' survivals are old now */
167167 g->setFinObjSur (g->getFinObj ()); /* all news are survivals */
168168
169- GCSweeping::sweepgen (L, g, g->getToBeFnzPtr (), nullptr , &dummy, &addedold1);
169+ GCSweeping::sweepgen (L, * g, g->getToBeFnzPtr (), nullptr , &dummy, &addedold1);
170170
171171 /* keep total number of added old1 bytes */
172172 g->setGCMarked (marked + addedold1);
@@ -259,7 +259,7 @@ l_mem GCCollector::singlestep(lua_State* L, int fast) {
259259 g->setGCStopEm (1 ); /* no emergency collections while collecting */
260260 switch (g->getGCState ()) {
261261 case GCState::Pause: {
262- GCMarking::restartcollection (g);
262+ GCMarking::restartcollection (* g);
263263 g->setGCState (GCState::Propagate);
264264 stepresult = 1 ;
265265 break ;
@@ -270,7 +270,7 @@ l_mem GCCollector::singlestep(lua_State* L, int fast) {
270270 stepresult = 1 ;
271271 }
272272 else
273- stepresult = GCMarking::propagatemark (g); /* traverse one gray object */
273+ stepresult = GCMarking::propagatemark (* g); /* traverse one gray object */
274274 break ;
275275 }
276276 case GCState::EnterAtomic: {
@@ -284,22 +284,22 @@ l_mem GCCollector::singlestep(lua_State* L, int fast) {
284284 break ;
285285 }
286286 case GCState::SweepAllGC: { /* sweep "regular" objects */
287- GCSweeping::sweepstep (L, g, GCState::SweepFinObj, g->getFinObjPtr (), fast);
287+ GCSweeping::sweepstep (L, * g, GCState::SweepFinObj, g->getFinObjPtr (), fast);
288288 stepresult = GCSWEEPMAX;
289289 break ;
290290 }
291291 case GCState::SweepFinObj: { /* sweep objects with finalizers */
292- GCSweeping::sweepstep (L, g, GCState::SweepToBeFnz, g->getToBeFnzPtr (), fast);
292+ GCSweeping::sweepstep (L, * g, GCState::SweepToBeFnz, g->getToBeFnzPtr (), fast);
293293 stepresult = GCSWEEPMAX;
294294 break ;
295295 }
296296 case GCState::SweepToBeFnz: { /* sweep objects to be finalized */
297- GCSweeping::sweepstep (L, g, GCState::SweepEnd, nullptr , fast);
297+ GCSweeping::sweepstep (L, * g, GCState::SweepEnd, nullptr , fast);
298298 stepresult = GCSWEEPMAX;
299299 break ;
300300 }
301301 case GCState::SweepEnd: { /* finish sweeps */
302- GCFinalizer::checkSizes (L, g);
302+ GCFinalizer::checkSizes (L, * g);
303303 g->setGCState (GCState::CallFin);
304304 stepresult = GCSWEEPMAX;
305305 break ;
0 commit comments