From: Richard Leach Date: Tue, 20 Sep 2022 21:16:06 +0000 (+0200) Subject: Add support for 5.37.3's PADSV_STORE optimization X-Git-Tag: rt144052^0 X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FVariable-Magic.git;a=commitdiff_plain;h=33e50e22dc4df6fd53e90e57e4bab26b46a315cb Add support for 5.37.3's PADSV_STORE optimization Teach B.pm-related tests about this new thing. This fixes RT #144052. --- diff --git a/t/18-opinfo.t b/t/18-opinfo.t index bcc70a0..0147a6c 100644 --- a/t/18-opinfo.t +++ b/t/18-opinfo.t @@ -16,10 +16,19 @@ my $is_5130_release = ("$]" == 5.013 && !$Config{git_describe}) ? 1 : 0; my $aelem = "$]" <= 5.008_003 ? 'aelem' : ("$]" < 5.013 or $is_5130_release) ? 'aelemfast' - : 'sassign'; -my $aelemf = ("$]" < 5.013 or $is_5130_release) ? 'aelemfast' : 'sassign'; -my $aelemf_op = ($aelemf eq 'sassign') - ? 'B::BINOP' : $Config{useithreads} ? 'B::PADOP' : 'B::SVOP'; + : ("$]" < 5.037_003) + ? 'sassign' + : 'padsv_store'; +my $aelemf = ("$]" < 5.013 or $is_5130_release) ? 'aelemfast' + : ("$]" < 5.037_003) ? 'sassign' + : 'padsv_store'; + +my $assign_op = ("$]" < 5.037_003) ? 'sassign': 'padsv_store'; +my $assign_op_cl = ("$]" < 5.037_003) ? 'B::BINOP': 'B::UNOP'; + +my $aelemf_op = ($aelemf eq 'sassign') ? 'B::BINOP' + : ($aelemf eq 'padsv_store') ? 'B::UNOP' + : $Config{useithreads} ? 'B::PADOP' : 'B::SVOP'; my $meth_op = ("$]" < 5.021_005) ? 'B::SVOP' : 'B::METHOP'; my $trutf_op = ($Config{useithreads} && "$]" >= 5.008_009) ? 'B::PADOP' : 'B::SVOP'; @@ -36,7 +45,7 @@ my @tests = ( [ $deref, $deref_op ] ], [ 'get', '$c', 'my $c = 1', '++$c', [ 'preinc', 'B::UNOP' ] ], [ 'get', '$c', 'my $c = 1', '$c ** 2', [ 'pow', 'B::BINOP' ] ], - [ 'get', '$c', 'my $c = 1', 'my $x = $c', [ 'sassign', 'B::BINOP' ] ], + [ 'get', '$c', 'my $c = 1', 'my $x = $c', [ $assign_op, $assign_op_cl ] ], [ 'get', '$c', 'my $c = 1', '1 if $c', [ 'and', 'B::LOGOP' ] ], [ 'get', '$c', 'my $c = []', 'ref $c', [ 'ref', 'B::UNOP' ] ], [ 'get', '$c', 'my $c = $0', '-f $c', [ 'ftfile', 'B::UNOP' ] ], diff --git a/t/40-threads.t b/t/40-threads.t index 151116b..85d5193 100644 --- a/t/40-threads.t +++ b/t/40-threads.t @@ -33,12 +33,15 @@ sub try { set => sub { my $op = $_[-1]; + my $assign_op = ("$]" < 5.037_003) ? 'sassign': 'padsv_store'; + my $assign_op_cl = ("$]" < 5.037_003) ? 'B::BINOP': 'B::UNOP'; + if ($op_info eq 'object') { is_deeply { class => ref($op), name => $op->name }, - { class => 'B::BINOP', name => 'sassign' }, + { class => $assign_op_cl, name => $assign_op }, "op object in thread $tid is correct"; } else { - is $op, 'sassign', "op name in thread $tid is correct"; + is $op, $assign_op, "op name in thread $tid is correct"; } return 0; diff --git a/t/41-clone.t b/t/41-clone.t index 2058cc5..a35a2a5 100644 --- a/t/41-clone.t +++ b/t/41-clone.t @@ -32,12 +32,15 @@ sub spawn_wiz { my $op = $_[-1]; my $tid = threads->tid(); + my $assign_op = ("$]" < 5.037_003) ? 'sassign': 'padsv_store'; + my $assign_op_cl = ("$]" < 5.037_003) ? 'B::BINOP': 'B::UNOP'; + if ($op_info == VMG_OP_INFO_OBJECT) { is_deeply { class => ref($op), name => $op->name }, - { class => 'B::BINOP', name => 'sassign' }, + { class => $assign_op_cl, name => $assign_op }, "op object in thread $tid is correct"; } else { - is $op, 'sassign', "op name in thread $tid is correct"; + is $op, $assign_op, "op name in thread $tid is correct"; } return 0