Issue - 7123

vm/raw_object_snapshot.cc

Index: vm/raw_object_snapshot.cc
===================================================================
--- vm/raw_object_snapshot.cc	(revision 15761)
+++ vm/raw_object_snapshot.cc	(working copy)
@@ -1602,11 +1602,12 @@
 }
 
 
-template<typename StringType, typename CharacterType>
+template<typename StringType, typename CharacterType, typename CallbackType>
 void String::ReadFromImpl(SnapshotReader* reader,
                           String* str_obj,
                           intptr_t len,
                           intptr_t tags,
+                          CallbackType new_symbol,
                           Snapshot::Kind kind) {
   ASSERT(reader != NULL);
   if (RawObject::IsCanonical(tags)) {
@@ -1617,7 +1618,7 @@
     for (intptr_t i = 0; i < len; i++) {
       ptr[i] = reader->Read<CharacterType>();
     }
-    *str_obj ^= Symbols::NewSymbol(ptr, len);
+    *str_obj ^= (*new_symbol)(ptr, len);
   } else {
     // Set up the string object.
     *str_obj = StringType::New(len, HEAP_SPACE(kind));
@@ -1653,7 +1654,7 @@
     ASSERT((hash == 0) || (String::Hash(str_obj, 0, str_obj.Length()) == hash));
   } else {
     String::ReadFromImpl<OneByteString, uint8_t>(
-        reader, &str_obj, len, tags, kind);
+        reader, &str_obj, len, tags, Symbols::FromLatin1, kind);
   }
   reader->AddBackRef(object_id, &str_obj, kIsDeserialized);
   return raw(str_obj);
@@ -1684,7 +1685,7 @@
     ASSERT(String::Hash(str_obj, 0, str_obj.Length()) == hash);
   } else {
     String::ReadFromImpl<TwoByteString, uint16_t>(
-        reader, &str_obj, len, tags, kind);
+        reader, &str_obj, len, tags, Symbols::FromUTF16, kind);
   }
   reader->AddBackRef(object_id, &str_obj, kIsDeserialized);
   return raw(str_obj);