Revert "Move Perl_ref(), Perl_sv_unref() from mathoms to macros"

This reverts commit 08ad541.

Author: khwilliamson

embed.fnc

@@ -3526,7 +3526,7 @@ Adp	|int	|sv_unmagic	|NN SV * const sv			\
 Adp	|int	|sv_unmagicext	|NN SV * const sv			\
 				|const int type 			\
 				|NULLOK const MGVTBL *vtbl
-Admp	|void	|sv_unref	|NN SV *sv
+AMbdp	|void	|sv_unref	|NN SV *sv
 Adp	|void	|sv_unref_flags |NN SV * const ref			\
 				|const U32 flags
 Cdp	|void	|sv_untaint	|NN SV * const sv
@@ -4789,7 +4789,7 @@ ST	|int	|adjust_size_and_find_bucket				\
 #endif
 #if defined(PERL_IN_MATHOMS_C) || defined(PERL_IN_OP_C) || \
     defined(PERL_IN_PERLY_C)   || defined(PERL_IN_TOKE_C)
-mp	|OP *	|ref		|NULLOK OP *o				\
+Mbp	|OP *	|ref		|NULLOK OP *o				\
 				|I32 type
 #endif
 #if defined(PERL_IN_MG_C)

embed.h

@@ -818,7 +818,6 @@
 # define sv_uni_display(a,b,c,d)                Perl_sv_uni_display(aTHX_ a,b,c,d)
 # define sv_unmagic(a,b)                        Perl_sv_unmagic(aTHX_ a,b)
 # define sv_unmagicext(a,b,c)                   Perl_sv_unmagicext(aTHX_ a,b,c)
-# define sv_unref(a)                            Perl_sv_unref(aTHX,a)
 # define sv_unref_flags(a,b)                    Perl_sv_unref_flags(aTHX_ a,b)
 # define sv_untaint(a)                          Perl_sv_untaint(aTHX_ a)
 # define sv_upgrade(a,b)                        Perl_sv_upgrade(aTHX_ a,b)
@@ -1500,10 +1499,6 @@
 #   if defined(PERL_IN_MALLOC_C)
 #     define adjust_size_and_find_bucket        S_adjust_size_and_find_bucket
 #   endif
-#   if defined(PERL_IN_MATHOMS_C) || defined(PERL_IN_OP_C) || \
-       defined(PERL_IN_PERLY_C)   || defined(PERL_IN_TOKE_C)
-#     define ref(a,b)                           Perl_ref(aTHX,a,b)
-#   endif
 #   if defined(PERL_IN_MG_C)
 #     define fixup_errno_string(a)              S_fixup_errno_string(aTHX_ a)
 #     define magic_methcall1(a,b,c,d,e,f)       S_magic_methcall1(aTHX_ a,b,c,d,e,f)

mathoms.c

@@ -73,6 +73,23 @@
  * without a compiler warning */
 GCC_DIAG_IGNORE(-Wdeprecated-declarations)
 
+/* ref() is now a macro using Perl_doref;
+ * this version provided for binary compatibility only.
+ */
+OP *
+Perl_ref(pTHX_ OP *o, I32 type)
+{
+    return doref(o, type, TRUE);
+}
+
+void
+Perl_sv_unref(pTHX_ SV *sv)
+{
+    PERL_ARGS_ASSERT_SV_UNREF;
+
+    sv_unref_flags(sv, 0);
+}
+
 #if defined(HUGE_VAL) || (defined(USE_LONG_DOUBLE) && defined(HUGE_VALL))
 /*
  * This hack is to force load of "huge" support from libm.a

op.h

@@ -670,7 +670,7 @@ typedef enum {
                                                    list of SVs */
 
 #if defined(PERL_IN_PERLY_C) || defined(PERL_IN_OP_C) || defined(PERL_IN_TOKE_C)
-#define Perl_ref(mTHX, o, type)  Perl_doref(aTHX_ o, type, TRUE)
+#define ref(o, type) doref(o, type, TRUE)
 #endif
 
 

proto.h

@@ -2172,7 +2172,7 @@ Returns the hash for C<sv> created by C<L</newSVpvn_share>>.
 #endif
 
 
-#define Perl_sv_unref(mTHX, sv)  Perl_sv_unref_flags(aTHX_ sv, 0)
+#define sv_unref(sv)    	sv_unref_flags(sv, 0)
 #define Perl_sv_force_normal(mTHX, sv)  Perl_sv_force_normal_flags(aTHX_ sv, 0)
 #define Perl_sv_usepvn(mTHX, sv, p, l)                                  \
         Perl_sv_usepvn_flags(aTHX_ sv, p, l, 0)