Steal code from maint, and use PERL_ARENA_ROOTS_SIZE to size the arena

arrays, rather than SVt_LAST, so that SVt_LAST can truthfully remain
the number of genuine SV types, unclouded by implementation details.

p4raw-id: //depot/perl@27251

diff --git a/intrpvar.h b/intrpvar.h
index 4c63b08042d57cce80bf92115eec659b1cd2797b..76be01d3124910589a11f281d15ba6df9b52f5a6 100644 (file)
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -248,7 +248,7 @@ PERLVAR(Iosname,    char *)         /* operating system */
 
 PERLVAR(Isighandlerp,  Sighandler_t)
 
-PERLVARA(Ibody_roots,  SVt_LAST, void*) /* array of body roots */
+PERLVARA(Ibody_roots,  PERL_ARENA_ROOTS_SIZE, void*) /* array of body roots */
 
 PERLVAR(Inice_chunk,   char *)         /* a nice chunk of memory to reuse */
 PERLVAR(Inice_chunk_size,      U32)    /* how nice the chunk of memory is */

diff --git a/sv.c b/sv.c
index f4e661cea989e3180fa5e2e6cf2717d764e91917..11f79dba33061f65b6d637e1883166fa317ce071 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -643,7 +643,7 @@ Perl_sv_free_arenas(pTHX)
     S_free_arena(aTHX_ (void**) PL_body_arenas);
 #endif
 
-    for (i=0; i<SVt_LAST; i++)
+    for (i=0; i<PERL_ARENA_ROOTS_SIZE; i++)
        PL_body_roots[i] = 0;
 
     Safefree(PL_nice_chunk);

diff --git a/sv.h b/sv.h
index 88d3cf89df268589cd0488e20b11593184d4374b..09a27d5bc039a27fe2cc7b0975a514ba7bb0d68e 100644 (file)
--- a/sv.h
+++ b/sv.h
@@ -75,6 +75,8 @@ typedef enum {
 #define HE_SVSLOT      SVt_NULL
 #endif
 
+#define PERL_ARENA_ROOTS_SIZE  (SVt_LAST)
+
 /* typedefs to eliminate some typing */
 typedef struct he HE;
 typedef struct hek HEK;