From 06d92f00e810ad2f12b8fb9c1adf0d22765d6ccc Mon Sep 17 00:00:00 2001 From: "Paul \"LeoNerd\" Evans" Date: Thu, 27 Oct 2022 17:05:10 +0100 Subject: Use new xV_FROM_REF macros --- dump.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'dump.c') diff --git a/dump.c b/dump.c index 6f040812d0..ce4a1cda03 100644 --- a/dump.c +++ b/dump.c @@ -804,8 +804,7 @@ Perl_dump_sub_perl(pTHX_ const GV *gv, bool justperl) PERL_ARGS_ASSERT_DUMP_SUB_PERL; - cv = isGV_with_GP(gv) ? GvCV(gv) : - (assert(SvROK((SV*)gv)), (CV*)SvRV((SV*)gv)); + cv = isGV_with_GP(gv) ? GvCV(gv) : CV_FROM_REF((SV*)gv); if (justperl && (CvISXSUB(cv) || !CvROOT(cv))) return; @@ -877,10 +876,8 @@ S_gv_display(pTHX_ GV *gv) if (isGV_with_GP(gv)) gv_fullname3(raw, gv, NULL); else { - assert(SvROK(gv)); - assert(SvTYPE(SvRV(gv)) == SVt_PVCV); Perl_sv_catpvf(aTHX_ raw, "cv ref: %s", - SvPV_nolen_const(cv_name((CV *)SvRV(gv), name, 0))); + SvPV_nolen_const(cv_name(CV_FROM_REF(gv), name, 0))); } rawpv = SvPV_const(raw, len); generic_pv_escape(name, rawpv, len, SvUTF8(raw)); -- cgit v1.2.1