Move MarkBag* funcs into GCs so they can inline MarkBag

src/bags.c

@@ -52,50 +52,3 @@ void RetypeBagSMIfWritable(Bag bag, UInt new_type)
     RetypeBagIfWritable(bag, new_type);
 }
 #endif
-
-
-inline void MarkArrayOfBags(const Bag array[], UInt count)
-{
-    for (UInt i = 0; i < count; i++) {
-        MarkBag(array[i]);
-    }
-}
-
-void MarkNoSubBags(Bag bag)
-{
-}
-
-void MarkOneSubBags(Bag bag)
-{
-    MarkArrayOfBags(CONST_PTR_BAG(bag), 1);
-}
-
-void MarkTwoSubBags(Bag bag)
-{
-    MarkArrayOfBags(CONST_PTR_BAG(bag), 2);
-}
-
-void MarkThreeSubBags(Bag bag)
-{
-    MarkArrayOfBags(CONST_PTR_BAG(bag), 3);
-}
-
-void MarkFourSubBags(Bag bag)
-{
-    MarkArrayOfBags(CONST_PTR_BAG(bag), 4);
-}
-
-void MarkAllSubBags(Bag bag)
-{
-    MarkArrayOfBags(CONST_PTR_BAG(bag), SIZE_BAG(bag) / sizeof(Bag));
-}
-
-void MarkAllButFirstSubBags(Bag bag)
-{
-    MarkArrayOfBags(CONST_PTR_BAG(bag) + 1, SIZE_BAG(bag) / sizeof(Bag) - 1);
-}
-
-void MarkAllSubBagsDefault(Bag bag)
-{
-    MarkArrayOfBags(CONST_PTR_BAG(bag), SIZE_BAG(bag) / sizeof(Bag));
-}

src/bags_funcs.inc

@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+**  This file is part of GAP, a system for computational discrete algebra.
+**
+**  Copyright of GAP belongs to its developers, whose names are too numerous
+**  to list here. Please refer to the COPYRIGHT file for details.
+**
+**  SPDX-License-Identifier: GPL-2.0-or-later
+**
+** This file includes functions which are required by all GCs. For efficiency
+** it is important these are defined in the same function as "MarkBag", so
+** this file should be included in each GC.
+*/
+
+#include "error.h"
+#include "gasman.h"
+
+void MarkArrayOfBags(const Bag array[], UInt count)
+{
+    for (UInt i = 0; i < count; i++) {
+        MarkBag(array[i]);
+    }
+}
+
+void MarkNoSubBags(Bag bag)
+{
+}
+
+void MarkOneSubBags(Bag bag)
+{
+    MarkArrayOfBags(CONST_PTR_BAG(bag), 1);
+}
+
+void MarkTwoSubBags(Bag bag)
+{
+    MarkArrayOfBags(CONST_PTR_BAG(bag), 2);
+}
+
+void MarkThreeSubBags(Bag bag)
+{
+    MarkArrayOfBags(CONST_PTR_BAG(bag), 3);
+}
+
+void MarkFourSubBags(Bag bag)
+{
+    MarkArrayOfBags(CONST_PTR_BAG(bag), 4);
+}
+
+void MarkAllSubBags(Bag bag)
+{
+    MarkArrayOfBags(CONST_PTR_BAG(bag), SIZE_BAG(bag) / sizeof(Bag));
+}
+
+void MarkAllButFirstSubBags(Bag bag)
+{
+    MarkArrayOfBags(CONST_PTR_BAG(bag) + 1, SIZE_BAG(bag) / sizeof(Bag) - 1);
+}
+
+void MarkAllSubBagsDefault(Bag bag)
+{
+    MarkArrayOfBags(CONST_PTR_BAG(bag), SIZE_BAG(bag) / sizeof(Bag));
+}

src/gasman.c

@@ -121,6 +121,8 @@
 #include "sysjmp.h"
 #include "sysmem.h"
 
+#include "bags_funcs.inc"
+
 #ifdef GAP_MEM_CHECK
 #include <sys/mman.h>
 #endif

src/julia_gc.c

@@ -27,6 +27,8 @@
 #include "sysmem.h"
 #include "vars.h"
 
+#include "bags_funcs.inc"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>