pp_ctl.c - require_file: truthful errors and tests: ties are called once

demerphq · demerphq · commit 901d80aa640b · 2022-12-09T18:34:58.000+01:00
We need to keep track of what we actually checked. We cannot simply report the state of @inc at the end of the require, as it might have changed, possibly several times during the require. This also accounts for most "silly" stuff that might upset our internal assumptions, for instance where a tie might report one value to the code doing the directory check and another in the error message. We had long standing tests to see that @inc tie elements where called "once" but they actually tested they were called twice despite claiming otherwise. This fixes all of those test so that a tied @inc entry is called exactly once, and whatever it returned the first time is placed in the error message. This includes a change to the require error message, so that where it once said "@inc contains:" it now says "@inc entries checked:". Note this patch requires parent v0.239 to be available (which was done in the previous commit).
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
@@ -232,6 +232,37 @@ XXX Changes (i.e. rewording) of diagnostic messages go here
 
 =item *
 
+The error message that is produced when a C<require> or C<use> statement
+fails has been changed. It used to contain the words C<@INC contains:>,
+and it used to show the state of C<@INC> *after* the require had
+completed and failed. The error message has been changed to say C<@INC
+entries checked:> and to reflect the actual directories or hooks that
+were executed during the require statement. For example:
+
+    perl -e'push @INC, sub {@INC=()}; eval "require Frobnitz"
+        or die $@'
+    Can't locate Frobnitz.pm in @INC (you may need to install the
+    Frobnitz module) (@INC contains:) at (eval 1) line 1.
+
+Will change to (with some output elided for clarity):
+
+    perl -e'push @INC, sub {@INC=()}; eval "require Frobnitz"
+        or die $@'
+    Can't locate Frobnitz.pm in @INC (you may need to install the
+    Frobnitz module) (@INC entries checked:
+    .../site_perl/5.37.7/x86_64-linux .../site_perl/5.37.7
+    .../5.37.7/x86_64-linux .../5.37.7 CODE(0x562745e684b8))
+    at (eval 1) line 1.
+
+thus showing the actual directories checked. Code that checks for
+C<@INC contains:> in error messages should be hardened against any future
+wording changes between the C<@INC> and C<:>, for instance use
+C<qr/\@INC[ \w]+:/> instead of using C<qr/\@INC contains:/> or
+C<qr/\@INC entries checked:/> in tests as this will ensure both forward
+and backward compatibility.
+
+=item *
+
 XXX Describe change here
 
 =back
diff --git a/pp_ctl.c b/pp_ctl.c
@@ -4259,6 +4259,7 @@ S_require_file(pTHX_ SV *sv)
      *
      * For searchable paths, just search @INC normally
      */
