From 1b4e226a1e0bfa1c2e700c5a2e2159a298d8050e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 27 Aug 2020 14:11:43 +0200
Subject: [PATCH] Fix sorting with a block that calls return

---
 perl-5.33.1-sort-return-foo.patch | 77 +++++++++++++++++++++++++++++++
 perl.spec                         |  7 +++
 2 files changed, 84 insertions(+)
 create mode 100644 perl-5.33.1-sort-return-foo.patch

diff --git a/perl-5.33.1-sort-return-foo.patch b/perl-5.33.1-sort-return-foo.patch
new file mode 100644
index 0000000..8dbd121
--- /dev/null
+++ b/perl-5.33.1-sort-return-foo.patch
@@ -0,0 +1,77 @@
+From 390fe0c0d09aadc66f644e9eee4aa1245221188c Mon Sep 17 00:00:00 2001
+From: David Mitchell <davem@iabyn.com>
+Date: Tue, 25 Aug 2020 13:15:25 +0100
+Subject: [PATCH] sort { return foo() } ...
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GH #18081
+
+A sub call via return in a sort block was called in void rather than
+scalar context, causing the comparison result to be discarded.
+
+This because when a sort block is called it is not a real function
+call, even though a sort block can be returned from. Instead, a
+CXt_NULL is pushed on the context stack. Because this isn't a sub-ish
+context type (unlike CXt_SUB, CXt_EVAL etc) there is no 'caller sub'
+on the context stack to be found to retrieve the caller's context
+(i.e. cx->cx_gimme).
+
+This commit fixes it by special-casing Perl_gimme_V().
+
+Ideally at some future point, a new context type, CXt_SORT, should be
+added. This would be used instead of CXt_NULL when a sort BLOCK is
+called. Like other sub-ish context types, it would have an old_cxsubix
+field and PL_curstackinfo->si_cxsubix would point to it. This would
+eliminate needing special-case handling in places like Perl_gimme_V().
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ inline.h    |  2 +-
+ t/op/sort.t | 12 +++++++++++-
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/inline.h b/inline.h
+index a8240efb9c..6fbd5abfea 100644
+--- a/inline.h
++++ b/inline.h
+@@ -2086,7 +2086,7 @@ Perl_gimme_V(pTHX)
+         return gimme;
+     cxix = PL_curstackinfo->si_cxsubix;
+     if (cxix < 0)
+-        return G_VOID;
++        return PL_curstackinfo->si_type == PERLSI_SORT ? G_SCALAR: G_VOID;
+     assert(cxstack[cxix].blk_gimme & G_WANT);
+     return (cxstack[cxix].blk_gimme & G_WANT);
+ }
+diff --git a/t/op/sort.t b/t/op/sort.t
+index f2e139dff0..8e387fb90d 100644
+--- a/t/op/sort.t
++++ b/t/op/sort.t
+@@ -7,7 +7,7 @@ BEGIN {
+     set_up_inc('../lib');
+ }
+ use warnings;
+-plan(tests => 203);
++plan(tests => 204);
+ use Tie::Array; # we need to test sorting tied arrays
+ 
+ # these shouldn't hang
+@@ -1202,3 +1202,13 @@ SKIP:
+     $fillb = undef;
+     is $act, "01[sortb]2[fillb]";
+ }
++
++# GH #18081
++# sub call via return in sort block was called in void rather than scalar
++# context
++
++{
++    sub sort18081 { $a + 1 <=> $b + 1 }
++    my @a = sort { return &sort18081 } 6,1,2;
++    is "@a", "1 2 6", "GH #18081";
++}
+-- 
+2.25.4
+
diff --git a/perl.spec b/perl.spec
index 9c2c0d2..8a51226 100644
--- a/perl.spec
+++ b/perl.spec
@@ -233,6 +233,10 @@ Patch33:        perl-5.33.0-Fix-leak-GH-18054.patch
 # in upstream after 5.33.1
 Patch34:        perl-5.33.1-die_unwind-global-destruction.patch
 
+# Fix sorting with a block that calls return, GH#18081,
+# in upstream after 5.33.1
+Patch35:        perl-5.33.1-sort-return-foo.patch
+
 # Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048
 Patch200:       perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch
 
@@ -4254,6 +4258,7 @@ you're not running VMS, this module does nothing.
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
 %patch200 -p1
 %patch201 -p1
 
@@ -4295,6 +4300,7 @@ perl -x patchlevel.h \
     'Fedora Patch32: Fix handling left-hand-side undef when assigning a list (GH#16685)' \
     'Fedora Patch33: Fix a memory leak when compiling a long regular expression (GH#18054)' \
     'Fedora Patch34: Fix handling exceptions in a global destruction (GH#18063)' \
+    'Fedora Patch35: Fix sorting with a block that calls return (GH#18081)' \
     'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \
     'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \
     %{nil}
@@ -7014,6 +7020,7 @@ popd
 - Fix handling left-hand-side undef when assigning a list (GH#16685)
 - Fix a memory leak when compiling a long regular expression (GH#18054)
 - Fix handling exceptions in a global destruction (GH#18063)
+- Fix sorting with a block that calls return (GH#18081)
 
 * Fri Aug 21 2020 Jeff Law <law@redhat.com> - 4:5.32.0-461
 - Re-enable LTO