(Replaced by #7440.)

[p5sagit/p5-mst-13.2.git] / pp_hot.c

diff --git a/pp_hot.c b/pp_hot.c
index c49e929..3f85116 100644 (file)
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -167,14 +167,19 @@ PP(pp_concat)
             U8 *l, *c, *olds = NULL;
             STRLEN targlen;
            s = (U8*)SvPV(right,len);
+           right_utf |= DO_UTF8(right);
             if (TARG == right) {
                /* Take a copy since we're about to overwrite TARG */
-               olds = s;
-               s = (U8*)savepvn((char*)s, len);
+               olds = s = (U8*)savepvn((char*)s, len);
+           }
+           if (!SvOK(left) && SvTYPE(left) <= SVt_PVMG) {
+               if (SvREADONLY(left))
+                   left = sv_2mortal(newSVsv(left));
+               else
+                   sv_setpv(left, ""); /* Suppress warning. */
            }
-           if (!SvOK(left) && SvTYPE(left) <= SVt_PVMG)
-               sv_setpv(left, "");     /* Suppress warning. */
             l = (U8*)SvPV(left, targlen);
+           left_utf |= DO_UTF8(left);
             if (TARG != left)
                 sv_setpvn(TARG, (char*)l, targlen);
             if (!left_utf)
@@ -1338,7 +1343,7 @@ Perl_do_readline(pTHX)
                        }
                        else {
                           PerlIO_rewind(tmpfp);
-                          IoTYPE(io) = '<';
+                          IoTYPE(io) = IoTYPE_RDONLY;
                           IoIFP(io) = fp = tmpfp;
                           IoFLAGS(io) &= ~IOf_UNTAINT;  /* maybe redundant */
                        }
@@ -1392,7 +1397,7 @@ Perl_do_readline(pTHX)
        else if (type == OP_GLOB)
            SP--;
        else if (ckWARN(WARN_IO)        /* stdout/stderr or other write fh */
-                && (IoTYPE(io) == '>' || fp == PerlIO_stdout()
+                && (IoTYPE(io) == IoTYPE_WRONLY || fp == PerlIO_stdout()
                     || fp == PerlIO_stderr()))
        {
            /* integrate with report_evil_fh()? */
@@ -1411,7 +1416,8 @@ Perl_do_readline(pTHX)
        }
     }
     if (!fp) {
-       if (ckWARN2(WARN_GLOB,WARN_CLOSED) && io && !(IoFLAGS(io) & IOf_START)) {
+       if (ckWARN2(WARN_GLOB, WARN_CLOSED)
+               && (!io || !(IoFLAGS(io) & IOf_START))) {
            if (type == OP_GLOB)
                Perl_warner(aTHX_ WARN_GLOB,
                            "glob failed (can't start child: %s)",
@@ -2779,7 +2785,7 @@ PP(pp_aelem)
 {
     djSP;
     SV** svp;
-    I32 elem = POPi;
+    IV elem = POPi;
     AV* av = (AV*)POPs;
     U32 lval = PL_op->op_flags & OPf_MOD;
     U32 defer = (PL_op->op_private & OPpLVAL_DEFER) && (elem > AvFILL(av));