In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/23e51b95a8db32227346e84c1c77148c98aba157?hp=4b95171127a01794922992bc572a52c26ca4ed4c>

- Log -----------------------------------------------------------------
commit 23e51b95a8db32227346e84c1c77148c98aba157
Author: Tony Cook <[email protected]>
Date:   Tue Jun 16 10:17:47 2015 +1000

    add Martijn Lievaart as a perl author

M       AUTHORS

commit 065d96f721ebbc64a2ed3b79ad2cfd53f84f418b
Author: Martijn Lievaart <[email protected]>
Date:   Mon Jun 15 17:04:56 2015 +1000

    Avoid gcc warning "‘start’ may be used uninitialized in this function"

M       op.c
-----------------------------------------------------------------------

Summary of changes:
 AUTHORS |  1 +
 op.c    | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a164e7c..779cd68 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -784,6 +784,7 @@ Marko Asplund                       
<[email protected]>
 Marnix van Ammers              <[email protected]>
 Martien Verbruggen             <[email protected]>
 Martijn Koster                 <[email protected]>
+Martijn Lievaart               <[email protected]>
 Martin Hasch                   <[email protected]>
 Martin Husemann                        <[email protected]>
 Martin J. Bligh                        <[email protected]>
diff --git a/op.c b/op.c
index 76eee2b..2c2c520 100644
--- a/op.c
+++ b/op.c
@@ -8142,14 +8142,13 @@ Perl_newMYSUB(pTHX_ I32 floor, OP *o, OP *proto, OP 
*attrs, OP *block)
                   : newUNOP(OP_LEAVESUB, 0, scalarseq(block));
        start = LINKLIST(block);
        block->op_next = 0;
+        if (ps && !*ps && !attrs && !CvLVALUE(compcv))
+            const_sv = S_op_const_sv(aTHX_ start, compcv, FALSE);
+        else
+            const_sv = NULL;
     }
-
-    if (!block || !ps || *ps || attrs
-       || CvLVALUE(compcv)
-       )
-       const_sv = NULL;
     else
-       const_sv = S_op_const_sv(aTHX_ start, compcv, FALSE);
+        const_sv = NULL;
 
     if (cv) {
         const bool exists = CvROOT(cv) || CvXSUB(cv);
@@ -8547,15 +8546,14 @@ Perl_newATTRSUB_x(pTHX_ I32 floor, OP *o, OP *proto, OP 
*attrs,
                   : newUNOP(OP_LEAVESUB, 0, scalarseq(block));
        start = LINKLIST(block);
        block->op_next = 0;
+        if (ps && !*ps && !attrs && !CvLVALUE(PL_compcv))
+            const_sv =
+                S_op_const_sv(aTHX_ start, PL_compcv, CvCLONE(PL_compcv));
+        else
+            const_sv = NULL;
     }
-
-    if (!block || !ps || *ps || attrs
-       || CvLVALUE(PL_compcv)
-       )
-       const_sv = NULL;
     else
-       const_sv =
-           S_op_const_sv(aTHX_ start, PL_compcv, cBOOL(CvCLONE(PL_compcv)));
+        const_sv = NULL;
 
     if (SvPOK(gv) || (SvROK(gv) && SvTYPE(SvRV(gv)) != SVt_PVCV)) {
        assert (block);

--
Perl5 Master Repository

Reply via email to