Revert "More compact string representation on 64 bit."

runtime/vm/clustered_snapshot.cc

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/clustered_snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
@@ skipping 1893 matching lines @@
   explicit RODataSerializationCluster(intptr_t cid) : cid_(cid) {}
   virtual ~RODataSerializationCluster() {}
 
   void Trace(Serializer* s, RawObject* object) {
     objects_.Add(object);
 
     // A string's hash must already be computed when we write it because it
     // will be loaded into read-only memory.
     if (cid_ == kOneByteStringCid) {
       RawOneByteString* str = static_cast<RawOneByteString*>(object);
-      if (String::GetCachedHash(str) == 0) {
+      if (str->ptr()->hash_ == Smi::New(0)) {
         intptr_t hash =
             String::Hash(str->ptr()->data(), Smi::Value(str->ptr()->length_));
-        String::SetCachedHash(str, hash);
+        str->ptr()->hash_ = Smi::New(hash);
       }
-      ASSERT(String::GetCachedHash(str) != 0);
+      ASSERT(str->ptr()->hash_ != Smi::New(0));
     } else if (cid_ == kTwoByteStringCid) {
       RawTwoByteString* str = static_cast<RawTwoByteString*>(object);
-      if (String::GetCachedHash(str) == 0) {
+      if (str->ptr()->hash_ == Smi::New(0)) {
         intptr_t hash = String::Hash(str->ptr()->data(),
                                      Smi::Value(str->ptr()->length_) * 2);
-        String::SetCachedHash(str, hash);
+        str->ptr()->hash_ = Smi::New(hash);
       }
-      ASSERT(String::GetCachedHash(str) != 0);
+      ASSERT(str->ptr()->hash_ != Smi::New(0));
     }
   }
 
   void WriteAlloc(Serializer* s) {
     s->WriteCid(cid_);
     intptr_t count = objects_.length();
     s->Write<int32_t>(count);
     for (intptr_t i = 0; i < count; i++) {
       RawObject* object = objects_[i];
       int32_t rodata_offset = s->GetDataOffset(object);
@@ skipping 2414 matching lines @@
     }
   }
 
   void WriteFill(Serializer* s) {
     intptr_t count = objects_.length();
     for (intptr_t i = 0; i < count; i++) {
       RawOneByteString* str = objects_[i];
       intptr_t length = Smi::Value(str->ptr()->length_);
       s->Write<int32_t>(length);
       s->Write<bool>(str->IsCanonical());
-      intptr_t hash = String::GetCachedHash(str);
+      intptr_t hash = Smi::Value(str->ptr()->hash_);
       s->Write<int32_t>(hash);
       s->WriteBytes(str->ptr()->data(), length);
     }
   }
 
  private:
   GrowableArray<RawOneByteString*> objects_;
 };
 #endif  // !DART_PRECOMPILED_RUNTIME
 
@@ skipping 19 matching lines @@
     bool is_vm_object = d->isolate() == Dart::vm_isolate();
 
     for (intptr_t id = start_index_; id < stop_index_; id++) {
       RawOneByteString* str = reinterpret_cast<RawOneByteString*>(d->Ref(id));
       intptr_t length = d->Read<int32_t>();
       bool is_canonical = d->Read<bool>();
       Deserializer::InitializeHeader(str, kOneByteStringCid,
                                      OneByteString::InstanceSize(length),
                                      is_vm_object, is_canonical);
       str->ptr()->length_ = Smi::New(length);
-      String::SetCachedHash(str, d->Read<int32_t>());
+      str->ptr()->hash_ = Smi::New(d->Read<int32_t>());
       for (intptr_t j = 0; j < length; j++) {
         str->ptr()->data()[j] = d->Read<uint8_t>();
       }
     }
   }
 };
 
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
 class TwoByteStringSerializationCluster : public SerializationCluster {
@@ skipping 18 matching lines @@
     }
   }
 
   void WriteFill(Serializer* s) {
     intptr_t count = objects_.length();
     for (intptr_t i = 0; i < count; i++) {
       RawTwoByteString* str = objects_[i];
       intptr_t length = Smi::Value(str->ptr()->length_);
       s->Write<int32_t>(length);
       s->Write<bool>(str->IsCanonical());
-      intptr_t hash = String::GetCachedHash(str);
+      intptr_t hash = Smi::Value(str->ptr()->hash_);
       s->Write<int32_t>(hash);
       s->WriteBytes(reinterpret_cast<uint8_t*>(str->ptr()->data()), length * 2);
     }
   }
 
  private:
   GrowableArray<RawTwoByteString*> objects_;
 };
 #endif  // !DART_PRECOMPILED_RUNTIME
 
@@ skipping 19 matching lines @@
     bool is_vm_object = d->isolate() == Dart::vm_isolate();
 
     for (intptr_t id = start_index_; id < stop_index_; id++) {
       RawTwoByteString* str = reinterpret_cast<RawTwoByteString*>(d->Ref(id));
       intptr_t length = d->Read<int32_t>();
       bool is_canonical = d->Read<bool>();
       Deserializer::InitializeHeader(str, kTwoByteStringCid,
                                      TwoByteString::InstanceSize(length),
                                      is_vm_object, is_canonical);
       str->ptr()->length_ = Smi::New(length);
-      String::SetCachedHash(str, d->Read<int32_t>());
+      str->ptr()->hash_ = Smi::New(d->Read<int32_t>());
       uint8_t* cdata = reinterpret_cast<uint8_t*>(str->ptr()->data());
       d->ReadBytes(cdata, length * 2);
     }
   }
 };
 
 
 Serializer::Serializer(Thread* thread,
                        Snapshot::Kind kind,
                        uint8_t** buffer,
@@ skipping 1143 matching lines @@
     thread_->isolate()->SetupImagePage(data_buffer_,
                                        /* is_executable */ false);
   }
 
   deserializer.ReadIsolateSnapshot(thread_->isolate()->object_store());
 
   return ApiError::null();
 }
 
 }  // namespace dart