kernel: make SET_PTR_BAG internal for GASMAN and Julia GC

For Boehm / HPC-GAP, it is still needed in a few places
gap-system · Jul 4, 2022 · 680ef33 · 680ef33
1 parent 968c0a4
commit 680ef33
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/gasman.c b/src/gasman.c
@@ -243,6 +243,11 @@ static inline Bag *DATA(BagHeader *bag)
     return (Bag *)(bag + 1);
 }
 
+static inline void SET_PTR_BAG(Bag bag, Bag *val)
+{
+    GAP_ASSERT(bag != 0);
+    *(Bag**)bag = val;
+}
 
 /****************************************************************************
 **

diff --git a/src/gasman.h b/src/gasman.h
@@ -317,11 +317,13 @@ EXPORT_INLINE const Bag *CONST_PTR_BAG(Bag bag)
     return *(const Bag * const *)bag;
 }
 
+#if defined(USE_BOEHM_GC)
 EXPORT_INLINE void SET_PTR_BAG(Bag bag, Bag *val)
 {
     GAP_ASSERT(bag != 0);
     *(Bag**)bag = val;
 }
+#endif
 
 
 /****************************************************************************

diff --git a/src/julia_gc.c b/src/julia_gc.c
@@ -159,6 +159,11 @@ static inline Bag * DATA(BagHeader * bag)
     return (Bag *)(((char *)bag) + sizeof(BagHeader));
 }
 
+static inline void SET_PTR_BAG(Bag bag, Bag *val)
+{
+    GAP_ASSERT(bag != 0);
+    *(Bag**)bag = val;
+}
 
 static TNumExtraMarkFuncBags ExtraMarkFuncBags;
 

diff --git a/src/weakptr.c b/src/weakptr.c
@@ -194,16 +194,14 @@ static inline void GROW_WPOBJ(Obj wp, UInt need)
     if (plen > INT_INTOBJ_MAX)
         plen = INT_INTOBJ_MAX;
 
-#ifdef USE_BOEHM_GC
+#if defined(USE_BOEHM_GC) && defined(HPCGAP)
     Obj copy = NewBag(T_WPOBJ, (plen+1) * sizeof(Obj));
     STORE_LEN_WPOBJ(copy, STORED_LEN_WPOBJ(wp));
 
     UInt i;
     for (i = 1; i <= STORED_LEN_WPOBJ(wp); i++) {
       volatile Obj tmp = ELM_WPOBJ(wp, i);
-#ifdef HPCGAP
       MEMBAR_READ();
-#endif
       if (IS_BAG_REF(tmp) && ELM_WPOBJ(wp, i)) {
         FORGET_WP(wp, i);
         REGISTER_WP(copy, i, tmp);