t/lib/GH_15109/Apack.pm test Module for caller.t
t/lib/GH_15109/Bpack.pm test Module for caller.t
t/lib/GH_15109/Cpack.pm test Module for caller.t
+t/lib/GH_15109/Foo.pm test Module for caller.t
t/lib/h2ph.h Test header file for h2ph
t/lib/h2ph.pht Generated output from h2ph.h by h2ph, for comparison
t/lib/locale/latin1 Part of locale.t in Latin 1
* to PL_compiling, IN_PERL_COMPILETIME/IN_PERL_RUNTIME
* will give the wrong answer.
*/
- Newx(PL_curcop, 1, COP);
- StructCopy(&PL_compiling, PL_curcop, COP);
- PL_curcop->op_slabbed = 0;
- SAVEFREEPV(PL_curcop);
+ PL_curcop = (COP*)newSTATEOP(PL_compiling.op_flags, NULL, NULL);
+ CopLINE_set(PL_curcop, CopLINE(&PL_compiling));
}
PUSHSTACKi(PERLSI_REQUIRE);
chdir 't' if -d 't';
require './test.pl';
set_up_inc('../lib');
- plan( tests => 109 ); # some tests are run in a BEGIN block
+ plan( tests => 111 ); # some tests are run in a BEGIN block
}
my @c;
like($Cpack::callers[$_], qr{GH_15109/Apack.pm:3}, "GH #15109 level $_") for 3..5;
like($Cpack::callers[$_], qr{\(eval \d+\):1}, "GH #15109 level $_") for 6..8;
like($Cpack::callers[$_], qr{caller\.t}, "GH #15109 level $_") for 9;
+
+ # GH #15109 followup - the original fix wasn't saving cop_warnings
+ # correctly and this code used to crash or fail valgrind
+
+ my $w = 0;
+ local $SIG{__WARN__} = sub { $w++ };
+ eval q{
+ use warnings;
+ no warnings 'numeric'; # ensure custom cop_warnings
+ use Foo; # this used to mess up warnings flags
+ BEGIN { my $x = "foo" + 1; } # potential "numeric" warning
+ };
+ is ($@, "", "GH #15109 - eval okay");
+ is ($w, 0, "GH #15109 - warnings restored");
}
{
my ($pkg, $file, $line) = caller;
::is $file, 'virtually/op/caller.t', "BEGIN block sees correct caller filename";
::is $line, 12345, "BEGIN block sees correct caller line";
- TODO: {
- local $::TODO = "BEGIN blocks have wrong caller package [perl #129239]";
- ::is $pkg, 'RT129239', "BEGIN block sees correct caller package";
- }
+ ::is $pkg, 'RT129239', "BEGIN block sees correct caller package";
#line 12345 "virtually/op/caller.t"
}
+
}