update repository copy of Asmdata.pm after `perl bytecode.pl`

p4raw-id: //depot/perl@1154

diff --git a/ext/B/B/Asmdata.pm b/ext/B/B/Asmdata.pm
index b1df379..b77f150 100644 (file)
--- a/ext/B/B/Asmdata.pm
+++ b/ext/B/B/Asmdata.pm
@@ -20,11 +20,11 @@ use vars qw(%insn_data @insn_name @optype @specialsv_name);
 # XXX insn_data is initialised this way because with a large
 # %insn_data = (foo => [...], bar => [...], ...) initialiser
 # I get a hard-to-track-down stack underflow and segfault.
-$insn_data{comment} = [35, \&PUT_comment, "GET_comment"];
+$insn_data{comment} = [35, \&PUT_comment_t, "GET_comment_t"];
 $insn_data{nop} = [10, \&PUT_none, "GET_none"];
 $insn_data{ret} = [0, \&PUT_none, "GET_none"];
-$insn_data{ldsv} = [1, \&PUT_objindex, "GET_objindex"];
-$insn_data{ldop} = [2, \&PUT_objindex, "GET_objindex"];
+$insn_data{ldsv} = [1, \&PUT_svindex, "GET_svindex"];
+$insn_data{ldop} = [2, \&PUT_opindex, "GET_opindex"];
 $insn_data{stsv} = [3, \&PUT_U32, "GET_U32"];
 $insn_data{stop} = [4, \&PUT_U32, "GET_U32"];
 $insn_data{ldspecsv} = [5, \&PUT_U8, "GET_U8"];
@@ -38,14 +38,14 @@ $insn_data{sv_upgrade} = [13, \&PUT_U8, "GET_U8"];
 $insn_data{sv_refcnt} = [14, \&PUT_U32, "GET_U32"];
 $insn_data{sv_refcnt_add} = [15, \&PUT_I32, "GET_I32"];
 $insn_data{sv_flags} = [16, \&PUT_U32, "GET_U32"];
-$insn_data{xrv} = [17, \&PUT_objindex, "GET_objindex"];
+$insn_data{xrv} = [17, \&PUT_svindex, "GET_svindex"];
 $insn_data{xpv} = [18, \&PUT_none, "GET_none"];
 $insn_data{xiv32} = [19, \&PUT_I32, "GET_I32"];
 $insn_data{xiv64} = [20, \&PUT_IV64, "GET_IV64"];
 $insn_data{xnv} = [21, \&PUT_double, "GET_double"];
 $insn_data{xlv_targoff} = [22, \&PUT_U32, "GET_U32"];
 $insn_data{xlv_targlen} = [23, \&PUT_U32, "GET_U32"];
-$insn_data{xlv_targ} = [24, \&PUT_objindex, "GET_objindex"];
+$insn_data{xlv_targ} = [24, \&PUT_svindex, "GET_svindex"];
 $insn_data{xlv_type} = [25, \&PUT_U8, "GET_U8"];
 $insn_data{xbm_useful} = [26, \&PUT_I32, "GET_I32"];
 $insn_data{xbm_previous} = [27, \&PUT_U16, "GET_U16"];
@@ -56,89 +56,89 @@ $insn_data{xio_page} = [31, \&PUT_I32, "GET_I32"];
 $insn_data{xio_page_len} = [32, \&PUT_I32, "GET_I32"];
 $insn_data{xio_lines_left} = [33, \&PUT_I32, "GET_I32"];
 $insn_data{xio_top_name} = [34, \&PUT_pvcontents, "GET_pvcontents"];
-$insn_data{xio_top_gv} = [36, \&PUT_objindex, "GET_objindex"];
+$insn_data{xio_top_gv} = [36, \&PUT_svindex, "GET_svindex"];
 $insn_data{xio_fmt_name} = [37, \&PUT_pvcontents, "GET_pvcontents"];