+    AV *inc_checked = (AV*)sv_2mortal((SV*)newAV());
     if (!tryrsfp && !(errno == EACCES && !path_searchable)) {
         SSize_t inc_idx;
 #ifdef VMS
@@ -4269,9 +4270,21 @@ S_require_file(pTHX_ SV *sv)
             namesv = newSV_type(SVt_PV);
             AV *inc_ar = GvAVn(PL_incgv);
             for (inc_idx = 0; inc_idx <= AvFILL(inc_ar); inc_idx++) {
-                SV * const dirsv = *av_fetch(inc_ar, inc_idx, TRUE);
+                SV *dirsv = *av_fetch(inc_ar, inc_idx, TRUE);
+
+                if (SvGMAGICAL(dirsv)) {
+                    SvGETMAGIC(dirsv);
+                    dirsv = newSVsv_nomg(dirsv);
+                } else {
+                    /* on the other hand, since we aren't copying we do need
+                     * to increment */
+                    SvREFCNT_inc(dirsv);
+                }
+                if (!SvOK(dirsv))
+                    continue;
+
+                av_push(inc_checked, dirsv);
 
-                SvGETMAGIC(dirsv);
                 if (SvROK(dirsv)) {
                     int count;
                     SV **svp;
@@ -4536,14 +4549,15 @@ S_require_file(pTHX_ SV *sv)
                 DIE(aTHX_ "Can't locate %s:   %s: %s",
                     name, tryname, Strerror(saved_errno));
             } else {
-                if (path_searchable) {		/* did we lookup @INC? */
-                    AV * const ar = GvAVn(PL_incgv);
+                if (path_searchable) {          /* did we lookup @INC? */
                     SSize_t i;
                     SV *const msg = newSVpvs_flags("", SVs_TEMP);
                     SV *const inc = newSVpvs_flags("", SVs_TEMP);
-                    for (i = 0; i <= AvFILL(ar); i++) {
+                    for (i = 0; i <= AvFILL(inc_checked); i++) {
+                        SV **svp= av_fetch(inc_checked, i, TRUE);
+                        if (!svp || !*svp) continue;
                         sv_catpvs(inc, " ");
-                        sv_catsv(inc, *av_fetch(ar, i, TRUE));
+                        sv_catsv(inc, *svp);
                     }
                     if (memENDPs(name, len, ".pm")) {
                         const char *e = name + len - (sizeof(".pm") - 1);
@@ -4597,7 +4611,7 @@ S_require_file(pTHX_ SV *sv)
 
                     /* diag_listed_as: Can't locate %s */
                     DIE(aTHX_
-                        "Can't locate %s in @INC%" SVf " (@INC contains:%" SVf ")",
+                        "Can't locate %s in @INC%" SVf " (@INC entries checked:%" SVf ")",
                         name, msg, inc);
                 }
             }
diff --git a/t/op/inccode.t b/t/op/inccode.t
@@ -294,18 +294,14 @@ SKIP: {
     $$t = sub { $called ++; !1 };
     delete $INC{'foo.pm'}; # in case another test uses foo
     eval { require foo };
-    { local $::TODO = "Will be fixed in a follow up patch";
     is $INCtie::count, 1,
         'FETCH is called once on undef scalar-tied @INC elem';
-    }
     is $called, 1, 'sub in scalar-tied @INC elem is called';
     () = "$INC[0]"; # force a fetch, so the SV is ROK
     $INCtie::count = 0;
     eval { require foo };
-    { local $::TODO = "Will be fixed in a follow up patch";
     is $INCtie::count, 1,
         'FETCH is called once on scalar-tied @INC elem holding ref';
-    }
     is $called, 2, 'sub in scalar-tied @INC elem holding ref is called';
     $$t = [];
     $INCtie::count = 0;
@@ -315,10 +311,8 @@ SKIP: {
     $$t = "string";
     $INCtie::count = 0;
     eval { require foo };
-    { local $::TODO = "Will be fixed in a follow up patch";
     is $INCtie::count, 1,
        'FETCH called once on scalar-tied @INC elem returning string';
-    }
 }
 
 
@@ -409,7 +403,7 @@ SKIP:{
     fresh_perl_like('@INC=("A",bless({},"Hook"),"D"); '
                  .'sub Hook::INCDIR { return "B","C"} '
                  .'eval "require Frobnitz" or print $@;',
-                  qr/\(\@INC contains: A Hook=HASH\(0x[A-Fa-f0-9]+\) B C D\)/,
+                  qr/\(\@INC[\w ]+: A Hook=HASH\(0x[A-Fa-f0-9]+\) B C D\)/,
                   {},
                   "Check if INCDIR hook works as expected");
 }
diff --git a/t/op/require_errors.t b/t/op/require_errors.t
@@ -27,7 +27,7 @@ for my $file ($nonfile, ' ') {
 	require $file;
     };
 
-    like $@, qr/^Can't locate $file in \@INC \(\@INC contains: \Q@INC\E\) at/,
+    like $@, qr/^Can't locate $file in \@INC \(\@INC[\w ]+: \Q@INC\E\) at/,
 	"correct error message for require '$file'";
 }
 
@@ -91,7 +91,7 @@ for my $file ($nonfile, ' ') {
                 $hint =~ s/\.pm$//;
                 $exp .= " (you may need to install the $hint module)";
             }
-            $exp .= " (\@INC contains: @INC) at";
+            $exp .= " (\@INC entries checked: @INC) at";
         }
         else {
             # undef implies a require which doesn't compile,
@@ -139,14 +139,14 @@ eval {
     require "$nonfile.ph";
 };
 
-like $@, qr/^Can't locate $nonfile\.ph in \@INC \(did you run h2ph\?\) \(\@INC contains: @INC\) at/;
+like $@, qr/^Can't locate $nonfile\.ph in \@INC \(did you run h2ph\?\) \(\@INC[\w ]+: @INC\) at/;
 
 for my $file ("$nonfile.h", ".h") {
     eval {
 	require $file
     };
 
-    like $@, qr/^Can't locate \Q$file\E in \@INC \(change \.h to \.ph maybe\?\) \(did you run h2ph\?\) \(\@INC contains: @INC\) at/,
+    like $@, qr/^Can't locate \Q$file\E in \@INC \(change \.h to \.ph maybe\?\) \(did you run h2ph\?\) \(\@INC[\w ]+: @INC\) at/,
 	"correct error message for require '$file'";
 }
 
@@ -155,7 +155,7 @@ for my $file ("$nonfile.ph", ".ph") {
 	require $file
     };
 
-    like $@, qr/^Can't locate \Q$file\E in \@INC \(did you run h2ph\?\) \(\@INC contains: @INC\) at/,
+    like $@, qr/^Can't locate \Q$file\E in \@INC \(did you run h2ph\?\) \(\@INC[\w ]+: @INC\) at/,
 	"correct error message for require '$file'";
 }
 
@@ -311,24 +311,22 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,
         { }, 'Inc hooks have the correct cop_file');
 }
 {
-    local $::TODO = "Pending segfault fix";
     # this can segfault or assert prior to @INC hardening.
     fresh_perl_like(
         'unshift @INC, sub { *INC=["a","b"] }; '
        .'eval "require Frobnitz" or print $@',
-        qr!\(\@INC contains: CODE\(0x[A-Fa-f0-9]+\) b\)!,
+        qr!\(\@INC[\w ]+: CODE\(0x[A-Fa-f0-9]+\) b\)!,
         { }, 'INC hooks do not segfault when overwritten');
 }
 {
-    local $::TODO = "Pending error message improvement";
     # this is the defined behavior, but in older perls the error message
     # would lie and say "contains: a b", which is true in the sense that
     # it is the value of @INC after the require, but not the directory
     # list that was looked at.
     fresh_perl_like(
         '@INC = (sub { @INC=("a","b"); () }, "z"); '
        .'eval "require Frobnitz" or print $@',
-        qr!\(\@INC contains: CODE\(0x[A-Fa-f0-9]+\) b\)!,
+        qr!\(\@INC[\w ]+: CODE\(0x[A-Fa-f0-9]+\) b\)!,
         { }, 'INC hooks that overwrite @INC continue as expected (skips a and z)');
 }
 {
@@ -337,7 +335,7 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,
     fresh_perl_like(
         '@INC = (sub { @INC=qw(a b); undef $INC }, "z"); '
        .'eval "require Frobnitz" or print $@',
-        qr!\(\@INC contains: CODE\(0x[A-Fa-f0-9]+\) a b\)!,
+        qr!\(\@INC[\w ]+: CODE\(0x[A-Fa-f0-9]+\) a b\)!,
         { }, 'INC hooks that overwrite @INC and undef $INC continue at start');
 }
 {
@@ -347,7 +345,7 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,
         'sub CB::INCDIR { return "b", "c","d" }; '
        .'@INC = ("a",bless({},"CB"),"e");'
        .'eval "require Frobnitz" or print $@',
-        qr!\(\@INC contains: a CB=HASH\(0x[A-Fa-f0-9]+\) b c d e\)!,
+        qr!\(\@INC[\w ]+: a CB=HASH\(0x[A-Fa-f0-9]+\) b c d e\)!,
         { }, 'INCDIR works as expected');
 }
 {
@@ -356,7 +354,7 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,
     fresh_perl_like(
         '@INC = ("a",bless({},"CB"),"e");'
        .'eval "require Frobnitz" or print $@',
-        qr!\(\@INC contains: a CB=HASH\(0x[A-Fa-f0-9]+\) e\)!,
+        qr!\(\@INC[\w ]+: a CB=HASH\(0x[A-Fa-f0-9]+\) e\)!,
         { }, 'Objects with no INC or INCDIR method are stringified');
 }
 {
@@ -366,7 +364,7 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,
         '{package CB; use overload qw("")=>sub { "blorg"};} '
        .'@INC = ("a",bless({},"CB"),"e");'
        .'eval "require Frobnitz" or print $@',
-        qr!\(\@INC contains: a blorg e\)!,
+        qr!\(\@INC[\w ]+: a blorg e\)!,
         { }, 'Objects with overload and no INC or INCDIR method are stringified');
 }
 {
@@ -375,7 +373,7 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,
     fresh_perl_like(
         '@INC = ("a",bless(sub { warn "blessed sub called" },"CB"),"e");'
        .'eval "require Frobnitz" or print $@',
-        qr!blessed sub called.*\(\@INC contains: a CB=CODE\(0x[a-fA-F0-9]+\) e\)!s,
+        qr!blessed sub called.*\(\@INC[\w ]+: a CB=CODE\(0x[a-fA-F0-9]+\) e\)!s,
         { }, 'Blessed subs with no hook methods are executed');
 }
 {
@@ -412,7 +410,7 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,
         'sub CB::INCDIR { "i" } sub CB2::INCDIR { }'
        .'@INC = ("a",bless(sub{"b"},"CB"),bless(sub{"c"},"CB2"),"e");'
        .'eval "require Frobnitz" or print $@',
-        qr!\(\@INC contains: a CB=CODE\(0x[a-fA-F0-9]+\) i CB2=CODE\(0x[a-fA-F0-9]+\) e\)!s,
+        qr!\(\@INC[\w ]+: a CB=CODE\(0x[a-fA-F0-9]+\) i CB2=CODE\(0x[a-fA-F0-9]+\) e\)!s,
         { }, 'Blessed subs with INCDIR methods call INCDIR');
 }
 {
@@ -422,6 +420,6 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,
         'sub CB::INCDIR { return @{$_[2]} }'
        .'@INC = ("a",[bless([],"CB"),"b"],"c");'
        .'eval "require Frobnitz" or print $@',
-        qr!\(\@INC contains: a ARRAY\(0x[a-fA-F0-9]+\) CB=ARRAY\(0x[a-fA-F0-9]+\) b c\)!s,
+        qr!\(\@INC[\w ]+: a ARRAY\(0x[a-fA-F0-9]+\) CB=ARRAY\(0x[a-fA-F0-9]+\) b c\)!s,
         { }, 'INCDIR ref returns are stringified');
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ for my $file ($nonfile, ' ') {`
`27`	`27`	`require $file;`
`28`	`28`	`};`
`29`	`29`
`30`		`- like $@, qr/^Can't locate $file in \@INC \(\@INC contains: \Q@INC\E\) at/,`
	`30`	`+ like $@, qr/^Can't locate $file in \@INC \(\@INC[\w ]+: \Q@INC\E\) at/,`
