handle the multideref op, and to a limited extent UNOP_AUX in general.

[CPAN #102911]

diff --git a/CHANGES b/CHANGES
index 66a0932..de2fc00 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,10 @@
 Revision history for Perl extension Devel::Size.
 
-0.79_52 2015-02-28 nicholas
-    patches from Zefram:
+0.79_52 2015-03-20 nicholas
+    two patches from Zefram:
   * handle the new METHOP. [CPAN #101071]
+  * handle the multideref op, and to a limited extent the UNOP_AUX op class in
+    general. [CPAN #102911]
 
 0.79_51 2015-02-28 nicholas
   * as of 5.20.0, s/// is no longer a reliable test for OOK [CPAN #95493]

diff --git a/Size.xs b/Size.xs
index c66f1c6..840a49d 100644 (file)
--- a/Size.xs
+++ b/Size.xs
@@ -218,6 +218,9 @@ typedef enum {
 #ifdef OA_METHOP
     , OPc_METHOP
 #endif
+#ifdef OA_UNOP_AUX
+    , OPc_UNAUXOP
+#endif
 
 } opclass;
 
@@ -345,6 +348,10 @@ cc_opclass(const OP * const o)
        case OA_METHOP: TAG;
            return OPc_METHOP;
 #endif
+#ifdef OA_UNOP_AUX
+       case OA_UNOP_AUX: TAG;
+           return OPc_UNAUXOP;
+#endif
         }
         warn("Devel::Size: Can't determine class of operator %s, assuming BASEOP\n",
          PL_op_name[o->op_type]);
@@ -555,6 +562,69 @@ op_size(pTHX_ const OP * const baseop, struct state *st)
 #endif
            TAG;break;
 #endif
+#ifdef OA_UNOP_AUX
+       case OPc_UNAUXOP: TAG;
+           st->total_size += sizeof(struct unop_aux) + sizeof(UNOP_AUX_item) * (cUNOP_AUXx(baseop)->op_aux[-1].uv+1);
+           if (baseop->op_type == OP_MULTIDEREF) {
+               UNOP_AUX_item *items = cUNOP_AUXx(baseop)->op_aux;
+               UV actions = items->uv;
+               bool last = 0;
+               bool is_hash = 0;
+               while (!last) {
+                   switch (actions & MDEREF_ACTION_MASK) {
+                       case MDEREF_reload:
+                           actions = (++items)->uv;
+                           continue;
+                       case MDEREF_HV_padhv_helem:
+                       case MDEREF_HV_gvhv_helem:
+                       case MDEREF_HV_gvsv_vivify_rv2hv_helem:
+                       case MDEREF_HV_padsv_vivify_rv2hv_helem:
+                           is_hash = 1;
+                       case MDEREF_AV_padav_aelem:
+                       case MDEREF_AV_gvav_aelem:
+                       case MDEREF_AV_gvsv_vivify_rv2av_aelem:
+                       case MDEREF_AV_padsv_vivify_rv2av_aelem:
+                           ++items;
+                           goto do_elem;
+                       case MDEREF_HV_pop_rv2hv_helem:
+                       case MDEREF_HV_vivify_rv2hv_helem:
+                           is_hash = 1;
+                       case MDEREF_AV_pop_rv2av_aelem:
+                       case MDEREF_AV_vivify_rv2av_aelem:
+                       do_elem:
+                           switch (actions & MDEREF_INDEX_MASK) {
+                               case MDEREF_INDEX_none:
+                                   last = 1;
+                                   break;
+                               case MDEREF_INDEX_const:
+                                   ++items;
+                                   if (is_hash) {
+#ifdef USE_ITHREADS
+                                       SV *key = PAD_SVl(items->pad_offset);
+#else
+                                       SV *key = items->sv;
+#endif
+                                       sv_size(aTHX_ st, key, SOME_RECURSION);
+                                   }
+                                   break;
+                               case MDEREF_INDEX_padsv:
+                               case MDEREF_INDEX_gvsv:
+                                   ++items;
+                                   break;
+                           }
+                           if (actions & MDEREF_FLAG_last)
+                               last = 1;
+                           is_hash = 0;
+                           break;
+                       default:
+                           last = 1;
+                           break;
+                   }
+                   actions >>= MDEREF_SHIFT;
+               }
+           }
+           TAG;break;
+#endif
       default:
         TAG;break;
       }