#!./perl
BEGIN {
- if ($ENV{PERL_CORE}){
- chdir('t') if -d 't';
- @INC = ('.', '../lib');
- } else {
- unshift @INC, 't';
- push @INC, "../../t";
- }
+ unshift @INC, 't';
require Config;
if (($Config::Config{'extensions'} !~ /\bB\b/) ){
print "1..0 # Skip -- Perl configured without B module\n";
exit 0;
}
require 'test.pl'; # we use runperl from 'test.pl', so can't use Test::More
- sub diag { print "# @_\n" } # but this is still handy
-
}
-plan tests => 147;
+plan tests => 167;
require_ok("B::Concise");
my @stylespec;
$@='';
eval { add_style ('junk_B' => @stylespec) };
-like ($@, 'expecting 3 style-format args',
+like ($@, qr/expecting 3 style-format args/,
"add_style rejects insufficient args");
@stylespec = (0,0,0); # right length, invalid values
SKIP: {
# tests output to GLOB, using perlio feature directly
- skip "no perlio on this build", 122
+ skip "no perlio on this build", 127
unless $Config::Config{useperlio};
set_style_standard('concise'); # MUST CALL before output needed
my ($res,$err);
TODO: {
- local $TODO = "\tdoes this handling make sense ?";
+ #local $TODO = "\tdoes this handling make sense ?";
sub declared_only;
($res,$err) = render('-basic', \&declared_only);
sub defd_empty {};
($res,$err) = render('-basic', \&defd_empty);
- is(scalar split(/\n/, $res), 3,
+ my @lines = split(/\n/, $res);
+ is(scalar @lines, 3,
"'sub defd_empty {}' seen as 3 liner");
- is(1, $res =~ /leavesub/ && $res =~ /nextstate/,
+ is(1, $res =~ /leavesub/ && $res =~ /(next|db)state/,
"'sub defd_empty {}' seen as 2 ops: leavesub,nextstate");
($res,$err) = render('-basic', \¬_even_declared);
{
package Bar;
our $AUTOLOAD = 'garbage';
- sub AUTOLOAD { print "# in AUTOLOAD: $AUTOLOAD\n" }
+ sub AUTOLOAD { print "# in AUTOLOAD body: $AUTOLOAD\n" }
}
($res,$err) = render('-basic', Bar::auto_func);
like ($res, qr/unknown function \(Bar::auto_func\)/,
"'\&Bar::auto_func' seen as having no START");
($res,$err) = render('-basic', \&Bar::AUTOLOAD);
- like ($res, qr/called Bar::AUTOLOAD/, "found body of Bar::AUTOLOAD");
+ like ($res, qr/in AUTOLOAD body: /, "found body of Bar::AUTOLOAD");
}
($res,$err) = render('-basic', Foo::bar);
}
}
-__END__
+# test proper NULLING of pointer, derefd by CvSTART, when a coderef is
+# undefd. W/o this, the pointer can dangle into freed and reused
+# optree mem, which no longer points to opcodes.
+
+# Using B::Concise to render Config::AUTOLOAD's optree at BEGIN-time
+# triggers this obscure bug, cuz AUTOLOAD has a bootstrap version,
+# which is used at load-time then undeffed. It is normally
+# re-vivified later, but not in time for this (BEGIN/CHECK)-time
+# rendering.
+
+$out = runperl ( switches => ["-MO=Concise,Config::AUTOLOAD"],
+ prog => 'use Config; BEGIN { $Config{awk} }',
+ stderr => 1 );
+
+like($out, qr/Config::AUTOLOAD exists in stash, but has no START/,
+ "coderef properly undefined");
+
+$out = runperl ( switches => ["-MO=Concise,Config::AUTOLOAD"],
+ prog => 'use Config; CHECK { $Config{awk} }',
+ stderr => 1 );
+
+like($out, qr/Config::AUTOLOAD exists in stash, but has no START/,
+ "coderef properly undefined");
+
+# test -stash and -src rendering
+$out = runperl ( switches => ["-MO=-qq,Concise,-stash=B::Concise,-src"],
+ prog => '-e 1', stderr => 1 );
+
+like($out, qr/FUNC: \*B::Concise::concise_cv_obj/,
+ "stash rendering of B::Concise includes Concise::concise_cv_obj");
+
+like($out, qr/FUNC: \*B::Concise::walk_output/,
+ "stash rendering includes Concise::walk_output");
+
+like($out, qr/\# 4\d\d: \s+ \$l->concise\(\$level\);/,
+ "src-line rendering works");
+
+$out = runperl ( switches => ["-MStorable", "-MO=Concise,-stash=Storable,-src"],
+ prog => '-e 1', stderr => 1 );
+
+like($out, qr/FUNC: \*Storable::BIN_MAJOR/,
+ "stash rendering has constant sub: Storable::BIN_MAJOR");
+
+like($out, qr/BIN_MAJOR is a constant sub, optimized to a IV/,
+ "stash rendering identifies it as constant");
+
+$out = runperl ( switches => ["-MO=Concise,-stash=ExtUtils::Mksymlists,-src,-exec"],
+ prog => '-e 1', stderr => 1 );
+
+like($out, qr/FUNC: \*ExtUtils::Mksymlists::_write_vms/,
+ "stash rendering loads package as needed");
+
+$out = runperl ( switches => ["-MO=Concise,-stash=Data::Dumper,-src,-exec"],
+ prog => '-e 1', stderr => 1 );
+
+SKIP: {
+ skip "Data::Dumper is statically linked", 1
+ if $Config{static_ext} =~ m|\bData/Dumper\b|;
+ like($out, qr/FUNC: \*Data::Dumper::format_refaddr/,
+ "stash rendering loads package as needed");
+}
+
+my $prog = q{package FOO; sub bar { print q{bar} } package main; FOO::bar(); };
+
+# this would fail if %INC used for -stash test
+$out = runperl ( switches => ["-MO=Concise,-src,-stash=FOO,-main"],
+ prog => $prog, stderr => 1 );
+
+like($out, qr/FUNC: \*FOO::bar/,
+ "stash rendering works on inlined package");
+
+# Test that consecutive nextstate ops are not nulled out when PERLDBf_NOOPT
+# is set.
+# XXX Does this test belong here?
+
+$out = runperl ( switches => ["-MO=Concise"],
+ prog => 'BEGIN{$^P = 0x04} 1 if 0; print',
+ stderr => 1 );
+like $out, qr/nextstate.*nextstate/s,
+ 'nulling of nextstate-nextstate happeneth not when $^P | PERLDBf_NOOPT';
+
+
+# A very basic test for -tree output
+$out =
+ runperl(
+ switches => ["-MO=Concise,-tree"], prog => 'print', stderr => 1
+ );
+ok index $out=~s/\r\n/\n/gr=~s/gvsv\(\*_\)/gvsv[*_]/r, <<'end'=~s/\r\n/\n/gr =>>= 0, '-tree output';
+<6>leave[1 ref]-+-<1>enter
+ |-<2>nextstate(main 1 -e:1)
+ `-<5>print-+-<3>pushmark
+ `-ex-rv2sv---<4>gvsv[*_]
+end
+
+# -nobanner
+$out =
+ runperl(
+ switches => ["-MO=Concise,-nobanner,foo"], prog=>'sub foo{}', stderr => 1
+ );
+unlike $out, qr/main::foo/, '-nobanner';
+
+# glob
+$out =
+ runperl(
+ switches => ["-MO=Concise"], prog=>'glob(q{.})', stderr => 1
+ );
+like $out, qr/\*<none>::/, 'glob(q{.})';
+
+# Test op_other in -debug
+$out = runperl(
+ switches => ["-MO=Concise,-debug,xx"],
+ prog => q{sub xx { if ($a) { return $b } }},
+ stderr => 1,
+);
+
+$out =~s/\r\n/\n/g;
+
+# Look for OP_AND
+$end = <<'EOF';
+LOGOP \(0x\w+\)
+ op_next 0x\w+
+ op_other (0x\w+)
+ op_sibling 0
+ op_ppaddr PL_ppaddr\[OP_AND\]
+EOF
+
+$end =~ s/\r\n/\n/g;
+
+like $out, qr/$end/, 'OP_AND has op_other';
+
+# like(..) above doesn't fill in $1
+$out =~ $end;
+my $next = $1;
+
+# Check it points to a PUSHMARK
+$end = <<'EOF';
+OP \(<NEXT>\)
+ op_next 0x\w+
+ op_sibling 0x\w+
+ op_ppaddr PL_ppaddr\[OP_PUSHMARK\]
+EOF
+
+$end =~ s/<NEXT>/$next/;
+
+like $out, qr/$end/, 'OP_AND->op_other points correctly';
+
+# test nextstate hints display
+
+{
+
+ $out = runperl(
+ switches => ["-MO=Concise"],
+ prog => q{my $x; use strict; use warnings; $x++; use feature q(:5.11); $x++},
+ stderr => 1,
+ );
+
+ my @hints = $out =~ /nextstate\([^)]+\) (.*) ->/g;
+
+ # handle test script run with PERL_UNICODE=""
+ s/>,<,// for @hints;
+ s/%,// for @hints;
+
+ is(scalar(@hints), 3, "3 hints");
+ is($hints[0], 'v:{', "hints[0]");
+ is($hints[1], 'v:*,&,{,x*,x&,x$,$', "hints[1]");
+ is($hints[2], 'v:us,*,&,{,x*,x&,x$,$,fea=7', "hints[2]");
+}
+
+__END__