`31`	`31`	`"correct error message for require '$file'";`
`32`	`32`	`}`
`33`	`33`
`@@ -91,7 +91,7 @@ for my $file ($nonfile, ' ') {`
`91`	`91`	`$hint =~ s/\.pm$//;`
`92`	`92`	`$exp .= " (you may need to install the $hint module)";`
`93`	`93`	`}`
`94`		`- $exp .= " (\@INC contains: @INC) at";`
	`94`	`+ $exp .= " (\@INC entries checked: @INC) at";`
`95`	`95`	`}`
`96`	`96`	`else {`
`97`	`97`	`# undef implies a require which doesn't compile,`
`@@ -139,14 +139,14 @@ eval {`
`139`	`139`	`require "$nonfile.ph";`
`140`	`140`	`};`
`141`	`141`
`142`		`-like $@, qr/^Can't locate $nonfile\.ph in \@INC \(did you run h2ph\?\) \(\@INC contains: @INC\) at/;`
	`142`	`+like $@, qr/^Can't locate $nonfile\.ph in \@INC \(did you run h2ph\?\) \(\@INC[\w ]+: @INC\) at/;`
`143`	`143`
`144`	`144`	`for my $file ("$nonfile.h", ".h") {`
`145`	`145`	`eval {`
`146`	`146`	`require $file`
`147`	`147`	`};`
`148`	`148`
`149`		`- like $@, qr/^Can't locate \Q$file\E in \@INC \(change \.h to \.ph maybe\?\) \(did you run h2ph\?\) \(\@INC contains: @INC\) at/,`
	`149`	`+ like $@, qr/^Can't locate \Q$file\E in \@INC \(change \.h to \.ph maybe\?\) \(did you run h2ph\?\) \(\@INC[\w ]+: @INC\) at/,`
