dVAR (-DPERL_GLOBAL_STRUCT_PRIVATE) update

Message-ID: <44510AF6.6040603@gmail.com>

p4raw-id: //depot/perl@27990

diff --git a/hv.c b/hv.c
index d7b7f40..cc2a384 100644 (file)
--- a/hv.c
+++ b/hv.c
@@ -2564,6 +2564,7 @@ in C<struct refcounted_he *>.
 HV *
 Perl_refcounted_he_chain_2hv(pTHX_ const struct refcounted_he *chain)
 {
+    dVAR;
     HV *hv = newHV();
     U32 placeholders = 0;
     /* We could chase the chain once to get an idea of the number of keys,
@@ -2685,6 +2686,7 @@ reference count of 1.
 struct refcounted_he *
 Perl_refcounted_he_new(pTHX_ struct refcounted_he *const parent,
                       SV *const key, SV *const value) {
+    dVAR;
     struct refcounted_he *he;
     STRLEN key_len;
     const char *key_p = SvPV_const(key, key_len);

diff --git a/perl.h b/perl.h
index 7c2ec66..6640cf0 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -137,7 +137,7 @@
 #  endif
 #endif
 
-#define pVAR    register struct perl_vars* const my_vars PERL_UNUSED_DECL
+#define pVAR    register struct perl_vars* my_vars PERL_UNUSED_DECL
 
 #ifdef PERL_GLOBAL_STRUCT
 #  define dVAR         pVAR    = (struct perl_vars*)PERL_GET_VARS()

diff --git a/perlio.c b/perlio.c
index 1921d0a..f65cc11 100644 (file)
--- a/perlio.c
+++ b/perlio.c
@@ -2271,6 +2271,7 @@ perl_mutex PerlIO_mutex;
 /* Must be called with PerlIO_mutex locked.  */
 static void
 S_more_refcounted_fds(pTHX_ const int new_fd) {
+    dVAR;
     const int old_max = PL_perlio_fd_refcnt_size;
     const int new_max = 16 + (new_fd & ~15);
     int *new_array;

diff --git a/sv.c b/sv.c
index 58bbad6..3189cd9 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -678,6 +678,7 @@ Perl_sv_free_arenas(pTHX)
 void*
 Perl_get_arena(pTHX_ int arena_size)
 {
+    dVAR;
     struct arena_desc* adesc;
     struct arena_set *newroot, **aroot = (struct arena_set**) &PL_body_arenas;
     int curr;