disable cv_do_inline, op_clone_sv

only needed for PERL_INLINE_SUBS, not for role cloning.

Author: rurban

embed.fnc

@@ -1276,12 +1276,12 @@ i|core_types_t	|stash_to_coretype|NULLOK const HV* stash
 s|core_types_t	|arg_type_sv	|NN SV* sv|NULLOK char** usertype|NULLOK int* u8
 in	|int	|match_type1	|const U32 sig|core_types_t arg1
 in	|int	|match_type2	|const U32 sig|core_types_t arg1|core_types_t arg2
+i	|OP*	|new_entersubop |NN GV* gv |NN OP* arg
 #    ifdef PERL_INLINE_SUBS
 sM	|bool	|cv_check_inline|NN const OP *o|NN CV *compcv
-#    endif
 sM	|OP*	|cv_do_inline   |NULLOK OP *parent|NN OP *o|NN OP *cvop|NN CV *cv
-i	|OP*	|new_entersubop |NN GV* gv |NN OP* arg
 sM	|OP*	|op_clone_sv	|NN OP* o
+#    endif
 #  endif
 #endif
 : Used in op.c, pp_hot.c, and universal.c

embed.h

@@ -565,7 +565,6 @@
 #define op_append_elem(a,b,c)	Perl_op_append_elem(aTHX_ a,b,c)
 #define op_append_list(a,b,c)	Perl_op_append_list(aTHX_ a,b,c)
 #define op_class(a)		Perl_op_class(aTHX_ a)
-#define op_clone_optree(a,b)	Perl_op_clone_optree(aTHX_ a,b)
 #define op_contextualize(a,b)	Perl_op_contextualize(aTHX_ a,b)
 #define op_convert_list(a,b,c)	Perl_op_convert_list(aTHX_ a,b,c)
 #define op_dump(a)		Perl_op_dump(aTHX_ a)
@@ -1066,6 +1065,7 @@
 #define newPADNAMEpvn_flags	Perl_newPADNAMEpvn_flags
 #define newSVsv(a)		Perl_newSVsv(aTHX_ a)
 #define numfields(a)		Perl_numfields(aTHX_ a)
+#define op_clone_optree(a,b)	Perl_op_clone_optree(aTHX_ a,b)
 #define op_dump_cv(a,b)		Perl_op_dump_cv(aTHX_ a,b)
 #define op_lvalue_flags(a,b,c)	Perl_op_lvalue_flags(aTHX_ a,b,c)
 #define pad_find_outer(a,b)	Perl_pad_find_outer(aTHX_ a,b)
@@ -1896,6 +1896,8 @@
 #    if defined(PERL_IN_OP_C)
 #      if defined(USE_CPERL)
 #define cv_check_inline(a,b)	S_cv_check_inline(aTHX_ a,b)
+#define cv_do_inline(a,b,c,d)	S_cv_do_inline(aTHX_ a,b,c,d)
+#define op_clone_sv(a)		S_op_clone_sv(aTHX_ a)
 #      endif
 #    endif
 #  endif
@@ -2077,7 +2079,6 @@
 #define const_av_xsub(a)	S_const_av_xsub(aTHX_ a)
 #define const_sv_xsub(a)	S_const_sv_xsub(aTHX_ a)
 #define core_type_name(a)	S_core_type_name(aTHX_ a)
-#define cv_do_inline(a,b,c,d)	S_cv_do_inline(aTHX_ a,b,c,d)
 #define do_method_finalize(a,b,c,d)	S_do_method_finalize(aTHX_ a,b,c,d)
 #define io_hints(a)		S_io_hints(aTHX_ a)
 #define is_types_strict()	S_is_types_strict(aTHX)
@@ -2093,7 +2094,6 @@
 #define new_entersubop(a,b)	S_new_entersubop(aTHX_ a,b)
 #define new_slab(a)		S_new_slab(aTHX_ a)
 #define op_check_type(a,b,c,d)	S_op_check_type(aTHX_ a,b,c,d)
-#define op_clone_sv(a)		S_op_clone_sv(aTHX_ a)
 #define op_const_sv(a,b,c)	S_op_const_sv(aTHX_ a,b,c)
 #define op_destroy(a)		S_op_destroy(aTHX_ a)
 #define op_fixup(a,b,c)		S_op_fixup(aTHX_ a,b,c)

op.c

@@ -11728,6 +11728,8 @@ Perl_op_clone_optree(pTHX_ OP* o, bool init) {
     return first;
 }
 
+#ifdef PERL_INLINE_SUBS
+
 /* clones the underlying data, not the op.
  * TODO: finish
  */
