class-dump 3.4 & HEAD

Closes #22818.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>