integrate mainline changes

p4raw-id: //depot/utfperl@4679

1 files changed, 188 insertions, 39 deletions

diff --git a/embed.h b/embed.h
index ac00bc05f8..aa5b8bc3ef 100644
--- a/embed.h
+++ b/embed.h
@@ -45,8 +45,21 @@
 #if !defined(PERL_OBJECT)
 #if !defined(PERL_IMPLICIT_CONTEXT)
 
+#if defined(PERL_IMPLICIT_SYS)
+#else
+#endif
+#if defined(USE_ITHREADS)
+#  if defined(PERL_IMPLICIT_SYS)
+#  endif
+#endif
+#if defined(MYMALLOC)
+#define malloced_size		Perl_malloced_size
+#endif
 #if defined(PERL_OBJECT)
 #endif
+#if defined(PERL_OBJECT)
+#else
+#endif
 #define amagic_call		Perl_amagic_call
 #define Gv_AMupdate		Perl_Gv_AMupdate
 #define append_elem		Perl_append_elem
@@ -123,7 +136,6 @@
 #define cxinc			Perl_cxinc
 #define deb			Perl_deb
 #define vdeb			Perl_vdeb
-#define deb_growlevel		Perl_deb_growlevel
 #define debprofdump		Perl_debprofdump
 #define debop			Perl_debop
 #define debstack		Perl_debstack
@@ -356,9 +368,6 @@
 #define magic_sizepack		Perl_magic_sizepack
 #define magic_wipepack		Perl_magic_wipepack
 #define magicname		Perl_magicname
-#if defined(MYMALLOC)
-#define malloced_size		Perl_malloced_size
-#endif
 #define markstack_grow		Perl_markstack_grow
 #if defined(USE_LOCALE_COLLATE)
 #define mem_collxfrm		Perl_mem_collxfrm
@@ -438,6 +447,7 @@
 #define newHVhv			Perl_newHVhv
 #define newIO			Perl_newIO
 #define newLISTOP		Perl_newLISTOP
+#define newPADOP		Perl_newPADOP
 #define newPMOP			Perl_newPMOP
 #define newPVOP			Perl_newPVOP
 #define newRV			Perl_newRV
@@ -473,11 +483,10 @@
 #define pad_swipe		Perl_pad_swipe
 #define peep			Perl_peep
 #if defined(PERL_OBJECT)
-#else
+#endif
 #if defined(USE_THREADS)
 #define new_struct_thread	Perl_new_struct_thread
 #endif
-#endif
 #define call_atexit		Perl_call_atexit
 #define call_argv		Perl_call_argv
 #define call_method		Perl_call_method
@@ -552,6 +561,7 @@
 #define save_hptr		Perl_save_hptr
 #define save_I16		Perl_save_I16
 #define save_I32		Perl_save_I32
+#define save_I8			Perl_save_I8
 #define save_int		Perl_save_int
 #define save_item		Perl_save_item
 #define save_iv			Perl_save_iv
@@ -561,6 +571,7 @@
 #define save_op			Perl_save_op
 #define save_scalar		Perl_save_scalar
 #define save_pptr		Perl_save_pptr
+#define save_vptr		Perl_save_vptr
 #define save_re_context		Perl_save_re_context
 #define save_sptr		Perl_save_sptr
 #define save_svref		Perl_save_svref
@@ -696,6 +707,7 @@
 #define vivify_defelem		Perl_vivify_defelem
 #define vivify_ref		Perl_vivify_ref
 #define wait4pid		Perl_wait4pid
+#define report_uninit		Perl_report_uninit
 #define warn			Perl_warn
 #define vwarn			Perl_vwarn
 #define warner			Perl_warner
@@ -773,7 +785,28 @@
 #define newMYSUB		Perl_newMYSUB
 #define my_attrs		Perl_my_attrs
 #define boot_core_xsutils	Perl_boot_core_xsutils
