Revision: 14226
Author: yang...@chromium.org
Date: Thu Apr 11 05:00:57 2013
Log: Merged r14224 into trunk branch.
Fix JSON.stringify's slow path wrt sliced strings.
BUG=229923
R=mvstan...@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14170004
http://code.google.com/p/v8/source/detail?r=14226
Added:
/trunk/test/mjsunit/regress/regress-crbug-229923.js
Modified:
/trunk/src/json-stringifier.h
/trunk/src/version.cc
=======================================
--- /dev/null
+++ /trunk/test/mjsunit/regress/regress-crbug-229923.js Thu Apr 11 05:00:57
2013
@@ -0,0 +1,41 @@
+// Copyright 2013 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials provided
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Flags: --expose-externalize-string
+
+var slice = "slow path of JSON.stringify for sliced string".substring(1);
+assertEquals('"' + slice + '"', JSON.stringify(slice, null, 0));
+
+var parent = "external string turned into two byte";
+var slice_of_external = parent.substring(1);
+try {
+ // Turn the string to a two-byte external string, so that the sliced
+ // string looks like one-byte, but its parent is actually two-byte.
+ externalizeString(parent, true);
+} catch (e) { }
+assertEquals('"' + slice_of_external + '"',
+ JSON.stringify(slice_of_external, null, 0));
=======================================
--- /trunk/src/json-stringifier.h Tue Apr 9 02:52:22 2013
+++ /trunk/src/json-stringifier.h Thu Apr 11 05:00:57 2013
@@ -295,29 +295,23 @@
return stringifier.Stringify(object);
}
- object = FlattenGetString(object);
+ FlattenString(object);
ASSERT(object->IsFlat());
- if (object->IsOneByteRepresentation()) {
+ if (object->IsOneByteRepresentationUnderneath()) {
Handle<String> result =
isolate->factory()->NewRawOneByteString(worst_case_length);
AssertNoAllocation no_alloc;
- const uint8_t* start = object->IsSeqOneByteString()
- ? SeqOneByteString::cast(*object)->GetChars()
- : ExternalAsciiString::cast(*object)->GetChars();
return StringifyString_<SeqOneByteString>(
isolate,
- Vector<const uint8_t>(start, object->length()),
+ object->GetFlatContent().ToOneByteVector(),
result);
} else {
Handle<String> result =
isolate->factory()->NewRawTwoByteString(worst_case_length);
AssertNoAllocation no_alloc;
- const uc16* start = object->IsSeqTwoByteString()
- ? SeqTwoByteString::cast(*object)->GetChars()
- : ExternalTwoByteString::cast(*object)->GetChars();
return StringifyString_<SeqTwoByteString>(
isolate,
- Vector<const uc16>(start, object->length()),
+ object->GetFlatContent().ToUC16Vector(),
result);
}
}
=======================================
--- /trunk/src/version.cc Tue Apr 9 02:52:22 2013
+++ /trunk/src/version.cc Thu Apr 11 05:00:57 2013
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 17
#define BUILD_NUMBER 16
-#define PATCH_LEVEL 1
+#define PATCH_LEVEL 2
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
