Skip to content

Commit 35b3f9a

Browse files
khwilliamsonkhwilliamson
committed
embed.fnc: mv definition of more_sv
This was in a #ifdef of being in sv.c, which it is, but since it is public, it needs to be moved out of this. This removes the need for a copy of its prototype to be in sv_inline.h
1 parent 4176141 commit 35b3f9a

File tree

4 files changed

+54
-60
lines changed

4 files changed

+54
-60
lines changed

‎embed.fnc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2148,6 +2148,7 @@ p |int |mode_from_discipline \
21482148

21492149
: Used in sv.c and hv.c
21502150
Cop |void * |more_bodies |const svtype sv_type
2151+
Cp |SV * |more_sv
21512152
Cp |const char *|moreswitches \
21522153
|NN const char *s
21532154
Adp |void |mortal_destructor_sv \
@@ -6034,7 +6035,6 @@ S |void |glob_assign_glob \
60346035
|NN SV * const ssv \
60356036
|const int dtype
60366037
S |bool |glob_2number |NN GV * const gv
6037-
Cp |SV * |more_sv
60386038
S |void |not_a_number |NN SV * const sv
60396039
S |void |not_incrementable \
60406040
|NN SV * const sv

‎embed.h‎

Lines changed: 49 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@
377377
# define mg_set(a) Perl_mg_set(aTHX_ a)
378378
# define mg_size(a) Perl_mg_size(aTHX_ a)
379379
# define mini_mktime Perl_mini_mktime
380+
# define more_sv() Perl_more_sv(aTHX)
380381
# define moreswitches(a) Perl_moreswitches(aTHX_ a)
381382
# define mortal_destructor_sv(a,b) Perl_mortal_destructor_sv(aTHX_ a,b)
382383
# define mortal_getenv Perl_mortal_getenv
@@ -1669,6 +1670,54 @@
16691670
# define save_pushptri32ptr(a,b,c,d) S_save_pushptri32ptr(aTHX_ a,b,c,d)
16701671
# define save_scalar_at(a,b) S_save_scalar_at(aTHX_ a,b)
16711672
# endif
1673+
# if defined(PERL_IN_SV_C)
1674+
# define F0convert S_F0convert
1675+
# define anonymise_cv_maybe(a,b) S_anonymise_cv_maybe(aTHX_ a,b)
1676+
# define assert_uft8_cache_coherent(a,b,c,d) S_assert_uft8_cache_coherent(aTHX_ a,b,c,d)
1677+
# define croak_sv_setsv_flags(a,b) S_croak_sv_setsv_flags(aTHX_ a,b)
1678+
# define curse(a,b) S_curse(aTHX_ a,b)
1679+
# define expect_number(a) S_expect_number(aTHX_ a)
1680+
# define find_array_subscript(a,b) S_find_array_subscript(aTHX_ a,b)
1681+
# define find_hash_subscript(a,b) S_find_hash_subscript(aTHX_ a,b)
1682+
# define find_uninit_var(a,b,c,d) S_find_uninit_var(aTHX_ a,b,c,d)
1683+
# define glob_2number(a) S_glob_2number(aTHX_ a)
1684+
# define glob_assign_glob(a,b,c) S_glob_assign_glob(aTHX_ a,b,c)
1685+
# define not_a_number(a) S_not_a_number(aTHX_ a)
1686+
# define not_incrementable(a) S_not_incrementable(aTHX_ a)
1687+
# define ptr_table_find S_ptr_table_find
1688+
# define sv_2iuv_common(a) S_sv_2iuv_common(aTHX_ a)
1689+
# define sv_add_arena(a,b,c) S_sv_add_arena(aTHX_ a,b,c)
1690+
# define sv_display(a,b,c) S_sv_display(aTHX_ a,b,c)
1691+
# define sv_pos_b2u_midway(a,b,c,d) S_sv_pos_b2u_midway(aTHX_ a,b,c,d)
1692+
# define sv_pos_u2b_cached(a,b,c,d,e,f,g) S_sv_pos_u2b_cached(aTHX_ a,b,c,d,e,f,g)
1693+
# define sv_pos_u2b_forwards S_sv_pos_u2b_forwards
1694+
# define sv_pos_u2b_midway S_sv_pos_u2b_midway
1695+
# define sv_unglob(a,b) S_sv_unglob(aTHX_ a,b)
1696+
# define utf8_mg_len_cache_update(a,b,c) S_utf8_mg_len_cache_update(aTHX_ a,b,c)
1697+
# define utf8_mg_pos_cache_update(a,b,c,d,e) S_utf8_mg_pos_cache_update(aTHX_ a,b,c,d,e)
1698+
# define visit(a,b,c) S_visit(aTHX_ a,b,c)
1699+
# if defined(DEBUGGING)
1700+
# define del_sv(a) S_del_sv(aTHX_ a)
1701+
# define sv_mark_arenas() Perl_sv_mark_arenas(aTHX)
1702+
# define sv_sweep_arenas() Perl_sv_sweep_arenas(aTHX)
1703+
# endif
1704+
# if !defined(NV_PRESERVES_UV)
1705+
# if defined(DEBUGGING)
1706+
# define sv_2iuv_non_preserve(a,b) S_sv_2iuv_non_preserve(aTHX_ a,b)
1707+
# else
1708+
# define sv_2iuv_non_preserve(a) S_sv_2iuv_non_preserve(aTHX_ a)
1709+
# endif
1710+
# endif
1711+
# if defined(PERL_DEBUG_READONLY_COW)
1712+
# define sv_buf_to_rw(a) S_sv_buf_to_rw(aTHX_ a)
1713+
# endif
1714+
# if defined(USE_ITHREADS)
1715+
# define sv_dup_common(a,b) S_sv_dup_common(aTHX_ a,b)
1716+
# define sv_dup_hvaux(a,b,c) S_sv_dup_hvaux(aTHX_ a,b,c)
1717+
# define sv_dup_inc_multiple(a,b,c,d) S_sv_dup_inc_multiple(aTHX_ a,b,c,d)
1718+
# define unreferenced_to_tmp_stack(a) S_unreferenced_to_tmp_stack(aTHX_ a)
1719+
# endif
1720+
# endif /* defined(PERL_IN_SV_C) */
16721721
# if defined(PERL_IN_TOKE_C)
16731722
# define ao(a) S_ao(aTHX_ a)
16741723
# define check_unary() S_check_unary(aTHX)
@@ -2121,57 +2170,6 @@
21212170
# define get_regclass_aux_data(a,b,c,d,e,f) Perl_get_regclass_aux_data(aTHX_ a,b,c,d,e,f)
21222171
# endif
21232172
# endif /* defined(PERL_IN_REGEX_ENGINE) */
2124-
# if defined(PERL_IN_SV_C)
2125-
# define more_sv() Perl_more_sv(aTHX)
2126-
# if defined(PERL_CORE)
2127-
# define F0convert S_F0convert
2128-
# define anonymise_cv_maybe(a,b) S_anonymise_cv_maybe(aTHX_ a,b)
2129-
# define assert_uft8_cache_coherent(a,b,c,d) S_assert_uft8_cache_coherent(aTHX_ a,b,c,d)
2130-
# define croak_sv_setsv_flags(a,b) S_croak_sv_setsv_flags(aTHX_ a,b)
2131-
# define curse(a,b) S_curse(aTHX_ a,b)
2132-
# define expect_number(a) S_expect_number(aTHX_ a)
2133-
# define find_array_subscript(a,b) S_find_array_subscript(aTHX_ a,b)
2134-
# define find_hash_subscript(a,b) S_find_hash_subscript(aTHX_ a,b)
2135-
# define find_uninit_var(a,b,c,d) S_find_uninit_var(aTHX_ a,b,c,d)
2136-
# define glob_2number(a) S_glob_2number(aTHX_ a)
2137-
# define glob_assign_glob(a,b,c) S_glob_assign_glob(aTHX_ a,b,c)
2138-
# define not_a_number(a) S_not_a_number(aTHX_ a)
2139-
# define not_incrementable(a) S_not_incrementable(aTHX_ a)
2140-
# define ptr_table_find S_ptr_table_find
2141-
# define sv_2iuv_common(a) S_sv_2iuv_common(aTHX_ a)
2142-
# define sv_add_arena(a,b,c) S_sv_add_arena(aTHX_ a,b,c)
2143-
# define sv_display(a,b,c) S_sv_display(aTHX_ a,b,c)
2144-
# define sv_pos_b2u_midway(a,b,c,d) S_sv_pos_b2u_midway(aTHX_ a,b,c,d)
2145-
# define sv_pos_u2b_cached(a,b,c,d,e,f,g) S_sv_pos_u2b_cached(aTHX_ a,b,c,d,e,f,g)
2146-
# define sv_pos_u2b_forwards S_sv_pos_u2b_forwards
2147-
# define sv_pos_u2b_midway S_sv_pos_u2b_midway
2148-
# define sv_unglob(a,b) S_sv_unglob(aTHX_ a,b)
2149-
# define utf8_mg_len_cache_update(a,b,c) S_utf8_mg_len_cache_update(aTHX_ a,b,c)
2150-
# define utf8_mg_pos_cache_update(a,b,c,d,e) S_utf8_mg_pos_cache_update(aTHX_ a,b,c,d,e)
2151-
# define visit(a,b,c) S_visit(aTHX_ a,b,c)
2152-
# if defined(DEBUGGING)
2153-
# define del_sv(a) S_del_sv(aTHX_ a)
2154-
# define sv_mark_arenas() Perl_sv_mark_arenas(aTHX)
2155-
# define sv_sweep_arenas() Perl_sv_sweep_arenas(aTHX)
2156-
# endif
2157-
# if !defined(NV_PRESERVES_UV)
2158-
# if defined(DEBUGGING)
2159-
# define sv_2iuv_non_preserve(a,b) S_sv_2iuv_non_preserve(aTHX_ a,b)
2160-
# else
2161-
# define sv_2iuv_non_preserve(a) S_sv_2iuv_non_preserve(aTHX_ a)
2162-
# endif
2163-
# endif
2164-
# if defined(PERL_DEBUG_READONLY_COW)
2165-
# define sv_buf_to_rw(a) S_sv_buf_to_rw(aTHX_ a)
2166-
# endif
2167-
# if defined(USE_ITHREADS)
2168-
# define sv_dup_common(a,b) S_sv_dup_common(aTHX_ a,b)
2169-
# define sv_dup_hvaux(a,b,c) S_sv_dup_hvaux(aTHX_ a,b,c)
2170-
# define sv_dup_inc_multiple(a,b,c,d) S_sv_dup_inc_multiple(aTHX_ a,b,c,d)
2171-
# define unreferenced_to_tmp_stack(a) S_unreferenced_to_tmp_stack(aTHX_ a)
2172-
# endif
2173-
# endif /* defined(PERL_CORE) */
2174-
# endif /* defined(PERL_IN_SV_C) */
21752173
# if defined(PERL_MEM_LOG)
21762174
# define mem_log_alloc Perl_mem_log_alloc
21772175
# define mem_log_del_sv Perl_mem_log_del_sv

‎proto.h‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sv_inline.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@
6363
++PL_sv_count; \
6464
} STMT_END
6565

66-
/* Perl_more_sv lives in sv.c, we don't want to inline it.
67-
* but the function declaration seems to be needed. */
68-
SV* Perl_more_sv(pTHX);
69-
7066
/* new_SV(): return a new, empty SV head */
7167
PERL_STATIC_INLINE SV*
7268
Perl_new_sv(pTHX_ const char *file, int line, const char *func)

0 commit comments

Comments
 (0)