Change names with leading underscores to be legal

av.h

@@ -10,7 +10,7 @@
 
 struct xpvav {
     HV*		xmg_stash;	/* class package */
-    union _xmgu	xmg_u;
+    union xmgu_	xmg_u;
     SSize_t	xav_fill;       /* Index of last element present */
     SSize_t	xav_max;        /* max index for which array has space */
     SV**	xav_alloc;	/* pointer to beginning of C array of SVs */

class.c

@@ -345,9 +345,9 @@ PP(pp_methstart)
 }
 
 static void
-invoke_class_seal(pTHX_ void *_arg)
+invoke_class_seal(pTHX_ void *arg_)
 {
-    class_seal_stash((HV *)_arg);
+    class_seal_stash((HV *)arg_);
 }
 
 void

cop.h

@@ -1398,8 +1398,8 @@ See L<perlcall/LIGHTWEIGHT CALLBACKS>.
 #define PUSH_MULTICALL_FLAGS(the_cv, flags) \
     STMT_START {							\
         PERL_CONTEXT *cx;						\
-        CV * const _nOnclAshIngNamE_ = the_cv;				\
-        CV * const cv = _nOnclAshIngNamE_;				\
+        CV * const nOnclAshIngNamE_ = the_cv;				\
+        CV * const cv = nOnclAshIngNamE_;				\
         PADLIST * const padlist = CvPADLIST(cv);			\
         multicall_oldcatch = CATCH_GET;					\
         CATCH_SET(TRUE);						\
@@ -1442,8 +1442,8 @@ See L<perlcall/LIGHTWEIGHT CALLBACKS>.
 
 #define CHANGE_MULTICALL_FLAGS(the_cv, flags) \
     STMT_START {							\
-        CV * const _nOnclAshIngNamE_ = the_cv;				\
-        CV * const cv = _nOnclAshIngNamE_;				\
+        CV * const nOnclAshIngNamE_ = the_cv;				\
+        CV * const cv = nOnclAshIngNamE_;				\
         PADLIST * const padlist = CvPADLIST(cv);			\
         PERL_CONTEXT *cx = CX_CUR();					\
         assert(CxMULTICALL(cx));                                        \

cv.h

@@ -11,8 +11,8 @@
 /* This structure must match the beginning of XPVFM in sv.h  */
 
 struct xpvcv {
-    _XPV_HEAD;
-    _XPVCV_COMMON;
+    XPV_HEAD_;
+    XPVCV_COMMON_;
 };
 
 /*

dump.c

@@ -94,7 +94,7 @@ S_append_flags(pTHX_ SV *sv, U32 flags, const struct flag_to_name *start,
                               PERL_PV_ESCAPE_NONASCII | PERL_PV_ESCAPE_DWIM \
                               | ((utf8) ? PERL_PV_ESCAPE_UNI : 0) )
 
-#define _pv_display_for_dump(dsv, pv, cur, len, pvlim) \
+#define pv_display_for_dump(dsv, pv, cur, len, pvlim) \
     _pv_display_flags(aTHX_ dsv, pv, cur, len, pvlim, PERL_PV_ESCAPE_DWIM_ALL_HEX)
 
 /*
@@ -2406,7 +2406,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo
                                    PTR2UV(ptr));
             if (SvOOK(sv)) {
                 PerlIO_printf(file, "( %s . ) ",
-                              _pv_display_for_dump(d, ptr - delta, delta, 0,
+                              pv_display_for_dump(d, ptr - delta, delta, 0,
                                          pvlim));
             }
             if (type == SVt_INVLIST) {
@@ -2415,7 +2415,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo
                 _invlist_dump(file, level, "    ", sv);
             }
             else {
-                PerlIO_printf(file, "%s", _pv_display_for_dump(d, ptr, SvCUR(sv),
+                PerlIO_printf(file, "%s", pv_display_for_dump(d, ptr, SvCUR(sv),
                                                      re ? 0 : SvLEN(sv),
                                                      pvlim));
                 if (SvUTF8(sv)) /* the 6?  \x{....} */
@@ -2717,7 +2717,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bo
                         keypv = SvPV_const(keysv, len);
                         elt = HeVAL(he);
 
-                        Perl_dump_indent(aTHX_ level+1, file, "Elt %s ", _pv_display_for_dump(d, keypv, len, 0, pvlim));
+                        Perl_dump_indent(aTHX_ level+1, file, "Elt %s ", pv_display_for_dump(d, keypv, len, 0, pvlim));
                         if (SvUTF8(keysv))
                             PerlIO_printf(file, "[UTF8 \"%s\"] ", sv_uni_display(d, keysv, 6 * SvCUR(keysv), UNI_DISPLAY_QQ));
                         if (HvEITER_get(hv) == he)

embed.fnc

@@ -806,7 +806,7 @@ p	|OP *	|build_infix_plugin					\
 				|NN OP *lhs				\
 				|NN OP *rhs				\
 				|NN void *tokendata
-EXp	|const char *|_byte_dump_string 				\
+EXp	|const char *|byte_dump_string_ 				\
 				|NULLOK const U8 * const start		\
 				|const STRLEN len			\
 				|const bool format
@@ -1665,7 +1665,7 @@ p	|void	|init_uniprops
 APRTdmp |char * |instr		|NN const char *big			\
 				|NN const char *little
 Adp	|U32	|intro_my
-ERXp	|Size_t |_inverse_folds |const UV cp				\
+ERXp	|Size_t |inverse_folds_ |const UV cp				\
 				|NN U32 *first_folds_to 		\
 				|NN const U32 **remaining_folds_to
 : Used in perly.y
@@ -1719,11 +1719,11 @@ ATdip	|bool	|is_strict_utf8_string_loclen				\
 				|STRLEN len				\
 				|NULLOK const U8 **ep			\
 				|NULLOK STRLEN *el
-CRp	|bool	|_is_uni_FOO	|const U8 classnum			\
+CRp	|bool	|is_uni_FOO_	|const U8 classnum			\
 				|const UV c
-CRp	|bool	|_is_uni_perl_idcont					\
+CRp	|bool	|is_uni_perl_idcont_					\
 				|UV c
-CRp	|bool	|_is_uni_perl_idstart					\
+CRp	|bool	|is_uni_perl_idstart_					\
 				|UV c
 ARTdip	|Size_t |isUTF8_CHAR	|NN const U8 * const s0 		\
 				|NN const U8 * const e
@@ -1757,17 +1757,17 @@ ATdip	|bool	|is_utf8_fixed_width_buf_loclen_flags			\
 				|NULLOK const U8 **ep			\
 				|NULLOK STRLEN *el			\
 				|const U32 flags
-CRp	|bool	|_is_utf8_FOO	|const U8 classnum			\
+CRp	|bool	|is_utf8_FOO_	|const U8 classnum			\
 				|NN const U8 *p 			\
 				|NN const U8 * const e
 ARTdip	|bool	|is_utf8_invariant_string_loc				\
 				|NN const U8 * const s			\
 				|STRLEN len				\
 				|NULLOK const U8 **ep
-CRp	|bool	|_is_utf8_perl_idcont					\
+CRp	|bool	|is_utf8_perl_idcont_					\
 				|NN const U8 *p 			\
 				|NN const U8 * const e
-CRp	|bool	|_is_utf8_perl_idstart					\
+CRp	|bool	|is_utf8_perl_idstart_					\
 				|NN const U8 *p 			\
 				|NN const U8 * const e
 ARTdmp	|bool	|is_utf8_string |NN const U8 *s 			\
@@ -3654,7 +3654,7 @@ Xiop	|Stack_off_t|TOPMARK
 Cmp	|UV	|to_uni_fold	|UV c					\
 				|NN U8 *p				\
 				|NN STRLEN *lenp
-Cp	|UV	|_to_uni_fold_flags					\
+Cp	|UV	|to_uni_fold_flags_					\
 				|UV c					\
 				|NN U8 *p				\
 				|NN STRLEN *lenp			\
@@ -3668,26 +3668,26 @@ Cp	|UV	|to_uni_title	|UV c					\
 Cp	|UV	|to_uni_upper	|UV c					\
 				|NN U8 *p				\
 				|NN STRLEN *lenp
-Cp	|UV	|_to_utf8_fold_flags					\
+Cp	|UV	|to_utf8_fold_flags_					\
 				|NN const U8 *p 			\
 				|NULLOK const U8 *e			\
 				|NN U8 *ustrp				\
 				|NULLOK STRLEN *lenp			\
 				|U8 flags
 
-Cp	|UV	|_to_utf8_lower_flags					\
+Cp	|UV	|to_utf8_lower_flags_					\
 				|NN const U8 *p 			\
 				|NULLOK const U8 *e			\
 				|NN U8 *ustrp				\
 				|NULLOK STRLEN *lenp			\
 				|bool flags
-Cp	|UV	|_to_utf8_title_flags					\
+Cp	|UV	|to_utf8_title_flags_					\
 				|NN const U8 *p 			\
 				|NULLOK const U8 *e			\
 				|NN U8 *ustrp				\
 				|NULLOK STRLEN *lenp			\
 				|bool flags
-Cp	|UV	|_to_utf8_upper_flags					\
+Cp	|UV	|to_utf8_upper_flags_					\
 				|NN const U8 *p 			\
 				|NULLOK const U8 *e			\
 				|NN U8 *ustrp				\
@@ -5119,7 +5119,7 @@ ETi	|const char *|get_regex_charset_name				\
 				|NN STRLEN * const lenp
 #endif
 #if defined(PERL_IN_PP_C) || defined(PERL_IN_UTF8_C)
-p	|UV	|_to_upper_title_latin1 				\
+p	|UV	|to_upper_title_latin1_ 				\
 				|const U8 c				\
 				|NN U8 *p				\
 				|NN STRLEN *lenp			\
@@ -5347,18 +5347,18 @@ Ep	|SSize_t|study_chunk	|NN RExC_state_t *pRExC_state		\
 				|U32 depth				\
 				|bool was_mutate_ok
 # if defined(PERL_IN_REGCOMP_TRIE_C) && defined(DEBUGGING)
-ES	|void	|dump_trie	|NN const struct _reg_trie_data *trie	\
+ES	|void	|dump_trie	|NN const struct reg_trie_data_ *trie	\
 				|NULLOK HV *widecharmap 		\
 				|NN AV *revcharmap			\
 				|U32 depth
 ES	|void	|dump_trie_interim_list 				\
-				|NN const struct _reg_trie_data *trie	\
+				|NN const struct reg_trie_data_ *trie	\
 				|NULLOK HV *widecharmap 		\
 				|NN AV *revcharmap			\
 				|U32 next_alloc 			\
 				|U32 depth
 ES	|void	|dump_trie_interim_table				\
-				|NN const struct _reg_trie_data *trie	\
+				|NN const struct reg_trie_data_ *trie	\
 				|NULLOK HV *widecharmap 		\
 				|NN AV *revcharmap			\
 				|U32 next_alloc 			\
@@ -5583,7 +5583,7 @@ ERp	|bool	|is_grapheme	|NN const U8 *strbeg			\
 #endif
 #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C) || \
     defined(PERL_IN_UTF8_C)
-ETXp	|UV	|_to_fold_latin1|const U8 c				\
+ETXp	|UV	|to_fold_latin1_|const U8 c				\
 				|NN U8 *p				\
 				|NN STRLEN *lenp			\
 				|const unsigned int flags
@@ -6164,7 +6164,7 @@ RST	|U8	|to_lower_latin1|const U8 c				\
 				|NULLOK U8 *p				\
 				|NULLOK STRLEN *lenp			\
 				|const char dummy
-S	|UV	|_to_utf8_case	|const UV original				\
+S	|UV	|to_utf8_case_	|const UV original				\
 				|NULLOK const U8 *p				\
 				|NN U8 *ustrp					\
 				|NN STRLEN *lenp				\

embed.h

@@ -116,17 +116,6 @@
 # define SvTRUE_nomg(a)                         Perl_SvTRUE_nomg(aTHX_ a)
 # define SvUV(a)                                Perl_SvUV(aTHX_ a)
 # define SvUV_nomg(a)                           Perl_SvUV_nomg(aTHX_ a)
-# define _is_uni_FOO(a,b)                       Perl__is_uni_FOO(aTHX_ a,b)
-# define _is_uni_perl_idcont(a)                 Perl__is_uni_perl_idcont(aTHX_ a)
-# define _is_uni_perl_idstart(a)                Perl__is_uni_perl_idstart(aTHX_ a)
-# define _is_utf8_FOO(a,b,c)                    Perl__is_utf8_FOO(aTHX_ a,b,c)
-# define _is_utf8_perl_idcont(a,b)              Perl__is_utf8_perl_idcont(aTHX_ a,b)
-# define _is_utf8_perl_idstart(a,b)             Perl__is_utf8_perl_idstart(aTHX_ a,b)
-# define _to_uni_fold_flags(a,b,c,d)            Perl__to_uni_fold_flags(aTHX_ a,b,c,d)
-# define _to_utf8_fold_flags(a,b,c,d,e)         Perl__to_utf8_fold_flags(aTHX_ a,b,c,d,e)
-# define _to_utf8_lower_flags(a,b,c,d,e)        Perl__to_utf8_lower_flags(aTHX_ a,b,c,d,e)
-# define _to_utf8_title_flags(a,b,c,d,e)        Perl__to_utf8_title_flags(aTHX_ a,b,c,d,e)
-# define _to_utf8_upper_flags(a,b,c,d,e)        Perl__to_utf8_upper_flags(aTHX_ a,b,c,d,e)
 # define amagic_call(a,b,c,d)                   Perl_amagic_call(aTHX_ a,b,c,d)
 # define amagic_deref_call(a,b)                 Perl_amagic_deref_call(aTHX_ a,b)
 # define apply_attrs_string(a,b,c,d)            Perl_apply_attrs_string(aTHX_ a,b,c,d)
@@ -329,13 +318,19 @@
 # define Perl_is_strict_utf8_string             is_strict_utf8_string
 # define Perl_is_strict_utf8_string_loc         is_strict_utf8_string_loc
 # define is_strict_utf8_string_loclen           Perl_is_strict_utf8_string_loclen
+# define is_uni_FOO_(a,b)                       Perl_is_uni_FOO_(aTHX_ a,b)
+# define is_uni_perl_idcont_(a)                 Perl_is_uni_perl_idcont_(aTHX_ a)
+# define is_uni_perl_idstart_(a)                Perl_is_uni_perl_idstart_(aTHX_ a)
 # define is_utf8_FF_helper_                     Perl_is_utf8_FF_helper_
+# define is_utf8_FOO_(a,b,c)                    Perl_is_utf8_FOO_(aTHX_ a,b,c)
 # define Perl_is_utf8_char_buf                  is_utf8_char_buf
 # define is_utf8_char_helper_                   Perl_is_utf8_char_helper_
 # define Perl_is_utf8_fixed_width_buf_flags     is_utf8_fixed_width_buf_flags
 # define Perl_is_utf8_fixed_width_buf_loc_flags is_utf8_fixed_width_buf_loc_flags
 # define is_utf8_fixed_width_buf_loclen_flags   Perl_is_utf8_fixed_width_buf_loclen_flags
 # define is_utf8_invariant_string_loc           Perl_is_utf8_invariant_string_loc
+# define is_utf8_perl_idcont_(a,b)              Perl_is_utf8_perl_idcont_(aTHX_ a,b)
+# define is_utf8_perl_idstart_(a,b)             Perl_is_utf8_perl_idstart_(aTHX_ a,b)
 # define Perl_is_utf8_string                    is_utf8_string
 # define is_utf8_string_flags                   Perl_is_utf8_string_flags
 # define Perl_is_utf8_string_loc                is_utf8_string_loc
@@ -804,9 +799,14 @@
 # define sync_locale()                          Perl_sync_locale(aTHX)
 # define taint_env()                            Perl_taint_env(aTHX)
 # define taint_proper(a,b)                      Perl_taint_proper(aTHX_ a,b)
+# define to_uni_fold_flags_(a,b,c,d)            Perl_to_uni_fold_flags_(aTHX_ a,b,c,d)
 # define to_uni_lower(a,b,c)                    Perl_to_uni_lower(aTHX_ a,b,c)
 # define to_uni_title(a,b,c)                    Perl_to_uni_title(aTHX_ a,b,c)
 # define to_uni_upper(a,b,c)                    Perl_to_uni_upper(aTHX_ a,b,c)
+# define to_utf8_fold_flags_(a,b,c,d,e)         Perl_to_utf8_fold_flags_(aTHX_ a,b,c,d,e)
+# define to_utf8_lower_flags_(a,b,c,d,e)        Perl_to_utf8_lower_flags_(aTHX_ a,b,c,d,e)
+# define to_utf8_title_flags_(a,b,c,d,e)        Perl_to_utf8_title_flags_(aTHX_ a,b,c,d,e)
+# define to_utf8_upper_flags_(a,b,c,d,e)        Perl_to_utf8_upper_flags_(aTHX_ a,b,c,d,e)
 # define uiv_2buf                               Perl_uiv_2buf
 # define unpackstring(a,b,c,d,e)                Perl_unpackstring(aTHX_ a,b,c,d,e)
 # define unshare_hek(a)                         Perl_unshare_hek(aTHX_ a)
@@ -1579,7 +1579,7 @@
 #     define lossless_NV_to_IV                  S_lossless_NV_to_IV
 #   endif
 #   if defined(PERL_IN_PP_C) || defined(PERL_IN_UTF8_C)
-#     define _to_upper_title_latin1(a,b,c,d)    Perl__to_upper_title_latin1(aTHX_ a,b,c,d)
+#     define to_upper_title_latin1_(a,b,c,d)    Perl_to_upper_title_latin1_(aTHX_ a,b,c,d)
 #   endif
 #   if defined(PERL_IN_PP_CTL_C)
 #     define check_type_and_open(a)             S_check_type_and_open(aTHX_ a)
@@ -1719,14 +1719,14 @@
 #     define sv_derived_from_svpvn(a,b,c,d,e)   S_sv_derived_from_svpvn(aTHX_ a,b,c,d,e)
 #   endif
 #   if defined(PERL_IN_UTF8_C)
-#     define _to_utf8_case(a,b,c,d,e,f,g,h,i)   S__to_utf8_case(aTHX_ a,b,c,d,e,f,g,h,i)
 #     define check_locale_boundary_crossing(a,b,c,d) S_check_locale_boundary_crossing(aTHX_ a,b,c,d)
 #     define does_utf8_overflow                 S_does_utf8_overflow
 #     define isFF_overlong                      S_isFF_overlong
 #     define is_utf8_overlong                   S_is_utf8_overlong
 #     define new_msg_hv(a,b,c)                  S_new_msg_hv(aTHX_ a,b,c)
 #     define to_case_cp_list(a,b,c,d,e,f,g,h)   S_to_case_cp_list(aTHX_ a,b,c,d,e,f,g,h)
 #     define to_lower_latin1                    S_to_lower_latin1
+#     define to_utf8_case_(a,b,c,d,e,f,g,h,i)   S_to_utf8_case_(aTHX_ a,b,c,d,e,f,g,h,i)
 #     define turkic_fc(a,b,c,d)                 S_turkic_fc(aTHX_ a,b,c,d)
 #     define turkic_lc(a,b,c,d)                 S_turkic_lc(aTHX_ a,b,c,d)
 #     define turkic_uc(a,b,c,d)                 S_turkic_uc(aTHX_ a,b,c,d)
@@ -1795,10 +1795,9 @@
 #   endif
 # endif /* defined(PERL_CORE) */
 # if defined(PERL_CORE) || defined(PERL_EXT)
-#   define _byte_dump_string(a,b,c)             Perl__byte_dump_string(aTHX_ a,b,c)
-#   define _inverse_folds(a,b,c)                Perl__inverse_folds(aTHX_ a,b,c)
 #   define append_utf8_from_native_byte         Perl_append_utf8_from_native_byte
 #   define av_reify(a)                          Perl_av_reify(aTHX_ a)
+#   define byte_dump_string_(a,b,c)             Perl_byte_dump_string_(aTHX_ a,b,c)
 #   define cntrl_to_mnemonic                    Perl_cntrl_to_mnemonic
 #   define current_re_engine()                  Perl_current_re_engine(aTHX)
 #   define cv_ckproto_len_flags(a,b,c,d,e)      Perl_cv_ckproto_len_flags(aTHX_ a,b,c,d,e)
@@ -1808,6 +1807,7 @@
 #   define get_deprecated_property_msg          Perl_get_deprecated_property_msg
 #   define get_prop_definition(a)               Perl_get_prop_definition(aTHX_ a)
 #   define get_prop_values                      Perl_get_prop_values
+#   define inverse_folds_(a,b,c)                Perl_inverse_folds_(aTHX_ a,b,c)
 #   define load_charnames(a,b,c,d)              Perl_load_charnames(aTHX_ a,b,c,d)
 #   define mbtowc_(a,b,c)                       Perl_mbtowc_(aTHX_ a,b,c)
 #   define mg_find_mglob(a)                     Perl_mg_find_mglob(aTHX_ a)
@@ -1989,7 +1989,7 @@
 #   endif
 #   if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C) || \
        defined(PERL_IN_UTF8_C)
-#     define _to_fold_latin1                    Perl__to_fold_latin1
+#     define to_fold_latin1_                    Perl_to_fold_latin1_
 #   endif
 #   if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_TOKE_C)
 #     define regcurly                           Perl_regcurly

gv.h

@@ -46,31 +46,31 @@ the need to cast the result to the appropriate type.
 
 #if defined (DEBUGGING) && defined(PERL_USE_GCC_BRACE_GROUPS) && !defined(__INTEL_COMPILER)
 #  define GvGP(gv)							\
-        ((GP *)(*({GV *const _gvgp = (GV *) (gv);				\
-            assert(SvTYPE(_gvgp) == SVt_PVGV || SvTYPE(_gvgp) == SVt_PVLV); \
-            assert(isGV_with_GP(_gvgp));				\
-            &((_gvgp)->sv_u.svu_gp);})))
+        ((GP *)(*({GV *const gvgp_ = (GV *) (gv);				\
+            assert(SvTYPE(gvgp_) == SVt_PVGV || SvTYPE(gvgp_) == SVt_PVLV); \
+            assert(isGV_with_GP(gvgp_));				\
+            &((gvgp_)->sv_u.svu_gp);})))
 #  define GvGP_set(gv,gp)						\
-        {GV *const _gvgp = (GV *) (gv);				\
-            assert(SvTYPE(_gvgp) == SVt_PVGV || SvTYPE(_gvgp) == SVt_PVLV); \
-            assert(isGV_with_GP(_gvgp));				\
-            (_gvgp)->sv_u.svu_gp = (gp); }
+        {GV *const gvgp_ = (GV *) (gv);				\
+            assert(SvTYPE(gvgp_) == SVt_PVGV || SvTYPE(gvgp_) == SVt_PVLV); \
+            assert(isGV_with_GP(gvgp_));				\
+            (gvgp_)->sv_u.svu_gp = (gp); }
 #  define GvFLAGS(gv)							\
-        (*({GV *const _gvflags = (GV *) (gv);				\
-            assert(SvTYPE(_gvflags) == SVt_PVGV || SvTYPE(_gvflags) == SVt_PVLV); \
-            assert(isGV_with_GP(_gvflags));				\
-            &(GvXPVGV(_gvflags)->xpv_cur);}))
+        (*({GV *const gvflags_ = (GV *) (gv);				\
+            assert(SvTYPE(gvflags_) == SVt_PVGV || SvTYPE(gvflags_) == SVt_PVLV); \
+            assert(isGV_with_GP(gvflags_));				\
+            &(GvXPVGV(gvflags_)->xpv_cur);}))
 #  define GvSTASH(gv)							\
-        (*({ GV * const _gvstash = (GV *) (gv);				\
-            assert(isGV_with_GP(_gvstash));				\
-            assert(SvTYPE(_gvstash) == SVt_PVGV || SvTYPE(_gvstash) >= SVt_PVLV); \
-            &(GvXPVGV(_gvstash)->xnv_u.xgv_stash);			\
+        (*({ GV * const gvstash_ = (GV *) (gv);				\
+            assert(isGV_with_GP(gvstash_));				\
+            assert(SvTYPE(gvstash_) == SVt_PVGV || SvTYPE(gvstash_) >= SVt_PVLV); \
+            &(GvXPVGV(gvstash_)->xnv_u.xgv_stash);			\
          }))
 #  define GvNAME_HEK(gv)						\
-    (*({ GV * const _gvname_hek = (GV *) (gv);				\
-           assert(isGV_with_GP(_gvname_hek));				\
-           assert(SvTYPE(_gvname_hek) == SVt_PVGV || SvTYPE(_gvname_hek) >= SVt_PVLV); \
-           &(GvXPVGV(_gvname_hek)->xiv_u.xivu_namehek);			\
+    (*({ GV * const gvname_hek_ = (GV *) (gv);				\
+           assert(isGV_with_GP(gvname_hek_));				\
+           assert(SvTYPE(gvname_hek_) == SVt_PVGV || SvTYPE(gvname_hek_) >= SVt_PVLV); \
+           &(GvXPVGV(gvname_hek_)->xiv_u.xivu_namehek);			\
          }))
 #  define GvNAME_get(gv)	({ assert(GvNAME_HEK(gv)); (char *)HEK_KEY(GvNAME_HEK(gv)); })
 #  define GvNAMELEN_get(gv)	({ assert(GvNAME_HEK(gv)); HEK_LEN(GvNAME_HEK(gv)); })