Added ability to lock strings to prevent their representation or encoding from changing.

src/runtime.cc

Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index 2b79bff320a465201c15a1f8776d592b213b4a42..46b01d8a78f75b2b3cdd42c9d19cf88cc149cc0a 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -9051,13 +9051,22 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_ParseJson) {
   ASSERT_EQ(1, args.length());
   CONVERT_ARG_CHECKED(String, source, 0);
 
-  source = Handle<String>(source->TryFlattenGetString());
-  // Optimized fast case where we only have ascii characters.
+  source = FlattenGetString(source);

[Rico, 2011/09/23 07:06:52]

As discussed offline, please change comment in handles.h which states that this
will return a failure object on OOM

[Lasse Reichstein, 2011/09/23 09:54:39]

Done.

+  ASSERT(!source->IsConsString());
+  ASSERT(!source->IsSlicedString());
   Handle<Object> result;
-  if (source->IsSeqAsciiString()) {
-    result = JsonParser<true>::Parse(source);
-  } else {
-    result = JsonParser<false>::Parse(source);
+  {
+    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 (result.is_null()) {
     // Syntax error or stack overflow in scanner.