I somehow managed to omit the base.pm change from #23266

p4raw-id: //depot/perl@23267

diff --git a/lib/base.pm b/lib/base.pm
index e98d0f1..832b6a4 100644 (file)
--- a/lib/base.pm
+++ b/lib/base.pm
@@ -152,10 +152,9 @@ sub inherit_fields {
         }
     }
 
-    unless( keys %$bfields ) {
-        foreach my $idx (1..$#{$battr}) {
-            $dattr->[$idx] = $battr->[$idx] & INHERITED;
-        }
+    foreach my $idx (1..$#{$battr}) {
+       next if defined $dattr->[$idx];
+       $dattr->[$idx] = $battr->[$idx] & INHERITED;
     }
 }