Re: 5.6.*, bleadperl: bugs in pp_concat

Message-Id: <200105261605.RAA12295@crypt.compulink.co.uk>

p4raw-id: //depot/perl@10223

1 files changed, 24 insertions, 12 deletions

diff --git a/embed.h b/embed.h
index fce8a2ee02..4acb7f3f0c 100644
--- a/embed.h
+++ b/embed.h
@@ -642,7 +642,6 @@
 #define sv_2iv			Perl_sv_2iv
 #define sv_2mortal		Perl_sv_2mortal
 #define sv_2nv			Perl_sv_2nv
-#define sv_2pv			Perl_sv_2pv
 #define sv_2pvutf8		Perl_sv_2pvutf8
 #define sv_2pvbyte		Perl_sv_2pvbyte
 #define sv_2uv			Perl_sv_2uv
@@ -659,8 +658,6 @@
 #define sv_catpvf		Perl_sv_catpvf
 #define sv_vcatpvf		Perl_sv_vcatpvf
 #define sv_catpv		Perl_sv_catpv
-#define sv_catpvn		Perl_sv_catpvn
-#define sv_catsv		Perl_sv_catsv
 #define sv_chop			Perl_sv_chop
 #define sv_clean_all		Perl_sv_clean_all
 #define sv_clean_objs		Perl_sv_clean_objs
@@ -692,7 +689,6 @@
 #define sv_peek			Perl_sv_peek
 #define sv_pos_u2b		Perl_sv_pos_u2b
 #define sv_pos_b2u		Perl_sv_pos_b2u
-#define sv_pvn_force		Perl_sv_pvn_force
 #define sv_pvutf8n_force	Perl_sv_pvutf8n_force
 #define sv_pvbyten_force	Perl_sv_pvbyten_force
 #define sv_reftype		Perl_sv_reftype
@@ -712,7 +708,6 @@
 #define sv_setref_pvn		Perl_sv_setref_pvn
 #define sv_setpv		Perl_sv_setpv
 #define sv_setpvn		Perl_sv_setpvn
-#define sv_setsv		Perl_sv_setsv
 #define sv_taint		Perl_sv_taint
 #define sv_tainted		Perl_sv_tainted
 #define sv_unmagic		Perl_sv_unmagic
@@ -832,7 +827,6 @@
 #define sv_pv			Perl_sv_pv
 #define sv_pvutf8		Perl_sv_pvutf8
 #define sv_pvbyte		Perl_sv_pvbyte
-#define sv_utf8_upgrade		Perl_sv_utf8_upgrade
 #define sv_utf8_downgrade	Perl_sv_utf8_downgrade
 #define sv_utf8_encode		Perl_sv_utf8_encode
 #define sv_utf8_decode		Perl_sv_utf8_decode
@@ -1176,6 +1170,12 @@
 #endif
 #if defined(PERL_OBJECT)
 #endif
+#define sv_setsv_flags		Perl_sv_setsv_flags
+#define sv_catpvn_flags		Perl_sv_catpvn_flags
+#define sv_catsv_flags		Perl_sv_catsv_flags
+#define sv_utf8_upgrade_flags	Perl_sv_utf8_upgrade_flags
+#define sv_pvn_force_flags	Perl_sv_pvn_force_flags
+#define sv_2pv_flags		Perl_sv_2pv_flags
 #define ck_anoncode		Perl_ck_anoncode
 #define ck_bitop		Perl_ck_bitop
 #define ck_concat		Perl_ck_concat
@@ -2138,7 +2138,6 @@
 #define sv_2iv(a)		Perl_sv_2iv(aTHX_ a)
 #define sv_2mortal(a)		Perl_sv_2mortal(aTHX_ a)
 #define sv_2nv(a)		Perl_sv_2nv(aTHX_ a)
-#define sv_2pv(a,b)		Perl_sv_2pv(aTHX_ a,b)
 #define sv_2pvutf8(a,b)		Perl_sv_2pvutf8(aTHX_ a,b)
 #define sv_2pvbyte(a,b)		Perl_sv_2pvbyte(aTHX_ a,b)
 #define sv_2uv(a)		Perl_sv_2uv(aTHX_ a)
@@ -2154,8 +2153,6 @@
 #define sv_bless(a,b)		Perl_sv_bless(aTHX_ a,b)
 #define sv_vcatpvf(a,b,c)	Perl_sv_vcatpvf(aTHX_ a,b,c)
 #define sv_catpv(a,b)		Perl_sv_catpv(aTHX_ a,b)