`150`	`150`	`"correct error message for require '$file'";`
`151`	`151`	`}`
`152`	`152`
`@@ -155,7 +155,7 @@ for my $file ("$nonfile.ph", ".ph") {`
`155`	`155`	`require $file`
`156`	`156`	`};`
`157`	`157`
`158`		`- like $@, qr/^Can't locate \Q$file\E in \@INC \(did you run h2ph\?\) \(\@INC contains: @INC\) at/,`
	`158`	`+ like $@, qr/^Can't locate \Q$file\E in \@INC \(did you run h2ph\?\) \(\@INC[\w ]+: @INC\) at/,`
`159`	`159`	`"correct error message for require '$file'";`
`160`	`160`	`}`
`161`	`161`
`@@ -311,24 +311,22 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,`
`311`	`311`	`{ }, 'Inc hooks have the correct cop_file');`
`312`	`312`	`}`
`313`	`313`	`{`
`314`		`- local $::TODO = "Pending segfault fix";`
`315`	`314`	`# this can segfault or assert prior to @INC hardening.`
`316`	`315`	`fresh_perl_like(`
`317`	`316`	`'unshift @INC, sub { *INC=["a","b"] }; '`
`318`	`317`	`.'eval "require Frobnitz" or print $@',`
`319`		`- qr!\(\@INC contains: CODE\(0x[A-Fa-f0-9]+\) b\)!,`
	`318`	`+ qr!\(\@INC[\w ]+: CODE\(0x[A-Fa-f0-9]+\) b\)!,`