@@ -11864,7 +11866,7 @@ S_cv_do_inline(pTHX_ OP* parent, OP *o, OP *cvop, CV *cv)
         return NULL;
     firstop = o; /* that's the LEAVESUB, will be converted into a LEAVE or skipped */
     assert(IS_TYPE(firstop, LEAVESUB));
-    /* scan the new body - to be inlined - if enter/leave is needed, 
+    /* scan the new body - to be inlined - if enter/leave is needed,
      * if it's too large, and convert all nextstate to setstate+keepstate's.
      * forgot about the seen_logop.
      */
@@ -12097,6 +12099,8 @@ S_cv_do_inline(pTHX_ OP* parent, OP *o, OP *cvop, CV *cv)
     return firstop;
 }
 
+#endif
+
 static void
 S_already_defined(pTHX_ CV *const cv, OP * const block, OP * const o,
 			PADNAME * const name, SV ** const const_svp)

proto.h

@@ -4178,13 +4178,6 @@ PERL_CALLCONV void	Perl_op_clear(pTHX_ OP* o)
 #define PERL_ARGS_ASSERT_OP_CLEAR	\
 	assert(o)
 
-PERL_CALLCONV OP*	Perl_op_clone_optree(pTHX_ OP* o, bool init)
-			__attribute__global__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
-#define PERL_ARGS_ASSERT_OP_CLONE_OPTREE	\
-	assert(o)
-
 PERL_CALLCONV OP*	Perl_op_contextualize(pTHX_ OP* o, I32 context)
 			__attribute__global__
 			__attribute__nonnull__(pTHX_1);
@@ -8077,6 +8070,18 @@ STATIC bool	S_cv_check_inline(pTHX_ const OP *o, CV *compcv)
 #define PERL_ARGS_ASSERT_CV_CHECK_INLINE	\
 	assert(o); assert(compcv)
 
+STATIC OP*	S_cv_do_inline(pTHX_ OP *parent, OP *o, OP *cvop, CV *cv)
+			__attribute__nonnull__(pTHX_2)
+			__attribute__nonnull__(pTHX_3)
+			__attribute__nonnull__(pTHX_4);
+#define PERL_ARGS_ASSERT_CV_DO_INLINE	\
+	assert(o); assert(cvop); assert(cv)
+
+STATIC OP*	S_op_clone_sv(pTHX_ OP* o)
+			__attribute__nonnull__(pTHX_1);
+#define PERL_ARGS_ASSERT_OP_CLONE_SV	\
+	assert(o)
+
 #    endif
 #  endif
 #endif
@@ -8799,13 +8804,6 @@ STATIC void	S_const_sv_xsub(pTHX_ CV* cv)
 #ifndef PERL_NO_INLINE_FUNCTIONS
 PERL_STATIC_INLINE const char *	S_core_type_name(pTHX_ core_types_t t);
 #endif
-STATIC OP*	S_cv_do_inline(pTHX_ OP *parent, OP *o, OP *cvop, CV *cv)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
-#define PERL_ARGS_ASSERT_CV_DO_INLINE	\
-	assert(o); assert(cvop); assert(cv)
-
 STATIC void	S_do_method_finalize(pTHX_ const HV* klass, const CV* cv, OP* o, const PADOFFSET self)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2)
@@ -8885,11 +8883,6 @@ STATIC void	S_op_check_type(pTHX_ OP* o, OP* left, OP* right, bool is_assign)
 #define PERL_ARGS_ASSERT_OP_CHECK_TYPE	\
 	assert(o); assert(left); assert(right)
 
-STATIC OP*	S_op_clone_sv(pTHX_ OP* o)
-			__attribute__nonnull__(pTHX_1);
-#define PERL_ARGS_ASSERT_OP_CLONE_SV	\
-	assert(o)
-
 STATIC SV*	S_op_const_sv(pTHX_ const OP *o, CV *cv, bool allow_lex)
 			__attribute__nonnull__(pTHX_1)
 			__attribute__nonnull__(pTHX_2);
@@ -11279,6 +11272,13 @@ PERL_CALLCONV U16	Perl_numfields(pTHX_ const HV* klass)
 #define PERL_ARGS_ASSERT_NUMFIELDS	\
 	assert(klass)
 
+PERL_CALLCONV OP*	Perl_op_clone_optree(pTHX_ OP* o, bool init)
+			__attribute__global__
+			__attribute__warn_unused_result__
+			__attribute__nonnull__(pTHX_1);
+#define PERL_ARGS_ASSERT_OP_CLONE_OPTREE	\
+	assert(o)
+
 PERL_CALLCONV void	Perl_op_dump_cv(pTHX_ const OP *o, const CV *cv)
 			__attribute__global__
 			__attribute__nonnull__(pTHX_1);