summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2012-09-12 19:15:59 -0500
committerJesse Luehrs <doy@tozt.net>2012-09-12 19:19:48 -0500
commit650f067c54a3baf4a72cb6953bd10c90abb28bd2 (patch)
tree8dc2338b69f11bcf121aa20335528fda5a88d0c8
parenta8bd1c847f8091d5e38e7fc71669faa40543bdf9 (diff)
downloadperl-650f067c54a3baf4a72cb6953bd10c90abb28bd2.tar.gz
whoops, move this back where it was
apparently utf8->SWASHNEW calls "require 'unicore/Heavy.pl'" too
-rw-r--r--utf8.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/utf8.c b/utf8.c
index bca9db6fb4..2172d311b4 100644
--- 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