In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/51418c6ac55f33024e046e599878137a9e0a2e7d?hp=0274d83eb3a030f0f8f1272773543bf78589a47c>
- Log ----------------------------------------------------------------- commit 51418c6ac55f33024e046e599878137a9e0a2e7d Author: Jarkko Hietaniemi <[email protected]> Date: Thu Nov 27 11:52:56 2014 -0500 Hoist switch-local variables. Additionally, svp was shadowed. (clang -Wunreachable-code) M scope.c commit b943805ed26dc8b5a9dab8d9383c8ec13239c77a Author: Jarkko Hietaniemi <[email protected]> Date: Thu Nov 27 11:46:27 2014 -0500 switch-local variables are a bad idea. (another weirdness is that the mg and stash are not explicitly used in the code, so the macros must be assuming their existence.) (clang -Wunreachable-code) M pp.c commit cea80896350bf9218a73437b32b19656cee32abd Author: Jarkko Hietaniemi <[email protected]> Date: Thu Nov 27 10:32:13 2014 -0500 HP-UX dynaloading uses shl_t, not void ptr. M ext/DynaLoader/dl_hpux.xs commit 7fcb36d580fb98f5ddfe401b0f69fcdbf2f94d4c Author: Jarkko Hietaniemi <[email protected]> Date: Thu Nov 27 10:26:48 2014 -0500 hv_store_ent() return value unused. mg.c: In function 'Perl_magic_setlvref': mg.c:2549:2: warning: value computed is not used [-Wunused-value] pp.c: In function 'Perl_pp_refassign': pp.c:6263:2: warning: value computed is not used [-Wunused-value] M mg.c M pp.c commit 7fa99c80306db55ed2bd27d47315cbe599bdd10e Author: Jarkko Hietaniemi <[email protected]> Date: Thu Nov 27 10:25:16 2014 -0500 printf type-matching. M dump.c M ext/DynaLoader/dl_hpux.xs ----------------------------------------------------------------------- Summary of changes: dump.c | 2 +- ext/DynaLoader/dl_hpux.xs | 12 ++++++------ mg.c | 4 ++-- pp.c | 8 +++++--- scope.c | 9 +++------ 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dump.c b/dump.c index 2654402..9090f30 100644 --- a/dump.c +++ b/dump.c @@ -989,7 +989,7 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) generic_pv_escape( tmpsv, label, label_len, (label_flags & SVf_UTF8))); } - Perl_dump_indent(aTHX_ level, file, "SEQ = %d\n", + Perl_dump_indent(aTHX_ level, file, "SEQ = %u\n", cCOPo->cop_seq); break; case OP_ENTERLOOP: diff --git a/ext/DynaLoader/dl_hpux.xs b/ext/DynaLoader/dl_hpux.xs index 2844d2a..70bedb8 100644 --- a/ext/DynaLoader/dl_hpux.xs +++ b/ext/DynaLoader/dl_hpux.xs @@ -94,7 +94,7 @@ dl_load_file(filename, flags=0) DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dl_load_file(%s): ", filename)); obj = shl_load(filename, bind_type, 0L); - DLDEBUG(2,PerlIO_printf(Perl_debug_log, " libref=%x\n", obj)); + DLDEBUG(2,PerlIO_printf(Perl_debug_log, " libref=%p\n", (void*)obj)); end: ST(0) = sv_newmortal() ; if (obj == NULL) @@ -108,7 +108,7 @@ dl_unload_file(libref) void * libref CODE: DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dl_unload_file(%lx):\n", PTR2ul(libref))); - RETVAL = (shl_unload(libref) == 0 ? 1 : 0); + RETVAL = (shl_unload((shl_t)libref) == 0 ? 1 : 0); if (!RETVAL) SaveError(aTHX_ "%s", Strerror(errno)); DLDEBUG(2,PerlIO_printf(Perl_debug_log, " retval = %d\n", RETVAL)); @@ -136,11 +136,11 @@ dl_find_symbol(libhandle, symbolname) errno = 0; status = shl_findsym(&obj, symbolname, TYPE_PROCEDURE, &symaddr); - DLDEBUG(2,PerlIO_printf(Perl_debug_log, " symbolref(PROCEDURE) = %x\n", symaddr)); + DLDEBUG(2,PerlIO_printf(Perl_debug_log, " symbolref(PROCEDURE) = %p\n", (void*)symaddr)); if (status == -1 && errno == 0) { /* try TYPE_DATA instead */ status = shl_findsym(&obj, symbolname, TYPE_DATA, &symaddr); - DLDEBUG(2,PerlIO_printf(Perl_debug_log, " symbolref(DATA) = %x\n", symaddr)); + DLDEBUG(2,PerlIO_printf(Perl_debug_log, " symbolref(DATA) = %p\n", (void*)symaddr)); } if (status == -1) { @@ -164,8 +164,8 @@ dl_install_xsub(perl_name, symref, filename="$Package") void * symref const char * filename CODE: - DLDEBUG(2,PerlIO_printf(Perl_debug_log, "dl_install_xsub(name=%s, symref=%x)\n", - perl_name, symref)); + DLDEBUG(2,PerlIO_printf(Perl_debug_log, "dl_install_xsub(name=%s, symref=%p)\n", + perl_name, (void*)symref)); ST(0) = sv_2mortal(newRV((SV*)newXS_flags(perl_name, (void(*)(pTHX_ CV *))symref, filename, NULL, diff --git a/mg.c b/mg.c index 27c2762..be26512 100644 --- a/mg.c +++ b/mg.c @@ -2547,8 +2547,8 @@ Perl_magic_setlvref(pTHX_ SV *sv, MAGIC *mg) SvREFCNT_inc_simple_NN(SvRV(sv))); break; case SVt_PVHV: - hv_store_ent((HV *)mg->mg_obj, (SV *)mg->mg_ptr, - SvREFCNT_inc_simple_NN(SvRV(sv)), 0); + (void)hv_store_ent((HV *)mg->mg_obj, (SV *)mg->mg_ptr, + SvREFCNT_inc_simple_NN(SvRV(sv)), 0); } if (mg->mg_flags & MGf_PERSIST) NOOP; /* This sv is in use as an iterator var and will be reused, diff --git a/pp.c b/pp.c index e39d66d..5abe647 100644 --- a/pp.c +++ b/pp.c @@ -6229,9 +6229,10 @@ PP(pp_refassign) if (bad) /* diag_listed_as: Assigned value is not %s reference */ DIE(aTHX_ "Assigned value is not a%s reference", bad); + { + MAGIC *mg; + HV *stash; switch (left ? SvTYPE(left) : 0) { - MAGIC *mg; - HV *stash; case 0: { SV * const old = PAD_SV(ARGTARG); @@ -6260,13 +6261,14 @@ PP(pp_refassign) if (UNLIKELY(PL_op->op_private & OPpLVAL_INTRO)) S_localise_helem_lval(aTHX_ (HV *)left, key, SvCANEXISTDELETE(left)); - hv_store_ent((HV *)left, key, SvREFCNT_inc_simple_NN(SvRV(sv)), 0); + (void)hv_store_ent((HV *)left, key, SvREFCNT_inc_simple_NN(SvRV(sv)), 0); } if (PL_op->op_flags & OPf_MOD) SETs(sv_2mortal(newSVsv(sv))); /* XXX else can weak references go stale before they are read, e.g., in leavesub? */ RETURN; + } } PP(pp_lvref) diff --git a/scope.c b/scope.c index 8e13071..a1aa3f5 100644 --- a/scope.c +++ b/scope.c @@ -761,6 +761,9 @@ Perl_leave_scope(pTHX_ I32 base) /* Localise the effects of the TAINT_NOT inside the loop. */ bool was = TAINT_get; + I32 i; + SV *sv; + ANY arg0, arg1, arg2; /* these initialisations are logically unnecessary, but they shut up @@ -983,11 +986,6 @@ Perl_leave_scope(pTHX_ I32 base) Safefree(ARG0_PTR); break; - { - SV **svp; - I32 i; - SV *sv; - case SAVEt_CLEARPADRANGE: i = (I32)((uv >> SAVE_TIGHT_SHIFT) & OPpPADRANGE_COUNTMASK); svp = &PL_curpad[uv >> @@ -1107,7 +1105,6 @@ Perl_leave_scope(pTHX_ I32 base) } } break; - } case SAVEt_DELETE: (void)hv_delete(ARG0_HV, ARG2_PV, ARG1_I32, G_DISCARD); SvREFCNT_dec(ARG0_HV); -- Perl5 Master Repository