-$insn_data{xio_fmt_gv} = [38, \&PUT_objindex, "GET_objindex"];
+$insn_data{xio_fmt_gv} = [38, \&PUT_svindex, "GET_svindex"];
 $insn_data{xio_bottom_name} = [39, \&PUT_pvcontents, "GET_pvcontents"];
-$insn_data{xio_bottom_gv} = [40, \&PUT_objindex, "GET_objindex"];
+$insn_data{xio_bottom_gv} = [40, \&PUT_svindex, "GET_svindex"];
 $insn_data{xio_subprocess} = [41, \&PUT_U16, "GET_U16"];
 $insn_data{xio_type} = [42, \&PUT_U8, "GET_U8"];
 $insn_data{xio_flags} = [43, \&PUT_U8, "GET_U8"];
-$insn_data{xcv_stash} = [44, \&PUT_objindex, "GET_objindex"];
-$insn_data{xcv_start} = [45, \&PUT_objindex, "GET_objindex"];
-$insn_data{xcv_root} = [46, \&PUT_objindex, "GET_objindex"];
-$insn_data{xcv_gv} = [47, \&PUT_objindex, "GET_objindex"];
-$insn_data{xcv_filegv} = [48, \&PUT_objindex, "GET_objindex"];
+$insn_data{xcv_stash} = [44, \&PUT_svindex, "GET_svindex"];
+$insn_data{xcv_start} = [45, \&PUT_opindex, "GET_opindex"];
+$insn_data{xcv_root} = [46, \&PUT_opindex, "GET_opindex"];
+$insn_data{xcv_gv} = [47, \&PUT_svindex, "GET_svindex"];
+$insn_data{xcv_filegv} = [48, \&PUT_svindex, "GET_svindex"];
 $insn_data{xcv_depth} = [49, \&PUT_I32, "GET_I32"];
-$insn_data{xcv_padlist} = [50, \&PUT_objindex, "GET_objindex"];
-$insn_data{xcv_outside} = [51, \&PUT_objindex, "GET_objindex"];
+$insn_data{xcv_padlist} = [50, \&PUT_svindex, "GET_svindex"];
+$insn_data{xcv_outside} = [51, \&PUT_svindex, "GET_svindex"];
 $insn_data{xcv_flags} = [52, \&PUT_U8, "GET_U8"];
 $insn_data{av_extend} = [53, \&PUT_I32, "GET_I32"];
-$insn_data{av_push} = [54, \&PUT_objindex, "GET_objindex"];
+$insn_data{av_push} = [54, \&PUT_svindex, "GET_svindex"];
 $insn_data{xav_fill} = [55, \&PUT_I32, "GET_I32"];
 $insn_data{xav_max} = [56, \&PUT_I32, "GET_I32"];
 $insn_data{xav_flags} = [57, \&PUT_U8, "GET_U8"];
 $insn_data{xhv_riter} = [58, \&PUT_I32, "GET_I32"];
 $insn_data{xhv_name} = [59, \&PUT_pvcontents, "GET_pvcontents"];
-$insn_data{hv_store} = [60, \&PUT_objindex, "GET_objindex"];
+$insn_data{hv_store} = [60, \&PUT_svindex, "GET_svindex"];
 $insn_data{sv_magic} = [61, \&PUT_U8, "GET_U8"];
-$insn_data{mg_obj} = [62, \&PUT_objindex, "GET_objindex"];
+$insn_data{mg_obj} = [62, \&PUT_svindex, "GET_svindex"];
 $insn_data{mg_private} = [63, \&PUT_U16, "GET_U16"];
 $insn_data{mg_flags} = [64, \&PUT_U8, "GET_U8"];
 $insn_data{mg_pv} = [65, \&PUT_pvcontents, "GET_pvcontents"];
-$insn_data{xmg_stash} = [66, \&PUT_objindex, "GET_objindex"];
+$insn_data{xmg_stash} = [66, \&PUT_svindex, "GET_svindex"];
 $insn_data{gv_fetchpv} = [67, \&PUT_strconst, "GET_strconst"];
 $insn_data{gv_stashpv} = [68, \&PUT_strconst, "GET_strconst"];
