VM: Reland Inline instance object hash code into object header on 64bit.

runtime/vm/method_recognizer.h

 // Copyright (c) 2014, 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.
 
 #ifndef RUNTIME_VM_METHOD_RECOGNIZER_H_
 #define RUNTIME_VM_METHOD_RECOGNIZER_H_
 
 #include "vm/allocation.h"
 
 namespace dart {
@@ skipping 121 matching lines @@
   V(_HashVMBase, set:_deletedKeys, LinkedHashMap_setDeletedKeys, Dynamic,      \
     0x5e83ecad)                                                                \
   V(::, _classRangeCheck, ClassRangeCheck, Bool, 0x16a2fc83)                   \
   V(::, _classRangeCheckNegative, ClassRangeCheckNegated, Bool, 0x46898c74)    \
   V(::, _classRangeAssert, ClassRangeAssert, Dynamic, 0x3ccbdf6e)              \
   V(::, _classIdEqualsAssert, ClassIdEqualsAssert, Dynamic, 0x4dc80932)        \
 
 
 // List of intrinsics:
 // (class-name, function-name, intrinsification method, fingerprint).
-#define CORE_LIB_INTRINSIC_LIST(V)                                             \
+#define CORE_LIB_NON_HASH_INTRINSIC_LIST(V)                                    \
   V(_Smi, ~, Smi_bitNegate, Smi, 0x6574c6b0)                                   \
   V(_Smi, get:bitLength, Smi_bitLength, Smi, 0x25b356ab)                       \
   V(_Smi, _bitAndFromSmi, Smi_bitAndFromSmi, Smi, 0x490a4da1)                  \
   V(_Bigint, _lsh, Bigint_lsh, Dynamic, 0x40d9f1cc)                            \
   V(_Bigint, _rsh, Bigint_rsh, Dynamic, 0x703f1a40)                            \
   V(_Bigint, _absAdd, Bigint_absAdd, Dynamic, 0x50fb1e47)                      \
   V(_Bigint, _absSub, Bigint_absSub, Dynamic, 0x2beeb34d)                      \
   V(_Bigint, _mulAdd, Bigint_mulAdd, Dynamic, 0x4feffd35)                      \
   V(_Bigint, _sqrAdd, Bigint_sqrAdd, Dynamic, 0x1acf0bbe)                      \
   V(_Bigint, _estQuotientDigit, Bigint_estQuotientDigit, Dynamic, 0x0a2898bb)  \
@@ skipping 30 matching lines @@
   V(_OneByteString, get:hashCode, OneByteString_getHashCode, Smi, 0x78c35fe7)  \
   V(_OneByteString, _substringUncheckedNative,                                 \
     OneByteString_substringUnchecked, OneByteString, 0x3538ad86)               \
   V(_OneByteString, _setAt, OneByteStringSetAt, Dynamic, 0x7d1b2b10)           \
   V(_OneByteString, _allocate, OneByteString_allocate, OneByteString,          \
     0x604ec475)                                                                \
   V(_OneByteString, ==, OneByteString_equality, Bool, 0x4719e83f)              \
   V(_TwoByteString, ==, TwoByteString_equality, Bool, 0x4719e83f)              \
 
 
+#define CORE_LIB_IN_HEADER_HASH_INTRINSIC_LIST(V)                              \
+  V(::, _getHash, Object_getHash, Smi, 0x2827856d)                             \
+  V(::, _setHash, Object_setHash, Object, 0x302d1fe8)                          \
+
+#if defined(HASH_IN_OBJECT_HEADER)
+#define CORE_LIB_INTRINSIC_LIST(V)                                             \
+  CORE_LIB_NON_HASH_INTRINSIC_LIST(V)                                          \
+  CORE_LIB_IN_HEADER_HASH_INTRINSIC_LIST(V)
+#else
+#define CORE_LIB_INTRINSIC_LIST(V)                                             \
+  CORE_LIB_NON_HASH_INTRINSIC_LIST(V)
+#endif
+
 #define CORE_INTEGER_LIB_INTRINSIC_LIST(V)                                     \
   V(_IntegerImplementation, _addFromInteger, Integer_addFromInteger,           \
     Dynamic, 0x6a10c54a)                                                       \
   V(_IntegerImplementation, +, Integer_add, Dynamic, 0x5125faaa)               \
   V(_IntegerImplementation, _subFromInteger, Integer_subFromInteger, Dynamic,  \
     0x3fa4b1ed)                                                                \
   V(_IntegerImplementation, -, Integer_sub, Dynamic, 0x0c94540b)               \
   V(_IntegerImplementation, _mulFromInteger, Integer_mulFromInteger,           \
     Dynamic, 0x3216e299)                                                       \
   V(_IntegerImplementation, *, Integer_mul, Dynamic, 0x4535624c)               \
@@ skipping 378 matching lines @@
 // Class that recognizes factories and returns corresponding result cid.
 class FactoryRecognizer : public AllStatic {
  public:
   // Return kDynamicCid if factory is not recognized.
   static intptr_t ResultCid(const Function& factory);
 };
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_METHOD_RECOGNIZER_H_