Change 33457 by [EMAIL PROTECTED] on 2008/03/10 11:07:11
Subject: [PATCH] count-only transliteration needlessly makes
copy-on-write
From: "Yitzchak Scott-Thoennes" <[EMAIL PROTECTED]>
Date: Tue, 4 Mar 2008 16:54:29 -0800 (PST)
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/doop.c#200 edit
... //depot/perl/t/op/tr.t#39 edit
Differences ...
==== //depot/perl/doop.c#200 (text) ====
Index: perl/doop.c
--- perl/doop.c#199~33291~ 2008-02-12 05:15:20.000000000 -0800
+++ perl/doop.c 2008-03-10 04:07:11.000000000 -0700
@@ -633,10 +633,10 @@
PERL_ARGS_ASSERT_DO_TRANS;
- if (SvREADONLY(sv)) {
+ if (SvREADONLY(sv) && !(PL_op->op_private & OPpTRANS_IDENTICAL)) {
if (SvIsCOW(sv))
sv_force_normal_flags(sv, 0);
- if (SvREADONLY(sv) && !(PL_op->op_private & OPpTRANS_IDENTICAL))
+ if (SvREADONLY(sv))
Perl_croak(aTHX_ PL_no_modify);
}
(void)SvPV_const(sv, len);
==== //depot/perl/t/op/tr.t#39 (xtext) ====
Index: perl/t/op/tr.t
--- perl/t/op/tr.t#38~31130~ 2007-05-03 09:04:13.000000000 -0700
+++ perl/t/op/tr.t 2008-03-10 04:07:11.000000000 -0700
@@ -6,7 +6,7 @@
require './test.pl';
}
-plan tests => 117;
+plan tests => 118;
my $Is_EBCDIC = (ord('i') == 0x89 & ord('J') == 0xd1);
@@ -461,3 +461,10 @@
is($c, "\x20\x30\x40\x50\x60", "tr/\\x00-\\x1f//d");
}
+($s) = keys %{{pie => 3}};
+my $wasro = Internals::SvREADONLY($s);
+{
+ $wasro or local $TODO = "didn't have a COW";
+ $s =~ tr/i//;
+ ok( Internals::SvREADONLY($s), "count-only tr doesn't deCOW COWs" );
+}
End of Patch.