Move S_CvDEPTHp from cv.h to inline.h; shrink macros

This allows us to use assert() inside S_CvDEPTHp, so we no longer need
GCC and non-GCC variants of the macro that calls it.

1 files changed, 11 insertions, 0 deletions

diff --git a/inline.h b/inline.h
index eee1097b1e..2b988a2019 100644
--- a/inline.h
+++ b/inline.h
@@ -12,6 +12,17 @@
  * Each section names the header file that the functions "belong" to.
  */
 
+/* ------------------------------- cv.h ------------------------------- */
+
+PERL_STATIC_INLINE I32 *
+S_CvDEPTHp(const CV * const sv)
+{
+    assert(SvTYPE(sv) == SVt_PVCV || SvTYPE(sv) == SVt_PVFM);
+    return SvTYPE(sv) == SVt_PVCV
+	? &((XPVCV*)SvANY(sv))->xcv_depth
+	: &((XPVCV*)SvANY(sv))->xpv_fmdepth;
+}
+
 /* ------------------------------- sv.h ------------------------------- */
 
 PERL_STATIC_INLINE SV *