-#define sv_catpvn(a,b,c)	Perl_sv_catpvn(aTHX_ a,b,c)
-#define sv_catsv(a,b)		Perl_sv_catsv(aTHX_ a,b)
 #define sv_chop(a,b)		Perl_sv_chop(aTHX_ a,b)
 #define sv_clean_all()		Perl_sv_clean_all(aTHX)
 #define sv_clean_objs()		Perl_sv_clean_objs(aTHX)
@@ -2187,7 +2184,6 @@
 #define sv_peek(a)		Perl_sv_peek(aTHX_ a)
 #define sv_pos_u2b(a,b,c)	Perl_sv_pos_u2b(aTHX_ a,b,c)
 #define sv_pos_b2u(a,b)		Perl_sv_pos_b2u(aTHX_ a,b)
-#define sv_pvn_force(a,b)	Perl_sv_pvn_force(aTHX_ a,b)
 #define sv_pvutf8n_force(a,b)	Perl_sv_pvutf8n_force(aTHX_ a,b)
 #define sv_pvbyten_force(a,b)	Perl_sv_pvbyten_force(aTHX_ a,b)
 #define sv_reftype(a,b)		Perl_sv_reftype(aTHX_ a,b)
@@ -2206,7 +2202,6 @@
 #define sv_setref_pvn(a,b,c,d)	Perl_sv_setref_pvn(aTHX_ a,b,c,d)
 #define sv_setpv(a,b)		Perl_sv_setpv(aTHX_ a,b)
 #define sv_setpvn(a,b,c)	Perl_sv_setpvn(aTHX_ a,b,c)
-#define sv_setsv(a,b)		Perl_sv_setsv(aTHX_ a,b)
 #define sv_taint(a)		Perl_sv_taint(aTHX_ a)
 #define sv_tainted(a)		Perl_sv_tainted(aTHX_ a)
 #define sv_unmagic(a,b)		Perl_sv_unmagic(aTHX_ a,b)
@@ -2320,7 +2315,6 @@
 #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_utf8_upgrade(a)	Perl_sv_utf8_upgrade(aTHX_ a)
 #define sv_utf8_downgrade(a,b)	Perl_sv_utf8_downgrade(aTHX_ a,b)
 #define sv_utf8_encode(a)	Perl_sv_utf8_encode(aTHX_ a)
 #define sv_utf8_decode(a)	Perl_sv_utf8_decode(aTHX_ a)
@@ -2663,6 +2657,12 @@
 #endif
 #if defined(PERL_OBJECT)
 #endif
+#define sv_setsv_flags(a,b,c)	Perl_sv_setsv_flags(aTHX_ a,b,c)
+#define sv_catpvn_flags(a,b,c,d)	Perl_sv_catpvn_flags(aTHX_ a,b,c,d)
+#define sv_catsv_flags(a,b,c)	Perl_sv_catsv_flags(aTHX_ a,b,c)
+#define sv_utf8_upgrade_flags(a,b)	Perl_sv_utf8_upgrade_flags(aTHX_ a,b)
+#define sv_pvn_force_flags(a,b,c)	Perl_sv_pvn_force_flags(aTHX_ a,b,c)
+#define sv_2pv_flags(a,b,c)	Perl_sv_2pv_flags(aTHX_ a,b,c)
 #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)
@@ -5166,6 +5166,18 @@
 #endif
 #if defined(PERL_OBJECT)
 #endif
+#define Perl_sv_setsv_flags	CPerlObj::Perl_sv_setsv_flags
+#define sv_setsv_flags		Perl_sv_setsv_flags
+#define Perl_sv_catpvn_flags	CPerlObj::Perl_sv_catpvn_flags
+#define sv_catpvn_flags		Perl_sv_catpvn_flags
+#define Perl_sv_catsv_flags	CPerlObj::Perl_sv_catsv_flags
+#define sv_catsv_flags		Perl_sv_catsv_flags
+#define Perl_sv_utf8_upgrade_flags	CPerlObj::Perl_sv_utf8_upgrade_flags
+#define sv_utf8_upgrade_flags	Perl_sv_utf8_upgrade_flags
+#define Perl_sv_pvn_force_flags	CPerlObj::Perl_sv_pvn_force_flags
+#define sv_pvn_force_flags	Perl_sv_pvn_force_flags
+#define Perl_sv_2pv_flags	CPerlObj::Perl_sv_2pv_flags
+#define sv_2pv_flags		Perl_sv_2pv_flags
 #define Perl_ck_anoncode	CPerlObj::Perl_ck_anoncode
 #define ck_anoncode		Perl_ck_anoncode
 #define Perl_ck_bitop		CPerlObj::Perl_ck_bitop