`320`	`319`	`{ }, 'INC hooks do not segfault when overwritten');`
`321`	`320`	`}`
`322`	`321`	`{`
`323`		`- local $::TODO = "Pending error message improvement";`
`324`	`322`	`# this is the defined behavior, but in older perls the error message`
`325`	`323`	`# would lie and say "contains: a b", which is true in the sense that`
`326`	`324`	`# it is the value of @INC after the require, but not the directory`
`327`	`325`	`# list that was looked at.`
`328`	`326`	`fresh_perl_like(`
`329`	`327`	`'@INC = (sub { @INC=("a","b"); () }, "z"); '`
`330`	`328`	`.'eval "require Frobnitz" or print $@',`
`331`		`- qr!\(\@INC contains: CODE\(0x[A-Fa-f0-9]+\) b\)!,`
	`329`	`+ qr!\(\@INC[\w ]+: CODE\(0x[A-Fa-f0-9]+\) b\)!,`
`332`	`330`	`{ }, 'INC hooks that overwrite @INC continue as expected (skips a and z)');`
`333`	`331`	`}`
`334`	`332`	`{`
`@@ -337,7 +335,7 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,`
`337`	`335`	`fresh_perl_like(`
`338`	`336`	`'@INC = (sub { @INC=qw(a b); undef $INC }, "z"); '`
`339`	`337`	`.'eval "require Frobnitz" or print $@',`
`340`		`- qr!\(\@INC contains: CODE\(0x[A-Fa-f0-9]+\) a b\)!,`
	`338`	`+ qr!\(\@INC[\w ]+: CODE\(0x[A-Fa-f0-9]+\) a b\)!,`
`341`	`339`	`{ }, 'INC hooks that overwrite @INC and undef $INC continue at start');`
`342`	`340`	`}`
`343`	`341`	`{`
`@@ -347,7 +345,7 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,`
`347`	`345`	`'sub CB::INCDIR { return "b", "c","d" }; '`
`348`	`346`	`.'@INC = ("a",bless({},"CB"),"e");'`
`349`	`347`	`.'eval "require Frobnitz" or print $@',`
`350`		`- qr!\(\@INC contains: a CB=HASH\(0x[A-Fa-f0-9]+\) b c d e\)!,`
	`348`	`+ qr!\(\@INC[\w ]+: a CB=HASH\(0x[A-Fa-f0-9]+\) b c d e\)!,`
