Stop undef &foo from crashing on lex subs

2 files changed, 15 insertions, 2 deletions

diff --git a/pp.c b/pp.c
index 77a9f01653..f8a31e2cae 100644
--- a/pp.c
+++ b/pp.c
@@ -973,7 +973,12 @@ PP(pp_undef)
                           "Constant subroutine %"SVf" undefined",
 			   SVfARG(CvANON((const CV *)sv)
                              ? newSVpvs_flags("(anonymous)", SVs_TEMP)
-                             : sv_2mortal(newSVhek(GvENAME_HEK(CvGV((const CV *)sv))))));
+                             : sv_2mortal(newSVhek(
+                                CvNAMED(sv)
+                                 ? CvNAME_HEK((CV *)sv)
+                                 : GvENAME_HEK(CvGV((const CV *)sv))
+                               ))
+                           ));
 	/* FALLTHROUGH */
     case SVt_PVFM:
 	{
diff --git a/t/op/lexsub.t b/t/op/lexsub.t
index 27b6de7326..0141399020 100644
--- a/t/op/lexsub.t
+++ b/t/op/lexsub.t
@@ -8,7 +8,7 @@ BEGIN {
     *bar::like = *like;
 }
 no warnings 'deprecated';
-plan 135;
+plan 136;
 
 # -------------------- Errors with feature disabled -------------------- #
 
@@ -703,3 +703,11 @@ like runperl(
      ),
      qr/Deep recursion on subroutine "foo"/,
     'deep recursion warnings for lexical subs do not crash';
+
+like runperl(
+      switches => [ '-Mfeature=:all', '-Mwarnings=FATAL,all', '-M-warnings=experimental::lexical_subs' ],
+      prog     => 'my sub foo() { 42 } undef &foo',
+      stderr   => 1
+     ),
+     qr/Constant subroutine foo undefined at /,
+    'constant undefinition warnings for lexical subs do not crash';