+#if defined(USE_ITHREADS)
+#define cx_dup			Perl_cx_dup
+#define si_dup			Perl_si_dup
+#define ss_dup			Perl_ss_dup
+#define any_dup			Perl_any_dup
+#define he_dup			Perl_he_dup
+#define re_dup			Perl_re_dup
+#define fp_dup			Perl_fp_dup
+#define dirp_dup		Perl_dirp_dup
+#define gp_dup			Perl_gp_dup
+#define mg_dup			Perl_mg_dup
+#define sv_dup			Perl_sv_dup
+#if defined(HAVE_INTERP_INTERN)
+#define sys_intern_dup		Perl_sys_intern_dup
+#endif
+#define ptr_table_new		Perl_ptr_table_new
+#define ptr_table_fetch		Perl_ptr_table_fetch
+#define ptr_table_store		Perl_ptr_table_store
+#define ptr_table_split		Perl_ptr_table_split
+#endif
 #if defined(PERL_OBJECT)
+#else
 #endif
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
 #define avhv_index_sv		S_avhv_index_sv
@@ -825,6 +858,7 @@
 #define simplify_sort		S_simplify_sort
 #define is_handle_constructor	S_is_handle_constructor
 #define gv_ename		S_gv_ename
+#define cv_dump			S_cv_dump
 #define cv_clone2		S_cv_clone2
 #define scalar_mod_type		S_scalar_mod_type
 #define my_kid			S_my_kid
@@ -914,7 +948,14 @@
 #define regwhite		S_regwhite
 #define nextchar		S_nextchar
 #define dumpuntil		S_dumpuntil
+#define put_byte		S_put_byte
 #define scan_commit		S_scan_commit
+#define cl_anything		S_cl_anything
+#define cl_is_anything		S_cl_is_anything
+#define cl_init			S_cl_init
+#define cl_init_zero		S_cl_init_zero
+#define cl_and			S_cl_and
+#define cl_or			S_cl_or
 #define study_chunk		S_study_chunk
 #define add_data		S_add_data
 #define re_croak2		S_re_croak2
@@ -934,6 +975,7 @@
 #define cache_re		S_cache_re
 #define reghop			S_reghop
 #define reghopmaybe		S_reghopmaybe
+#define find_byclass		S_find_byclass
 #endif
 #if defined(PERL_IN_RUN_C) || defined(PERL_DECL_PROT)
 #define debprof			S_debprof
@@ -1048,6 +1090,8 @@
 #define xstat			S_xstat
 #  endif
 #endif
+#if defined(PERL_OBJECT)
+#endif
 #define ck_anoncode		Perl_ck_anoncode
 #define ck_bitop		Perl_ck_bitop
 #define ck_concat		Perl_ck_concat
@@ -1434,7 +1478,20 @@
 
 #else	/* PERL_IMPLICIT_CONTEXT */
 
+#if defined(PERL_IMPLICIT_SYS)
+#else
+#endif
+#if defined(USE_ITHREADS)
+#  if defined(PERL_IMPLICIT_SYS)
+#  endif
+#endif
+#if defined(MYMALLOC)
+#define malloced_size		Perl_malloced_size
+#endif
+#if defined(PERL_OBJECT)
+#endif
 #if defined(PERL_OBJECT)
+#else
 #endif
 #define amagic_call(a,b,c,d)	Perl_amagic_call(aTHX_ a,b,c,d)
 #define Gv_AMupdate(a)		Perl_Gv_AMupdate(aTHX_ a)
@@ -1497,7 +1554,6 @@
 #define get_ppaddr()		Perl_get_ppaddr(aTHX)
 #define cxinc()			Perl_cxinc(aTHX)
 #define vdeb(a,b)		Perl_vdeb(aTHX_ a,b)
-#define deb_growlevel()		Perl_deb_growlevel(aTHX)
 #define debprofdump()		Perl_debprofdump(aTHX)
 #define debop(a)		Perl_debop(aTHX_ a)
 #define debstack()		Perl_debstack(aTHX)
