Skip to content

Commit 935cdb7

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 db711c7 commit 935cdb7

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
@@ -2150,6 +2150,7 @@ p |int |mode_from_discipline \
21502150

21512151
: Used in sv.c and hv.c
21522152
Cop |void * |more_bodies |const svtype sv_type
2153+
Cp |SV * |more_sv
21532154
Cp |const char *|moreswitches \
21542155
|NN const char *s
21552156
Adp |void |mortal_destructor_sv \
@@ -6036,7 +6037,6 @@ S |void |glob_assign_glob \
60366037
|NN SV * const ssv \
60376038
|const int dtype
60386039
S |bool |glob_2number |NN GV * const gv
6039-
Cp |SV * |more_sv
60406040
S |void |not_a_number |NN SV * const sv
60416041
S |void |not_incrementable \
60426042
|NN SV * const sv

‎embed.h‎

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