make comparisons promote to utf8 as necessary (from Gisle Aas)

p4raw-id: //depot/perl@5138

1 files changed, 9 insertions, 0 deletions

diff --git a/pp_hot.c b/pp_hot.c
index 8dab65150c..ddb900f261 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -184,7 +184,16 @@ PP(pp_concat)
 	    }
 	}
 #endif
+	if (DO_UTF8(right))
+	    sv_utf8_upgrade(TARG);
 	sv_catpvn(TARG,s,len);
+	if (!IN_BYTE) {
+	    if (SvUTF8(right))
+		SvUTF8_on(TARG);
+	}
+	else if (!SvUTF8(right)) {
+	    SvUTF8_off(TARG);
+	}
     }
     else
 	sv_setpvn(TARG,s,len);	/* suppress warning */