@@ -1728,9 +1784,6 @@
 #define magic_sizepack(a,b)	Perl_magic_sizepack(aTHX_ a,b)
 #define magic_wipepack(a,b)	Perl_magic_wipepack(aTHX_ a,b)
 #define magicname(a,b,c)	Perl_magicname(aTHX_ a,b,c)
-#if defined(MYMALLOC)
-#define malloced_size		Perl_malloced_size
-#endif
 #define markstack_grow()	Perl_markstack_grow(aTHX)
 #if defined(USE_LOCALE_COLLATE)
 #define mem_collxfrm(a,b,c)	Perl_mem_collxfrm(aTHX_ a,b,c)
@@ -1809,6 +1862,7 @@
 #define newHVhv(a)		Perl_newHVhv(aTHX_ a)
 #define newIO()			Perl_newIO(aTHX)
 #define newLISTOP(a,b,c,d)	Perl_newLISTOP(aTHX_ a,b,c,d)
+#define newPADOP(a,b,c)		Perl_newPADOP(aTHX_ a,b,c)
 #define newPMOP(a,b)		Perl_newPMOP(aTHX_ a,b)
 #define newPVOP(a,b,c)		Perl_newPVOP(aTHX_ a,b,c)
 #define newRV(a)		Perl_newRV(aTHX_ a)
@@ -1843,11 +1897,10 @@
 #define pad_swipe(a)		Perl_pad_swipe(aTHX_ a)
 #define peep(a)			Perl_peep(aTHX_ a)
 #if defined(PERL_OBJECT)
-#else
+#endif
 #if defined(USE_THREADS)
 #define new_struct_thread(a)	Perl_new_struct_thread(aTHX_ a)
 #endif
-#endif
 #define call_atexit(a,b)	Perl_call_atexit(aTHX_ a,b)
 #define call_argv(a,b,c)	Perl_call_argv(aTHX_ a,b,c)
 #define call_method(a,b)	Perl_call_method(aTHX_ a,b)
@@ -1922,6 +1975,7 @@
 #define save_hptr(a)		Perl_save_hptr(aTHX_ a)
 #define save_I16(a)		Perl_save_I16(aTHX_ a)
 #define save_I32(a)		Perl_save_I32(aTHX_ a)
+#define save_I8(a)		Perl_save_I8(aTHX_ a)
 #define save_int(a)		Perl_save_int(aTHX_ a)
 #define save_item(a)		Perl_save_item(aTHX_ a)
 #define save_iv(a)		Perl_save_iv(aTHX_ a)
@@ -1931,6 +1985,7 @@
 #define save_op()		Perl_save_op(aTHX)
 #define save_scalar(a)		Perl_save_scalar(aTHX_ a)
 #define save_pptr(a)		Perl_save_pptr(aTHX_ a)
+#define save_vptr(a)		Perl_save_vptr(aTHX_ a)
 #define save_re_context()	Perl_save_re_context(aTHX)
 #define save_sptr(a)		Perl_save_sptr(aTHX_ a)
 #define save_svref(a)		Perl_save_svref(aTHX_ a)
@@ -2064,6 +2119,7 @@
 #define vivify_defelem(a)	Perl_vivify_defelem(aTHX_ a)
 #define vivify_ref(a,b)		Perl_vivify_ref(aTHX_ a,b)
 #define wait4pid(a,b,c)		Perl_wait4pid(aTHX_ a,b,c)
+#define report_uninit()		Perl_report_uninit(aTHX)
 #define vwarn(a,b)		Perl_vwarn(aTHX_ a,b)
 #define vwarner(a,b,c)		Perl_vwarner(aTHX_ a,b,c)
 #define watch(a)		Perl_watch(aTHX_ a)
@@ -2135,7 +2191,28 @@
 #define newMYSUB(a,b,c,d,e)	Perl_newMYSUB(aTHX_ a,b,c,d,e)
 #define my_attrs(a,b)		Perl_my_attrs(aTHX_ a,b)
 #define boot_core_xsutils()	Perl_boot_core_xsutils(aTHX)
