From 318e038afe94f7258162822266d69add91ff050e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <krlmlr+r@mailbox.org>
Date: Sun, 2 Jul 2023 22:54:43 +0200
Subject: [PATCH] Avoid storing attributes in global preserve list

---
 src/rinterface_extra.c | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/src/rinterface_extra.c b/src/rinterface_extra.c
index b8840bb379d..1886cc0f55b 100644
--- a/src/rinterface_extra.c
+++ b/src/rinterface_extra.c
@@ -445,11 +445,6 @@ int R_igraph_attribute_init(igraph_t *graph, igraph_vector_ptr_t *attr) {
 void R_igraph_attribute_destroy(igraph_t *graph) {
   SEXP attr=graph->attr;
   REAL(VECTOR_ELT(attr, 0))[1] -= 1; /* refcount for igraph_t */
-  if (!R_igraph_attribute_protected &&
-      REAL(VECTOR_ELT(attr, 0))[1]==0 &&
-      REAL(VECTOR_ELT(attr, 0))[2]==1) {
-    R_ReleaseObject(attr);
-  }
   graph->attr=0;
 }
 
@@ -465,10 +460,6 @@ int R_igraph_attribute_copy(igraph_t *to, const igraph_t *from,
   if (ga && va && ea) {
     to->attr=from->attr;
     REAL(VECTOR_ELT(fromattr, 0))[1] += 1; /* refcount only */
-    if (!R_igraph_attribute_protected &&
-        REAL(VECTOR_ELT(fromattr, 0))[1] == 1) {
-      R_PreserveObject(to->attr);
-    }
   } else {
     R_igraph_attribute_init(to,0); /* Sets up many things */
     SEXP toattr=to->attr;
@@ -591,15 +582,9 @@ SEXP R_igraph_attribute_add_vertices_dup(SEXP attr) {
 
   if (R_igraph_attribute_protected) {
     PROTECT(newattr); px++;
-  } else {
-    R_PreserveObject(newattr);
   }
 
   REAL(VECTOR_ELT(attr, 0))[1] -= 1;
-  if (!R_igraph_attribute_protected &&
-      REAL(VECTOR_ELT(attr, 0))[1] == 0) {
-    R_ReleaseObject(attr);
-  }
   REAL(VECTOR_ELT(newattr, 0))[0] = 0;
   REAL(VECTOR_ELT(newattr, 0))[1] = 1;
   if (R_igraph_attribute_protected) {
@@ -777,14 +762,8 @@ int R_igraph_attribute_permute_vertices_same(const igraph_t *graph,
     SEXP newattr = Rf_duplicate(attr);
     if (R_igraph_attribute_protected) {
       PROTECT(newattr); px++;
-    } else {
-      R_PreserveObject(newattr);
     }
     REAL(VECTOR_ELT(attr, 0))[1] -= 1;
-    if (!R_igraph_attribute_protected &&
-        REAL(VECTOR_ELT(attr, 0))[1] == 0) {
-      R_ReleaseObject(attr);
-    }
     REAL(VECTOR_ELT(newattr, 0))[0] = 0;
     REAL(VECTOR_ELT(newattr, 0))[1] = 1;
     if (R_igraph_attribute_protected) {
@@ -894,15 +873,9 @@ SEXP R_igraph_attribute_add_edges_dup(SEXP attr) {
 
   if (R_igraph_attribute_protected) {
     PROTECT(newattr); px++;
-  } else {
-    R_PreserveObject(newattr);
   }
 
   REAL(VECTOR_ELT(attr, 0))[1] -= 1;
-  if (!R_igraph_attribute_protected &&
-      REAL(VECTOR_ELT(attr, 0))[1] == 0) {
-    R_ReleaseObject(attr);
-  }
   REAL(VECTOR_ELT(newattr, 0))[0] = 0;
   REAL(VECTOR_ELT(newattr, 0))[1] = 1;
   if (R_igraph_attribute_protected) {
@@ -1161,14 +1134,8 @@ int R_igraph_attribute_permute_edges_same(const igraph_t *graph,
     SEXP newattr=Rf_duplicate(attr);
     if (R_igraph_attribute_protected) {
       PROTECT(newattr); px++;
-    } else {
-      R_PreserveObject(newattr);
     }
     REAL(VECTOR_ELT(attr, 0))[1] -= 1;
-    if (!R_igraph_attribute_protected &&
-        REAL(VECTOR_ELT(attr, 0))[1] == 0) {
-      R_ReleaseObject(attr);
-    }
     REAL(VECTOR_ELT(newattr, 0))[0] = 0;
     REAL(VECTOR_ELT(newattr, 0))[1] = 1;
     if (R_igraph_attribute_protected) {
@@ -3095,6 +3062,9 @@ SEXP R_igraph_to_SEXP(const igraph_t *graph) {
 
   /* Attributes */
   SET_VECTOR_ELT(result, igraph_t_idx_attr, graph->attr);
+  if (!R_igraph_attribute_protected) {
+    R_ReleaseObject(graph->attr);
+  }
   REAL(VECTOR_ELT(graph->attr, 0))[0] += 1;
 
   /* Environment for vertex/edge seqs */
@@ -3752,7 +3722,7 @@ int R_SEXP_to_igraph_copy(SEXP graph, igraph_t *res) {
   /* attributes */
   REAL(VECTOR_ELT(VECTOR_ELT(graph, igraph_t_idx_attr), 0))[0] = 1; /* R objects */
   REAL(VECTOR_ELT(VECTOR_ELT(graph, igraph_t_idx_attr), 0))[1] = 1; /* igraph_t objects */
-  R_PreserveObject(res->attr=VECTOR_ELT(graph, igraph_t_idx_attr));
+  res->attr=VECTOR_ELT(graph, igraph_t_idx_attr);
 
   return 0;
 }