Revamp a_map_update_flags_topdown()

Make it take a mask so that it seems less magical.  Also get rid of
a_map_cancel().

diff --git a/autovivification.xs b/autovivification.xs
index a744b79be8a735ef0c47af4c153597cb92a4a7e9..554056c1c53a024050d703df2f08cb0346b2093f 100644 (file)
--- a/autovivification.xs
+++ b/autovivification.xs
@@ -238,17 +238,18 @@ static void a_map_store_root(pTHX_ const OP *root, OP *(*old_pp)(pTHX), UV flags
  return;
 }
 
  return;
 }
 

-static void a_map_update_flags_topdown(const OP *root, UV flags) {
+static void a_map_update_flags_topdown(const OP *root, UV mask, UV flags) {

  a_op_info *oi;
  const OP *o = root;
 
  XSH_LOCK(&a_op_map_mutex);
 
  a_op_info *oi;
  const OP *o = root;
 
  XSH_LOCK(&a_op_map_mutex);
 

- flags &= ~A_HINT_ROOT;
+ mask  |= A_HINT_ROOT;
+ flags &= ~mask;

 
  do {
   if ((oi = ptable_fetch(a_op_map, o)))
 
  do {
   if ((oi = ptable_fetch(a_op_map, o)))

-   oi->flags = (oi->flags & (A_HINT_ROOT|A_HINT_SECOND)) | flags;
+   oi->flags = (oi->flags & mask) | flags;

   if (!(o->op_flags & OPf_KIDS))
    break;
   o = a_map_descend(o);
   if (!(o->op_flags & OPf_KIDS))
    break;
   o = a_map_descend(o);


@@ -259,8 +260,6 @@ static void a_map_update_flags_topdown(const OP *root, UV flags) {
  return;
 }
 
  return;
 }
 

-#define a_map_cancel(R) a_map_update_flags_topdown((R), 0)
-

 static void a_map_update_flags_bottomup(const OP *o, UV flags, UV rflags) {
  a_op_info *oi;
 
 static void a_map_update_flags_bottomup(const OP *o, UV flags, UV rflags) {
  a_op_info *oi;
 


@@ -1058,11 +1057,11 @@ static OP *a_ck_root(pTHX_ OP *o) {
     }
    }
 #endif
     }
    }
 #endif

-   a_map_update_flags_topdown(o, hint | A_HINT_DEREF);
+   a_map_update_flags_topdown(o, A_HINT_SECOND, hint | A_HINT_DEREF);

    a_map_store_root(o, o->op_ppaddr, hint);
    o->op_ppaddr = new_pp;
   } else {
    a_map_store_root(o, o->op_ppaddr, hint);
    o->op_ppaddr = new_pp;
   } else {

-   a_map_cancel(o);
+   a_map_update_flags_topdown(o, 0, 0);

   }
  } else
   a_map_delete(o);
   }
  } else
   a_map_delete(o);