+#if defined(USE_ITHREADS)
+#define cx_dup(a,b,c)		Perl_cx_dup(aTHX_ a,b,c)
+#define si_dup(a)		Perl_si_dup(aTHX_ a)
+#define ss_dup(a)		Perl_ss_dup(aTHX_ a)
+#define any_dup(a,b)		Perl_any_dup(aTHX_ a,b)
+#define he_dup(a,b)		Perl_he_dup(aTHX_ a,b)
+#define re_dup(a)		Perl_re_dup(aTHX_ a)
+#define fp_dup(a,b)		Perl_fp_dup(aTHX_ a,b)
+#define dirp_dup(a)		Perl_dirp_dup(aTHX_ a)
+#define gp_dup(a)		Perl_gp_dup(aTHX_ a)
+#define mg_dup(a)		Perl_mg_dup(aTHX_ a)
+#define sv_dup(a)		Perl_sv_dup(aTHX_ a)
+#if defined(HAVE_INTERP_INTERN)
+#define sys_intern_dup(a,b)	Perl_sys_intern_dup(aTHX_ a,b)
+#endif
+#define ptr_table_new()		Perl_ptr_table_new(aTHX)
+#define ptr_table_fetch(a,b)	Perl_ptr_table_fetch(aTHX_ a,b)
+#define ptr_table_store(a,b,c)	Perl_ptr_table_store(aTHX_ a,b,c)
+#define ptr_table_split(a)	Perl_ptr_table_split(aTHX_ a)
+#endif
 #if defined(PERL_OBJECT)
+#else
 #endif
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
 #define avhv_index_sv(a)	S_avhv_index_sv(aTHX_ a)
@@ -2187,6 +2264,7 @@
 #define simplify_sort(a)	S_simplify_sort(aTHX_ a)
 #define is_handle_constructor(a,b)	S_is_handle_constructor(aTHX_ a,b)
 #define gv_ename(a)		S_gv_ename(aTHX_ a)
+#define cv_dump(a)		S_cv_dump(aTHX_ a)
 #define cv_clone2(a,b)		S_cv_clone2(aTHX_ a,b)
 #define scalar_mod_type(a,b)	S_scalar_mod_type(aTHX_ a,b)
 #define my_kid(a,b)		S_my_kid(aTHX_ a,b)
@@ -2276,7 +2354,14 @@
 #define regwhite(a,b)		S_regwhite(aTHX_ a,b)
 #define nextchar()		S_nextchar(aTHX)
 #define dumpuntil(a,b,c,d,e)	S_dumpuntil(aTHX_ a,b,c,d,e)
+#define put_byte(a,b)		S_put_byte(aTHX_ a,b)
 #define scan_commit(a)		S_scan_commit(aTHX_ a)
+#define cl_anything(a)		S_cl_anything(aTHX_ a)
+#define cl_is_anything(a)	S_cl_is_anything(aTHX_ a)
+#define cl_init(a)		S_cl_init(aTHX_ a)
+#define cl_init_zero(a)		S_cl_init_zero(aTHX_ a)
+#define cl_and(a,b)		S_cl_and(aTHX_ a,b)
+#define cl_or(a,b)		S_cl_or(aTHX_ a,b)
 #define study_chunk(a,b,c,d,e)	S_study_chunk(aTHX_ a,b,c,d,e)
 #define add_data(a,b)		S_add_data(aTHX_ a,b)
 #define regpposixcc(a)		S_regpposixcc(aTHX_ a)
@@ -2295,6 +2380,7 @@
 #define cache_re(a)		S_cache_re(aTHX_ a)
 #define reghop(a,b)		S_reghop(aTHX_ a,b)
 #define reghopmaybe(a,b)	S_reghopmaybe(aTHX_ a,b)
+#define find_byclass(a,b,c,d,e,f)	S_find_byclass(aTHX_ a,b,c,d,e,f)
 #endif
 #if defined(PERL_IN_RUN_C) || defined(PERL_DECL_PROT)
 #define debprof(a)		S_debprof(aTHX_ a)
