Merge branch 'master' into nextversion

1 files changed, 6 insertions, 2 deletions

diff --git a/lgc.c b/lgc.c
index c93b5994..c2b0535d 100644
--- a/lgc.c
+++ b/lgc.c
@@ -1614,12 +1614,16 @@ static void incstep (lua_State *L, global_State *g) {
 }
 
 /*
-** performs a basic GC step if collector is running
+** Performs a basic GC step if collector is running. (If collector is
+** not running, set a reasonable debt to avoid it being called at
+** every single check.)
 */
 void luaC_step (lua_State *L) {
   global_State *g = G(L);
   lua_assert(!g->gcemergency);
-  if (gcrunning(g)) {  /* running? */
+  if (!gcrunning(g))  /* not running? */
+    luaE_setdebt(g, -2000);
+  else {
     switch (g->gckind) {
       case KGC_INC:
         incstep(L, g);