Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(733)

Unified Diff: src/runtime.cc

Issue 8143018: Revert "Added ability to lock strings to prevent their representation or encoding from changing." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/objects-inl.h ('k') | test/cctest/test-api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index 0e1ae4484948d806817af5b66ba71ae65f0f5802..1f52a225de9ceee3a4cefc1d0e1d1e8b785da2e4 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -9139,22 +9139,13 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_ParseJson) {
ASSERT_EQ(1, args.length());
CONVERT_ARG_CHECKED(String, source, 0);
- source = FlattenGetString(source);
- ASSERT(!source->IsConsString());
- ASSERT(!source->IsSlicedString());
+ source = Handle<String>(source->TryFlattenGetString());
+ // Optimized fast case where we only have ascii characters.
Handle<Object> result;
- {
- StringLock lock_representation(source);
- if (source->IsSeqAsciiString()) {
- result = JsonParser<SeqAsciiString>::Parse(source);
- } else if (source->IsExternalTwoByteString()) {
- result = JsonParser<ExternalTwoByteString>::Parse(source);
- } else if (source->IsSeqTwoByteString()) {
- result = JsonParser<SeqTwoByteString>::Parse(source);
- } else {
- ASSERT(source->IsExternalAsciiString());
- result = JsonParser<ExternalAsciiString>::Parse(source);
- }
+ if (source->IsSeqAsciiString()) {
+ result = JsonParser<true>::Parse(source);
+ } else {
+ result = JsonParser<false>::Parse(source);
}
if (result.is_null()) {
// Syntax error or stack overflow in scanner.
« no previous file with comments | « src/objects-inl.h ('k') | test/cctest/test-api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698