Revert "Inline instance object hash code into object header on 64 bit."

runtime/vm/become.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/become.h"
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 
 #include "vm/dart_api_state.h"
 #include "vm/isolate_reload.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
 #include "vm/safepoint.h"
 #include "vm/timeline.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 ForwardingCorpse* ForwardingCorpse::AsForwarder(uword addr, intptr_t size) {
   ASSERT(size >= kObjectAlignment);
   ASSERT(Utils::IsAligned(size, kObjectAlignment));
 
   ForwardingCorpse* result = reinterpret_cast<ForwardingCorpse*>(addr);
 
-  uint32_t tags = 0;
+  uword tags = 0;
   tags = RawObject::SizeTag::update(size, tags);
   tags = RawObject::ClassIdTag::update(kForwardingCorpse, tags);
 
   result->tags_ = tags;
   if (size > RawObject::SizeTag::kMaxSizeTag) {
     *result->SizeAddress() = size;
   }
   result->set_target(Object::null());
   return result;
 }
@@ skipping 218 matching lines @@
     }
     if (after_obj->IsForwardingCorpse()) {
       // The Smalltalk become does allow this, and for very special cases
       // it is important (shape changes to Class or Mixin), but as these
       // cases do not arise in Dart, better to prohibit it.
       FATAL("become: No indirect chains of forwarding");
     }
 
     ForwardObjectTo(before_obj, after_obj);
 
-#if defined(HASH_IN_OBJECT_HEADER)
-    Object::SetCachedHash(after_obj, Object::GetCachedHash(before_obj));
-#else
     // Forward the identity hash too if it has one.
     intptr_t hash = heap->GetHash(before_obj);
     if (hash != 0) {
       ASSERT(heap->GetHash(after_obj) == 0);
       heap->SetHash(after_obj, hash);
     }
-#endif
   }
 
   {
     // Follow forwarding pointers.
 
     // C++ pointers
     ForwardPointersVisitor pointer_visitor(isolate);
     isolate->VisitObjectPointers(&pointer_visitor, true);
 
     // Weak persistent handles.
@@ skipping 17 matching lines @@
   }
 
 #if defined(DEBUG)
   for (intptr_t i = 0; i < before.Length(); i++) {
     ASSERT(before.At(i) == after.At(i));
   }
 #endif
 }
 
 }  // namespace dart