@@ -2409,6 +2495,8 @@
 #define xstat(a)		S_xstat(aTHX_ a)
 #  endif
 #endif
+#if defined(PERL_OBJECT)
+#endif
 #define ck_anoncode(a)		Perl_ck_anoncode(aTHX_ a)
 #define ck_bitop(a)		Perl_ck_bitop(aTHX_ a)
 #define ck_concat(a)		Perl_ck_concat(aTHX_ a)
@@ -2796,8 +2884,25 @@
 #endif	/* PERL_IMPLICIT_CONTEXT */
 #else	/* PERL_OBJECT */
 
+#if defined(PERL_IMPLICIT_SYS)
+#else
+#endif
+#if defined(USE_ITHREADS)
+#  if defined(PERL_IMPLICIT_SYS)
+#  endif
+#endif
+#if defined(MYMALLOC)
+#define malloc			Perl_malloc
+#define calloc			Perl_calloc
+#define realloc			Perl_realloc
+#define mfree			Perl_mfree
+#define malloced_size		Perl_malloced_size
+#endif
 #if defined(PERL_OBJECT)
 #endif
+#if defined(PERL_OBJECT)
+#else
+#endif
 #define Perl_amagic_call	CPerlObj::Perl_amagic_call
 #define amagic_call		Perl_amagic_call
 #define Perl_Gv_AMupdate	CPerlObj::Perl_Gv_AMupdate
@@ -2944,8 +3049,6 @@
 #define deb			Perl_deb
 #define Perl_vdeb		CPerlObj::Perl_vdeb
 #define vdeb			Perl_vdeb
-#define Perl_deb_growlevel	CPerlObj::Perl_deb_growlevel
-#define deb_growlevel		Perl_deb_growlevel
 #define Perl_debprofdump	CPerlObj::Perl_debprofdump
 #define debprofdump		Perl_debprofdump
 #define Perl_debop		CPerlObj::Perl_debop
@@ -3396,10 +3499,6 @@
 #define magic_wipepack		Perl_magic_wipepack
 #define Perl_magicname		CPerlObj::Perl_magicname
 #define magicname		Perl_magicname
-#if defined(MYMALLOC)
-#define Perl_malloced_size	CPerlObj::Perl_malloced_size
-#define malloced_size		Perl_malloced_size
-#endif
 #define Perl_markstack_grow	CPerlObj::Perl_markstack_grow
 #define markstack_grow		Perl_markstack_grow
 #if defined(USE_LOCALE_COLLATE)
@@ -3544,6 +3643,8 @@
 #define newIO			Perl_newIO
 #define Perl_newLISTOP		CPerlObj::Perl_newLISTOP
 #define newLISTOP		Perl_newLISTOP
+#define Perl_newPADOP		CPerlObj::Perl_newPADOP
+#define newPADOP		Perl_newPADOP
 #define Perl_newPMOP		CPerlObj::Perl_newPMOP
 #define newPMOP			Perl_newPMOP
 #define Perl_newPVOP		CPerlObj::Perl_newPVOP
@@ -3613,23 +3714,16 @@
 #define Perl_peep		CPerlObj::Perl_peep
 #define peep			Perl_peep
 #if defined(PERL_OBJECT)
-#define perl_construct		CPerlObj::perl_construct
-#define perl_destruct		CPerlObj::perl_destruct
-#define perl_free		CPerlObj::perl_free
-#define perl_run		CPerlObj::perl_run
-#define perl_parse		CPerlObj::perl_parse
-#else
-#define perl_alloc		CPerlObj::perl_alloc
-#define perl_construct		CPerlObj::perl_construct
-#define perl_destruct		CPerlObj::perl_destruct
-#define perl_free		CPerlObj::perl_free
-#define perl_run		CPerlObj::perl_run
-#define perl_parse		CPerlObj::perl_parse
+#define Perl_construct		CPerlObj::Perl_construct
+#define Perl_destruct		CPerlObj::Perl_destruct
+#define Perl_free		CPerlObj::Perl_free
+#define Perl_run		CPerlObj::Perl_run
+#define Perl_parse		CPerlObj::Perl_parse
+#endif
 #if defined(USE_THREADS)
 #define Perl_new_struct_thread	CPerlObj::Perl_new_struct_thread
 #define new_struct_thread	Perl_new_struct_thread
 #endif
