diff options
| author | Daniel Dragan <bulk88@hotmail.com> | 2012-10-08 02:13:22 -0400 |
|---|---|---|
| committer | Steve Hay <steve.m.hay@googlemail.com> | 2012-10-09 20:59:01 +0100 |
| commit | cdc4a17406010fd176cecceef1e025e34a60202f (patch) | |
| tree | b18b5be657986a6db3adabd736d6490a5044b8de /proto.h | |
| parent | 5a2b28cee560cf253bd6a196081dfbe2ac9bb22a (diff) | |
| download | perl-cdc4a17406010fd176cecceef1e025e34a60202f.tar.gz | |
have embed.pl add PERL_CALLCONV_NO_RET to noreturn statics
In commit 12a2785c7e8 PERL_CALLCONV_NO_RET was added to allow MS Visual C's
noreturn to work. In that commit, statics did not get a PERL_CALLCONV_NO_RET
so Visual C may not always figure out that a certain static is a noreturn.
This patch fixes that and allows statics to be Visual C noreturns. I
observed a drop in the .text section from 0xBEAAF to 0xBE8CF on no
DEBUGGING 32 bit VC 2003 -01 -GL/-LTCG after applying this.
Diffstat (limited to 'proto.h')
| -rw-r--r-- | proto.h | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -5626,7 +5626,7 @@ STATIC void S_hv_magic_check(HV *hv, bool *needs_copy, bool *needs_store) #define PERL_ARGS_ASSERT_HV_MAGIC_CHECK \ assert(hv); assert(needs_copy); assert(needs_store) -STATIC void S_hv_notallowed(pTHX_ int flags, const char *key, I32 klen, const char *msg) +PERL_CALLCONV_NO_RET STATIC void S_hv_notallowed(pTHX_ int flags, const char *key, I32 klen, const char *msg) __attribute__noreturn__ __attribute__nonnull__(pTHX_2) __attribute__nonnull__(pTHX_4); @@ -5992,10 +5992,10 @@ STATIC SV* S_mayberelocate(pTHX_ const char *const dir, STRLEN len, U32 flags) #define PERL_ARGS_ASSERT_MAYBERELOCATE \ assert(dir) -STATIC void S_minus_v(pTHX) +PERL_CALLCONV_NO_RET STATIC void S_minus_v(pTHX) __attribute__noreturn__; -STATIC void S_my_exit_jump(pTHX) +PERL_CALLCONV_NO_RET STATIC void S_my_exit_jump(pTHX) __attribute__noreturn__; STATIC void S_nuke_stacks(pTHX); @@ -6006,10 +6006,10 @@ STATIC PerlIO * S_open_script(pTHX_ const char *scriptname, bool dosearch, bool assert(scriptname); assert(suidscript) STATIC void* S_parse_body(pTHX_ char **env, XSINIT_t xsinit); -STATIC void S_run_body(pTHX_ I32 oldscope) +PERL_CALLCONV_NO_RET STATIC void S_run_body(pTHX_ I32 oldscope) __attribute__noreturn__; -STATIC void S_usage(pTHX) +PERL_CALLCONV_NO_RET STATIC void S_usage(pTHX) __attribute__noreturn__; #endif @@ -6522,7 +6522,7 @@ STATIC char * S_nextchar(pTHX_ struct RExC_state_t *pRExC_state) #define PERL_ARGS_ASSERT_NEXTCHAR \ assert(pRExC_state) -STATIC void S_re_croak2(pTHX_ const char* pat1, const char* pat2, ...) +PERL_CALLCONV_NO_RET STATIC void S_re_croak2(pTHX_ const char* pat1, const char* pat2, ...) __attribute__noreturn__ __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2); @@ -7090,7 +7090,7 @@ STATIC I32 S_lop(pTHX_ I32 f, int x, char *s) #define PERL_ARGS_ASSERT_LOP \ assert(s) -STATIC void S_missingterm(pTHX_ char *s) +PERL_CALLCONV_NO_RET STATIC void S_missingterm(pTHX_ char *s) __attribute__noreturn__; STATIC SV* S_new_constant(pTHX_ const char *s, STRLEN len, const char *key, STRLEN keylen, SV *sv, SV *pv, const char *type, STRLEN typelen) @@ -7297,7 +7297,7 @@ STATIC SV * S_with_queued_errors(pTHX_ SV *ex) #define PERL_ARGS_ASSERT_WITH_QUEUED_ERRORS \ assert(ex) -STATIC char * S_write_no_mem(pTHX) +PERL_CALLCONV_NO_RET STATIC char * S_write_no_mem(pTHX) __attribute__noreturn__; # if defined(PERL_MEM_LOG) && !defined(PERL_MEM_LOG_NOIMPL) |