Resolve utfperl branch against mainline as of _62

p4raw-id: //depot/utfperl@4394

diff --cc embed.h
index bbe00a1,bf2a0e8..ac00bc0
--- 1/embed.h
--- 2/embed.h
+++ b/embed.h
@@@ -2116,14 -2102,10 +2118,14 @@@
  #define do_pmop_dump(a,b,c)   Perl_do_pmop_dump(aTHX_ a,b,c)
  #define do_sv_dump(a,b,c,d,e,f,g)     Perl_do_sv_dump(aTHX_ a,b,c,d,e,f,g)
  #define magic_dump(a)         Perl_magic_dump(aTHX_ a)
- #define vdefault_protect(a,b,c)       Perl_vdefault_protect(aTHX_ a,b,c)
+ #define vdefault_protect(a,b,c,d)     Perl_vdefault_protect(aTHX_ a,b,c,d)
  #define reginitcolors()               Perl_reginitcolors(aTHX)
  #define sv_2pv_nolen(a)               Perl_sv_2pv_nolen(aTHX_ a)
 +#define sv_2pvutf8_nolen(a)   Perl_sv_2pvutf8_nolen(aTHX_ a)
 +#define sv_2pvbyte_nolen(a)   Perl_sv_2pvbyte_nolen(aTHX_ a)
  #define sv_pv(a)              Perl_sv_pv(aTHX_ a)
 +#define sv_pvutf8(a)          Perl_sv_pvutf8(aTHX_ a)
 +#define sv_pvbyte(a)          Perl_sv_pvbyte(aTHX_ a)
  #define sv_force_normal(a)    Perl_sv_force_normal(aTHX_ a)
  #define tmps_grow(a)          Perl_tmps_grow(aTHX_ a)
  #define sv_rvweaken(a)                Perl_sv_rvweaken(aTHX_ a)

diff --cc embed.pl
index 93d6008,7c05ab7..48fb257
--- 1/embed.pl
--- 2/embed.pl
+++ b/embed.pl
@@@ -1760,15 -1756,13 +1762,17 @@@ p    |void   |do_pmop_dump   |I32 level|PerlI
  p     |void   |do_sv_dump     |I32 level|PerlIO *file|SV *sv|I32 nest \
                                |I32 maxnest|bool dumpops|STRLEN pvlim
  p     |void   |magic_dump     |MAGIC *mg
- p     |void*  |default_protect|int *excpt|protect_body_t body|...
- p     |void*  |vdefault_protect|int *excpt|protect_body_t body|va_list *args
+ p     |void*  |default_protect|volatile JMPENV *je|int *excpt \
+                               |protect_body_t body|...
+ p     |void*  |vdefault_protect|volatile JMPENV *je|int *excpt \
+                               |protect_body_t body|va_list *args
  p     |void   |reginitcolors
  p     |char*  |sv_2pv_nolen   |SV* sv
 +p     |char*  |sv_2pvutf8_nolen|SV* sv
 +p     |char*  |sv_2pvbyte_nolen|SV* sv
  p     |char*  |sv_pv          |SV *sv
 +p     |char*  |sv_pvutf8      |SV *sv
 +p     |char*  |sv_pvbyte      |SV *sv
  p     |void   |sv_force_normal|SV *sv
  p     |void   |tmps_grow      |I32 n
  p     |SV*    |sv_rvweaken    |SV *sv

diff --cc global.sym
Simple merge

diff --cc objXSUB.h
Simple merge

diff --cc perl.h
Simple merge

diff --cc perlapi.c
Simple merge

diff --cc pp_hot.c
Simple merge

diff --cc proto.h
index 0bc9719,787ec13..dde721f
--- 1/proto.h
--- 2/proto.h
+++ b/proto.h
@@@ -729,15 -724,11 +730,15 @@@ VIRTUAL void    Perl_do_op_dump(pTHX_ I32 
  VIRTUAL void  Perl_do_pmop_dump(pTHX_ I32 level, PerlIO *file, PMOP *pm);
  VIRTUAL void  Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim);
  VIRTUAL void  Perl_magic_dump(pTHX_ MAGIC *mg);
- VIRTUAL void* Perl_default_protect(pTHX_ int *excpt, protect_body_t body, ...);
- VIRTUAL void* Perl_vdefault_protect(pTHX_ int *excpt, protect_body_t body, va_list *args);
+ VIRTUAL void* Perl_default_protect(pTHX_ volatile JMPENV *je, int *excpt, protect_body_t body, ...);
+ VIRTUAL void* Perl_vdefault_protect(pTHX_ volatile JMPENV *je, int *excpt, protect_body_t body, va_list *args);
  VIRTUAL void  Perl_reginitcolors(pTHX);
  VIRTUAL char* Perl_sv_2pv_nolen(pTHX_ SV* sv);
 +VIRTUAL char* Perl_sv_2pvutf8_nolen(pTHX_ SV* sv);
 +VIRTUAL char* Perl_sv_2pvbyte_nolen(pTHX_ SV* sv);
  VIRTUAL char* Perl_sv_pv(pTHX_ SV *sv);
 +VIRTUAL char* Perl_sv_pvutf8(pTHX_ SV *sv);
 +VIRTUAL char* Perl_sv_pvbyte(pTHX_ SV *sv);
  VIRTUAL void  Perl_sv_force_normal(pTHX_ SV *sv);
  VIRTUAL void  Perl_tmps_grow(pTHX_ I32 n);
  VIRTUAL SV*   Perl_sv_rvweaken(pTHX_ SV *sv);