-#endif
 #define Perl_call_atexit	CPerlObj::Perl_call_atexit
 #define call_atexit		Perl_call_atexit
 #define Perl_call_argv		CPerlObj::Perl_call_argv
@@ -3776,6 +3870,8 @@
 #define save_I16		Perl_save_I16
 #define Perl_save_I32		CPerlObj::Perl_save_I32
 #define save_I32		Perl_save_I32
+#define Perl_save_I8		CPerlObj::Perl_save_I8
+#define save_I8			Perl_save_I8
 #define Perl_save_int		CPerlObj::Perl_save_int
 #define save_int		Perl_save_int
 #define Perl_save_item		CPerlObj::Perl_save_item
@@ -3794,6 +3890,8 @@
 #define save_scalar		Perl_save_scalar
 #define Perl_save_pptr		CPerlObj::Perl_save_pptr
 #define save_pptr		Perl_save_pptr
+#define Perl_save_vptr		CPerlObj::Perl_save_vptr
+#define save_vptr		Perl_save_vptr
 #define Perl_save_re_context	CPerlObj::Perl_save_re_context
 #define save_re_context		Perl_save_re_context
 #define Perl_save_sptr		CPerlObj::Perl_save_sptr
@@ -4056,6 +4154,8 @@
 #define vivify_ref		Perl_vivify_ref
 #define Perl_wait4pid		CPerlObj::Perl_wait4pid
 #define wait4pid		Perl_wait4pid
+#define Perl_report_uninit	CPerlObj::Perl_report_uninit
+#define report_uninit		Perl_report_uninit
 #define Perl_warn		CPerlObj::Perl_warn
 #define warn			Perl_warn
 #define Perl_vwarn		CPerlObj::Perl_vwarn
@@ -4084,14 +4184,6 @@
 #if defined(MYMALLOC)
 #define Perl_dump_mstats	CPerlObj::Perl_dump_mstats
 #define dump_mstats		Perl_dump_mstats
-#define Perl_malloc		CPerlObj::Perl_malloc
-#define malloc			Perl_malloc
-#define Perl_calloc		CPerlObj::Perl_calloc
-#define calloc			Perl_calloc
-#define Perl_realloc		CPerlObj::Perl_realloc
-#define realloc			Perl_realloc
-#define Perl_mfree		CPerlObj::Perl_mfree
-#define mfree			Perl_mfree
 #endif
 #define Perl_safesysmalloc	CPerlObj::Perl_safesysmalloc
 #define safesysmalloc		Perl_safesysmalloc
@@ -4209,7 +4301,44 @@
 #define my_attrs		Perl_my_attrs
 #define Perl_boot_core_xsutils	CPerlObj::Perl_boot_core_xsutils
 #define boot_core_xsutils	Perl_boot_core_xsutils
