Stop CORE::GLOBAL::do lookup from crashing on stub

‘sub CORE::GLOBAL::do;’ doesn’t create a full glob, but cheats
for efficiency.  Compilation of do-file ops was not taking this
into account.

diff --git a/op.c b/op.c
index 40df34a154ae0c4b4fc537d0fabca79db43f5bff..ee917b4fdb9fd81779fc44003946c467e8e81eb5 100644 (file)
--- a/op.c
+++ b/op.c
@@ -5478,6 +5478,7 @@ Perl_dofile(pTHX_ OP *term, I32 force_builtin)
        if (!(gv && GvCVu(gv) && GvIMPORTED_CV(gv))) {
            GV * const * const gvp = (GV**)hv_fetchs(PL_globalstash, "do", FALSE);
            gv = gvp ? *gvp : NULL;
+           if (gv && !isGV(gv)) gv_init(gv, PL_globalstash, "do", 2, 0);
        }
     }
 

diff --git a/t/op/override.t b/t/op/override.t
index 90510dd34532800e47a77f63969107b7afa9ba0b..16aec743148f15d8981ac32ced4b009d721b3c07 100644 (file)
--- a/t/op/override.t
+++ b/t/op/override.t
@@ -4,9 +4,11 @@ BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
     require './test.pl';
+    require Config; # load these before we mess with *CORE::GLOBAL::require
+    require 'Config_heavy.pl'; # since runperl will need them
 }
 
-plan tests => 29;
+plan tests => 30;
 
 #
 # This file tries to test builtin override using CORE::GLOBAL
@@ -150,3 +152,7 @@ BEGIN { package other; *::caller = \&::caller }
 sub caller() { 42 }
 caller; # inline the constant
 is caller, 42, 'constant inlining does not undo "use subs" on keywords';
+
+is runperl(prog => 'sub CORE::GLOBAL::do; do file; print qq-ok\n-'),
+  "ok\n",
+  'no crash with CORE::GLOBAL::do stub';