Deparse: skip builtin state subs

This line

    use builtin qw(foo bar);

has the compile-time effect of

    state sub foo { ... }
    state sub bar { ... }

(except that the subs are actually aliases of &builtin::foo and ::bar).

Previously Deparse would output both the 'use builtin' line *and* the
state sub definitions. This commit suppresses the outputting of state
subs if they're in the package builtin::.

1 files changed, 19 insertions, 1 deletions

diff --git a/lib/B/Deparse.pm b/lib/B/Deparse.pm
index 6e6cd3f8c9..b50608ca86 100644
--- a/lib/B/Deparse.pm
+++ b/lib/B/Deparse.pm
@@ -448,7 +448,7 @@ sub next_todo {
 	# emit the sub.
 	my @text;
 	my $flags = $name->FLAGS;
-	push @text,
+        my $category =
 	    !$cv || $seq <= $name->COP_SEQ_RANGE_LOW
 		? $self->keyword($flags & SVpad_OUR
 				    ? "our"
@@ -456,6 +456,24 @@ sub next_todo {
 					? "state"
 					: "my") . " "
 		: "";
+
+        # Skip lexical 'state' subs imported from the builtin::
+        # package, since they are created automatically by
+        #     use bulitin "foo"
+        if ($cv && $category =~  /\bstate\b/) {
+            my $globname;
+            my $gv = $cv->GV;
+            if (
+                   $gv
+                && defined (($globname = $gv->object_2svref))
+                && $$globname =~ /^\*builtin::/
+            ) {
+                return '';
+            }
+        }
+
+	push @text, $category;
+
 	# XXX We would do $self->keyword("sub"), but ‘my CORE::sub’
 	#     doesn’t work and ‘my sub’ ignores a &sub in scope.  I.e.,
 	#     we have a core bug here.