|
 |
d6f9e4d |
From 282d9dfeb4cea3c2d0335ba78faa3a9db931f1ec Mon Sep 17 00:00:00 2001
|
|
|
d6f9e4d |
From: David Mitchell <davem@iabyn.com>
|
|
|
d6f9e4d |
Date: Tue, 11 Aug 2020 13:58:51 +0100
|
|
|
d6f9e4d |
Subject: [PATCH] list assign in list context: honour LHS undef
|
|
|
d6f9e4d |
MIME-Version: 1.0
|
|
|
d6f9e4d |
Content-Type: text/plain; charset=UTF-8
|
|
|
d6f9e4d |
Content-Transfer-Encoding: 8bit
|
|
|
d6f9e4d |
|
|
|
d6f9e4d |
GH #16685
|
|
|
d6f9e4d |
|
|
|
d6f9e4d |
In
|
|
|
d6f9e4d |
|
|
|
d6f9e4d |
@a = ($x, undef, undef) = (1))
|
|
|
d6f9e4d |
|
|
|
d6f9e4d |
@a should have 3 elements. v5.25.6-79-gb09ed995ad broke this and was
|
|
|
d6f9e4d |
returning one element.
|
|
|
d6f9e4d |
|
|
|
d6f9e4d |
The fix is simple: that previous commit made it so that elements were
|
|
|
d6f9e4d |
pushed back onto the stack only if they weren't immortal, so
|
|
|
d6f9e4d |
&PL_sv_undef was getting skipped. Make it so they always are.
|
|
|
d6f9e4d |
|
|
|
d6f9e4d |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
d6f9e4d |
---
|
|
|
d6f9e4d |
pp_hot.c | 2 +-
|
|
|
d6f9e4d |
t/op/aassign.t | 10 +++++++++-
|
|
|
d6f9e4d |
2 files changed, 10 insertions(+), 2 deletions(-)
|
|
|
d6f9e4d |
|
|
|
d6f9e4d |
diff --git a/pp_hot.c b/pp_hot.c
|
|
|
d6f9e4d |
index e9f1ffe7a4..3564dd7e12 100644
|
|
|
d6f9e4d |
--- a/pp_hot.c
|
|
|
d6f9e4d |
+++ b/pp_hot.c
|
|
|
d6f9e4d |
@@ -2743,8 +2743,8 @@ PP(pp_aassign)
|
|
|
d6f9e4d |
if (!SvIMMORTAL(lsv)) {
|
|
|
d6f9e4d |
sv_set_undef(lsv);
|
|
|
d6f9e4d |
SvSETMAGIC(lsv);
|
|
|
d6f9e4d |
- *relem++ = lsv;
|
|
|
d6f9e4d |
}
|
|
|
d6f9e4d |
+ *relem++ = lsv;
|
|
|
d6f9e4d |
break;
|
|
|
d6f9e4d |
} /* switch */
|
|
|
d6f9e4d |
} /* while */
|
|
|
d6f9e4d |
diff --git a/t/op/aassign.t b/t/op/aassign.t
|
|
|
d6f9e4d |
index 9128f9fd98..aa1f2c722c 100644
|
|
|
d6f9e4d |
--- a/t/op/aassign.t
|
|
|
d6f9e4d |
+++ b/t/op/aassign.t
|
|
|
d6f9e4d |
@@ -595,7 +595,7 @@ SKIP: {
|
|
|
d6f9e4d |
}
|
|
|
d6f9e4d |
|
|
|
d6f9e4d |
{
|
|
|
d6f9e4d |
- # GH #17816
|
|
|
d6f9e4d |
+ # GH #16685
|
|
|
d6f9e4d |
# don't use the "1-arg on LHS can't be common" optimisation
|
|
|
d6f9e4d |
# when there are undef's there
|
|
|
d6f9e4d |
my $x = 1;
|
|
|
d6f9e4d |
@@ -603,5 +603,13 @@ SKIP: {
|
|
|
d6f9e4d |
is("@a", "2 1", "GH #17816");
|
|
|
d6f9e4d |
}
|
|
|
d6f9e4d |
|
|
|
d6f9e4d |
+{
|
|
|
d6f9e4d |
+ # GH #17816
|
|
|
d6f9e4d |
+ # honour trailing undef's in list context
|
|
|
d6f9e4d |
+ my $x = 1;
|
|
|
d6f9e4d |
+ my @a = (($x, undef, undef) = (1));
|
|
|
d6f9e4d |
+ is(scalar @a, 3, "GH #17816");
|
|
|
d6f9e4d |
+}
|
|
|
d6f9e4d |
+
|
|
|
d6f9e4d |
|
|
|
d6f9e4d |
done_testing();
|
|
|
d6f9e4d |
--
|
|
|
d6f9e4d |
2.25.4
|
|
|
d6f9e4d |
|