-$insn_data{gp_sv} = [69, \&PUT_objindex, "GET_objindex"];
+$insn_data{gp_sv} = [69, \&PUT_svindex, "GET_svindex"];
 $insn_data{gp_refcnt} = [70, \&PUT_U32, "GET_U32"];
 $insn_data{gp_refcnt_add} = [71, \&PUT_I32, "GET_I32"];
-$insn_data{gp_av} = [72, \&PUT_objindex, "GET_objindex"];
-$insn_data{gp_hv} = [73, \&PUT_objindex, "GET_objindex"];
-$insn_data{gp_cv} = [74, \&PUT_objindex, "GET_objindex"];
-$insn_data{gp_filegv} = [75, \&PUT_objindex, "GET_objindex"];
-$insn_data{gp_io} = [76, \&PUT_objindex, "GET_objindex"];
-$insn_data{gp_form} = [77, \&PUT_objindex, "GET_objindex"];
+$insn_data{gp_av} = [72, \&PUT_svindex, "GET_svindex"];
+$insn_data{gp_hv} = [73, \&PUT_svindex, "GET_svindex"];
+$insn_data{gp_cv} = [74, \&PUT_svindex, "GET_svindex"];
+$insn_data{gp_filegv} = [75, \&PUT_svindex, "GET_svindex"];
+$insn_data{gp_io} = [76, \&PUT_svindex, "GET_svindex"];
+$insn_data{gp_form} = [77, \&PUT_svindex, "GET_svindex"];
 $insn_data{gp_cvgen} = [78, \&PUT_U32, "GET_U32"];
 $insn_data{gp_line} = [79, \&PUT_U16, "GET_U16"];
-$insn_data{gp_share} = [80, \&PUT_objindex, "GET_objindex"];
+$insn_data{gp_share} = [80, \&PUT_svindex, "GET_svindex"];
 $insn_data{xgv_flags} = [81, \&PUT_U8, "GET_U8"];
-$insn_data{op_next} = [82, \&PUT_objindex, "GET_objindex"];
-$insn_data{op_sibling} = [83, \&PUT_objindex, "GET_objindex"];
+$insn_data{op_next} = [82, \&PUT_opindex, "GET_opindex"];
+$insn_data{op_sibling} = [83, \&PUT_opindex, "GET_opindex"];
 $insn_data{op_ppaddr} = [84, \&PUT_strconst, "GET_strconst"];
 $insn_data{op_targ} = [85, \&PUT_U32, "GET_U32"];
 $insn_data{op_type} = [86, \&PUT_U16, "GET_U16"];
 $insn_data{op_seq} = [87, \&PUT_U16, "GET_U16"];
 $insn_data{op_flags} = [88, \&PUT_U8, "GET_U8"];
 $insn_data{op_private} = [89, \&PUT_U8, "GET_U8"];
-$insn_data{op_first} = [90, \&PUT_objindex, "GET_objindex"];
-$insn_data{op_last} = [91, \&PUT_objindex, "GET_objindex"];
-$insn_data{op_other} = [92, \&PUT_objindex, "GET_objindex"];
-$insn_data{op_true} = [93, \&PUT_objindex, "GET_objindex"];
-$insn_data{op_false} = [94, \&PUT_objindex, "GET_objindex"];
+$insn_data{op_first} = [90, \&PUT_opindex, "GET_opindex"];
+$insn_data{op_last} = [91, \&PUT_opindex, "GET_opindex"];
+$insn_data{op_other} = [92, \&PUT_opindex, "GET_opindex"];
+$insn_data{op_true} = [93, \&PUT_opindex, "GET_opindex"];
+$insn_data{op_false} = [94, \&PUT_opindex, "GET_opindex"];
 $insn_data{op_children} = [95, \&PUT_U32, "GET_U32"];
