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

src/runtime.cc

 // Copyright 2011 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
@@ skipping 9033 matching lines @@
   if (!global->IsJSGlobalObject()) return isolate->heap()->null_value();
   return JSGlobalObject::cast(global)->global_receiver();
 }
 
 
 RUNTIME_FUNCTION(MaybeObject*, Runtime_ParseJson) {
   HandleScope scope(isolate);
   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.
     ASSERT(isolate->has_pending_exception());
     return Failure::Exception();
   }
   return *result;
 }
 
 
@@ skipping 4078 matching lines @@
   } else {
     // Handle last resort GC and make sure to allow future allocations
     // to grow the heap without causing GCs (if possible).
     isolate->counters()->gc_last_resort_from_js()->Increment();
     isolate->heap()->CollectAllGarbage(Heap::kNoGCFlags);
   }
 }
 
 
 } }  // namespace v8::internal