`351`	`349`	`{ }, 'INCDIR works as expected');`
`352`	`350`	`}`
`353`	`351`	`{`
`@@ -356,7 +354,7 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,`
`356`	`354`	`fresh_perl_like(`
`357`	`355`	`'@INC = ("a",bless({},"CB"),"e");'`
`358`	`356`	`.'eval "require Frobnitz" or print $@',`
`359`		`- qr!\(\@INC contains: a CB=HASH\(0x[A-Fa-f0-9]+\) e\)!,`
	`357`	`+ qr!\(\@INC[\w ]+: a CB=HASH\(0x[A-Fa-f0-9]+\) e\)!,`
`360`	`358`	`{ }, 'Objects with no INC or INCDIR method are stringified');`
`361`	`359`	`}`
`362`	`360`	`{`
`@@ -366,7 +364,7 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,`
`366`	`364`	`'{package CB; use overload qw("")=>sub { "blorg"};} '`
`367`	`365`	`.'@INC = ("a",bless({},"CB"),"e");'`
`368`	`366`	`.'eval "require Frobnitz" or print $@',`
`369`		`- qr!\(\@INC contains: a blorg e\)!,`
	`367`	`+ qr!\(\@INC[\w ]+: a blorg e\)!,`
`370`	`368`	`{ }, 'Objects with overload and no INC or INCDIR method are stringified');`
`371`	`369`	`}`
`372`	`370`	`{`
`@@ -375,7 +373,7 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,`
`375`	`373`	`fresh_perl_like(`
`376`	`374`	`'@INC = ("a",bless(sub { warn "blessed sub called" },"CB"),"e");'`
`377`	`375`	`.'eval "require Frobnitz" or print $@',`
`378`		`- qr!blessed sub called.*\(\@INC contains: a CB=CODE\(0x[a-fA-F0-9]+\) e\)!s,`
	`376`	`+ qr!blessed sub called.*\(\@INC[\w ]+: a CB=CODE\(0x[a-fA-F0-9]+\) e\)!s,`
`379`	`377`	`{ }, 'Blessed subs with no hook methods are executed');`
`380`	`378`	`}`
`381`	`379`	`{`
`@@ -412,7 +410,7 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,`
`412`	`410`	`'sub CB::INCDIR { "i" } sub CB2::INCDIR { }'`
`413`	`411`	`.'@INC = ("a",bless(sub{"b"},"CB"),bless(sub{"c"},"CB2"),"e");'`
`414`	`412`	`.'eval "require Frobnitz" or print $@',`
`415`		`- qr!\(\@INC contains: a CB=CODE\(0x[a-fA-F0-9]+\) i CB2=CODE\(0x[a-fA-F0-9]+\) e\)!s,`
	`413`	`+ qr!\(\@INC[\w ]+: a CB=CODE\(0x[a-fA-F0-9]+\) i CB2=CODE\(0x[a-fA-F0-9]+\) e\)!s,`
`416`	`414`	`{ }, 'Blessed subs with INCDIR methods call INCDIR');`
`417`	`415`	`}`
`418`	`416`	`{`
`@@ -422,6 +420,6 @@ like $@, qr/^Can't locate \Q$nonsearch\E at/,`
`422`	`420`	`'sub CB::INCDIR { return @{$_[2]} }'`
`423`	`421`	`.'@INC = ("a",[bless([],"CB"),"b"],"c");'`
`424`	`422`	`.'eval "require Frobnitz" or print $@',`
`425`		`- qr!\(\@INC contains: a ARRAY\(0x[a-fA-F0-9]+\) CB=ARRAY\(0x[a-fA-F0-9]+\) b c\)!s,`
	`423`	`+ qr!\(\@INC[\w ]+: a ARRAY\(0x[a-fA-F0-9]+\) CB=ARRAY\(0x[a-fA-F0-9]+\) b c\)!s,`
`426`	`424`	`{ }, 'INCDIR ref returns are stringified');`
`427`	`425`	`}`