-$insn_data{op_pmreplroot} = [96, \&PUT_objindex, "GET_objindex"];
-$insn_data{op_pmreplrootgv} = [97, \&PUT_objindex, "GET_objindex"];
-$insn_data{op_pmreplstart} = [98, \&PUT_objindex, "GET_objindex"];
-$insn_data{op_pmnext} = [99, \&PUT_objindex, "GET_objindex"];
+$insn_data{op_pmreplroot} = [96, \&PUT_opindex, "GET_opindex"];
+$insn_data{op_pmreplrootgv} = [97, \&PUT_svindex, "GET_svindex"];
+$insn_data{op_pmreplstart} = [98, \&PUT_opindex, "GET_opindex"];
+$insn_data{op_pmnext} = [99, \&PUT_opindex, "GET_opindex"];
 $insn_data{pregcomp} = [100, \&PUT_pvcontents, "GET_pvcontents"];
 $insn_data{op_pmflags} = [101, \&PUT_U16, "GET_U16"];
 $insn_data{op_pmpermflags} = [102, \&PUT_U16, "GET_U16"];
-$insn_data{op_sv} = [103, \&PUT_objindex, "GET_objindex"];
-$insn_data{op_gv} = [104, \&PUT_objindex, "GET_objindex"];
+$insn_data{op_sv} = [103, \&PUT_svindex, "GET_svindex"];
+$insn_data{op_gv} = [104, \&PUT_svindex, "GET_svindex"];
 $insn_data{op_pv} = [105, \&PUT_pvcontents, "GET_pvcontents"];
 $insn_data{op_pv_tr} = [106, \&PUT_op_tr_array, "GET_op_tr_array"];
-$insn_data{op_redoop} = [107, \&PUT_objindex, "GET_objindex"];
-$insn_data{op_nextop} = [108, \&PUT_objindex, "GET_objindex"];
-$insn_data{op_lastop} = [109, \&PUT_objindex, "GET_objindex"];
+$insn_data{op_redoop} = [107, \&PUT_opindex, "GET_opindex"];
+$insn_data{op_nextop} = [108, \&PUT_opindex, "GET_opindex"];
+$insn_data{op_lastop} = [109, \&PUT_opindex, "GET_opindex"];
 $insn_data{cop_label} = [110, \&PUT_pvcontents, "GET_pvcontents"];
-$insn_data{cop_stash} = [111, \&PUT_objindex, "GET_objindex"];
-$insn_data{cop_filegv} = [112, \&PUT_objindex, "GET_objindex"];
+$insn_data{cop_stash} = [111, \&PUT_svindex, "GET_svindex"];
+$insn_data{cop_filegv} = [112, \&PUT_svindex, "GET_svindex"];
 $insn_data{cop_seq} = [113, \&PUT_U32, "GET_U32"];
 $insn_data{cop_arybase} = [114, \&PUT_I32, "GET_I32"];
 $insn_data{cop_line} = [115, \&PUT_U16, "GET_U16"];
-$insn_data{main_start} = [116, \&PUT_objindex, "GET_objindex"];
-$insn_data{main_root} = [117, \&PUT_objindex, "GET_objindex"];
-$insn_data{curpad} = [118, \&PUT_objindex, "GET_objindex"];
+$insn_data{main_start} = [116, \&PUT_opindex, "GET_opindex"];
+$insn_data{main_root} = [117, \&PUT_opindex, "GET_opindex"];
+$insn_data{curpad} = [118, \&PUT_svindex, "GET_svindex"];
 
 my ($insn_name, $insn_data);
 while (($insn_name, $insn_data) = each %insn_data) {

diff --git a/regcomp.c b/regcomp.c
index 45f1e9a..2b71d99 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -267,6 +267,10 @@ study_chunk(regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32
            /* Allow dumping */
            n = scan + (*OPERAND(scan) + 2 - 1)/sizeof(regnode) + 2;
            while (n <= stop) {
+               /* Purify reports a benign UMR here sometimes, because we
+                * don't initialize the OP() slot of a node when that node
+                * is occupied by just the trailing null of the string in
+                * an EXACT node */
                if (regkind[(U8)OP(n)] != NOTHING || OP(n) == NOTHING) {
                    OP(n) = OPTIMIZED;
                    NEXT_OFF(n) = 0;