This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
whoops, move this back where it was
authorJesse Luehrs <doy@tozt.net>
Thu, 13 Sep 2012 00:15:59 +0000 (19:15 -0500)
committerJesse Luehrs <doy@tozt.net>
Thu, 13 Sep 2012 00:19:48 +0000 (19:19 -0500)
apparently utf8->SWASHNEW calls "require 'unicore/Heavy.pl'" too

utf8.c

diff --git a/utf8.c b/utf8.c
index bca9db6..2172d31 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -3033,16 +3033,16 @@ Perl__core_swash_init(pTHX_ const char* pkg, const char* name, SV *listsv, I32 m
        ENTER;
        SAVEHINTS();
        save_re_context();
+       /* We might get here via a subroutine signature which uses a utf8
+        * parameter name, at which point PL_subname will have been set
+        * but not yet used. */
+       save_item(PL_subname);
        if (PL_parser && PL_parser->error_count)
            SAVEI8(PL_parser->error_count), PL_parser->error_count = 0;
        method = gv_fetchmeth(stash, "SWASHNEW", 8, -1);
        if (!method) {  /* demand load utf8 */
            ENTER;
            errsv_save = newSVsv(ERRSV);
-           /* We might get here via a subroutine signature which uses a utf8
-            * parameter name, at which point PL_subname will have been set
-            * but not yet used. */
-           save_item(PL_subname);
            /* It is assumed that callers of this routine are not passing in
             * any user derived data.  */
            /* Need to do this after save_re_context() as it will set