+#if defined(USE_ITHREADS)
+#define Perl_cx_dup		CPerlObj::Perl_cx_dup
+#define cx_dup			Perl_cx_dup
+#define Perl_si_dup		CPerlObj::Perl_si_dup
+#define si_dup			Perl_si_dup
+#define Perl_ss_dup		CPerlObj::Perl_ss_dup
+#define ss_dup			Perl_ss_dup
+#define Perl_any_dup		CPerlObj::Perl_any_dup
+#define any_dup			Perl_any_dup
+#define Perl_he_dup		CPerlObj::Perl_he_dup
+#define he_dup			Perl_he_dup
+#define Perl_re_dup		CPerlObj::Perl_re_dup
+#define re_dup			Perl_re_dup
+#define Perl_fp_dup		CPerlObj::Perl_fp_dup
+#define fp_dup			Perl_fp_dup
+#define Perl_dirp_dup		CPerlObj::Perl_dirp_dup
+#define dirp_dup		Perl_dirp_dup
+#define Perl_gp_dup		CPerlObj::Perl_gp_dup
+#define gp_dup			Perl_gp_dup
+#define Perl_mg_dup		CPerlObj::Perl_mg_dup
+#define mg_dup			Perl_mg_dup
+#define Perl_sv_dup		CPerlObj::Perl_sv_dup
+#define sv_dup			Perl_sv_dup
+#if defined(HAVE_INTERP_INTERN)
+#define Perl_sys_intern_dup	CPerlObj::Perl_sys_intern_dup
+#define sys_intern_dup		Perl_sys_intern_dup
+#endif
+#define Perl_ptr_table_new	CPerlObj::Perl_ptr_table_new
+#define ptr_table_new		Perl_ptr_table_new
+#define Perl_ptr_table_fetch	CPerlObj::Perl_ptr_table_fetch
+#define ptr_table_fetch		Perl_ptr_table_fetch
+#define Perl_ptr_table_store	CPerlObj::Perl_ptr_table_store
+#define ptr_table_store		Perl_ptr_table_store
+#define Perl_ptr_table_split	CPerlObj::Perl_ptr_table_split
+#define ptr_table_split		Perl_ptr_table_split
+#endif
 #if defined(PERL_OBJECT)
+#else
 #endif
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
 #define S_avhv_index_sv		CPerlObj::S_avhv_index_sv
@@ -4300,6 +4429,8 @@
 #define is_handle_constructor	S_is_handle_constructor
 #define S_gv_ename		CPerlObj::S_gv_ename
 #define gv_ename		S_gv_ename
+#define S_cv_dump		CPerlObj::S_cv_dump
+#define cv_dump			S_cv_dump
 #define S_cv_clone2		CPerlObj::S_cv_clone2
 #define cv_clone2		S_cv_clone2
 #define S_scalar_mod_type	CPerlObj::S_scalar_mod_type
@@ -4458,8 +4589,22 @@
 #define nextchar		S_nextchar
 #define S_dumpuntil		CPerlObj::S_dumpuntil
 #define dumpuntil		S_dumpuntil
+#define S_put_byte		CPerlObj::S_put_byte
+#define put_byte		S_put_byte
 #define S_scan_commit		CPerlObj::S_scan_commit
 #define scan_commit		S_scan_commit
+#define S_cl_anything		CPerlObj::S_cl_anything
+#define cl_anything		S_cl_anything
+#define S_cl_is_anything	CPerlObj::S_cl_is_anything
+#define cl_is_anything		S_cl_is_anything
+#define S_cl_init		CPerlObj::S_cl_init
+#define cl_init			S_cl_init
+#define S_cl_init_zero		CPerlObj::S_cl_init_zero
+#define cl_init_zero		S_cl_init_zero
+#define S_cl_and		CPerlObj::S_cl_and
+#define cl_and			S_cl_and
+#define S_cl_or			CPerlObj::S_cl_or
+#define cl_or			S_cl_or
 #define S_study_chunk		CPerlObj::S_study_chunk
 #define study_chunk		S_study_chunk
 #define S_add_data		CPerlObj::S_add_data
@@ -4496,6 +4641,8 @@
 #define reghop			S_reghop
 #define S_reghopmaybe		CPerlObj::S_reghopmaybe
 #define reghopmaybe		S_reghopmaybe
+#define S_find_byclass		CPerlObj::S_find_byclass
+#define find_byclass		S_find_byclass
 #endif
 #if defined(PERL_IN_RUN_C) || defined(PERL_DECL_PROT)
 #define S_debprof		CPerlObj::S_debprof
@@ -4700,6 +4847,8 @@
 #define xstat			S_xstat
 #  endif
 #endif
+#if defined(PERL_OBJECT)
+#endif
 #define Perl_ck_anoncode	CPerlObj::Perl_ck_anoncode
 #define ck_anoncode		Perl_ck_anoncode
 #define Perl_ck_bitop		CPerlObj::Perl_ck_bitop