our $describe_class_query_cache;
sub describe_class_methods {
- my ($class) = @_;
+ my ($class, $requested_mro) = @_;
croak "Expecting a class name"
if not defined $class or $class !~ $module_name_rx;
+ $requested_mro ||= mro::get_mro($class);
+
+ # mro::set_mro() does not bump pkg_gen - WHAT THE FUCK?!
+ my $query_cache_key = "$class|$requested_mro";
+
+ my $stack_cache_key =
+ ( mro::get_mro($class) eq $requested_mro )
+ ? $class
+ : $query_cache_key
+ ;
+
# use a cache on old MRO, since while we are recursing in this function
# nothing can possibly change (the speedup is immense)
# (yes, people could be tie()ing the stash and adding methods on access
$my_gen += get_real_pkg_gen($_) for ( my @full_ISA = (
@{
- $mro_recursor_stack->{cache}{$class}{linear_isa}
+ $mro_recursor_stack->{cache}{$stack_cache_key}{linear_isa}
||=
- mro::get_linear_isa($class)
+ mro::get_linear_isa($class, $requested_mro)
},
((
));
- my $slot = $describe_class_query_cache->{$class} ||= {};
+ my $slot = $describe_class_query_cache->{$query_cache_key} ||= {};
unless ( ($slot->{cumulative_gen}||0) == $my_gen ) {
%$slot = (
class => $class,
isa => [
- @{ $mro_recursor_stack->{cache}{$class}{linear_isa} }
- [ 1 .. $#{$mro_recursor_stack->{cache}{$class}{linear_isa}} ]
+ @{ $mro_recursor_stack->{cache}{$stack_cache_key}{linear_isa} }
+ [ 1 .. $#{$mro_recursor_stack->{cache}{$stack_cache_key}{linear_isa}} ]
],
mro => {
- type => mro::get_mro($class),
+ type => $requested_mro,
+ is_c3 => ( ($requested_mro eq 'c3') ? 1 : 0 ),
},
cumulative_gen => $my_gen,
);
- $slot->{mro}{is_c3} = ($slot->{mro}{type} eq 'c3') ? 1 : 0;
# ensure the cache is populated for the parents, code below can then
# efficiently operate over the query_cache directly
describe_class_methods($_) for reverse @full_ISA;
- my $current_node_refaddr;
no strict 'refs';
# combine full ISA-order inherited and local method list into a
# "shadowing stack"
(
- $current_node_refaddr = refaddr($_)
-
- and
-
unshift @{ $slot->{methods}{$_->{name}} }, $_
and
# what describe_class_methods for @full_ISA produced above
( map { values %{
$describe_class_query_cache->{$_}{methods_defined_in_class} || {}
- } } reverse @full_ISA ),
+ } } map { "$_|" . mro::get_mro($_) } reverse @full_ISA ),
# our own non-cleaned subs + their attributes
( map {