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

runtime/vm/assembler_x64_test.cc

 // Copyright (c) 2012, 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/globals.h"
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/assembler.h"
 #include "vm/os.h"
 #include "vm/unit_test.h"
@@ skipping 1731 matching lines @@
   EXPECT_EQ(0, reinterpret_cast<LogicalTestCode>(test->entry())());
 }
 
 
 ASSEMBLER_TEST_GENERATE(CompareSwapEQ, assembler) {
   __ movq(RAX, Immediate(0));
   __ pushq(RAX);
   __ movq(RAX, Immediate(4));
   __ movq(RCX, Immediate(0));
   __ movq(Address(RSP, 0), RAX);
-  __ LockCmpxchgq(Address(RSP, 0), RCX);
+  __ lock_cmpxchgq(Address(RSP, 0), RCX);
   __ popq(RAX);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(CompareSwapEQ, test) {
   typedef int (*CompareSwapEQCode)();
   EXPECT_EQ(0, reinterpret_cast<CompareSwapEQCode>(test->entry())());
 }
 
 
 ASSEMBLER_TEST_GENERATE(CompareSwapNEQ, assembler) {
   __ movq(RAX, Immediate(0));
   __ pushq(RAX);
   __ movq(RAX, Immediate(2));
   __ movq(RCX, Immediate(4));
   __ movq(Address(RSP, 0), RCX);
-  __ LockCmpxchgq(Address(RSP, 0), RCX);
+  __ lock_cmpxchgq(Address(RSP, 0), RCX);
   __ popq(RAX);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(CompareSwapNEQ, test) {
   typedef int (*CompareSwapNEQCode)();
   EXPECT_EQ(4, reinterpret_cast<CompareSwapNEQCode>(test->entry())());
 }
 
 
-ASSEMBLER_TEST_GENERATE(CompareSwapEQ32, assembler) {
-  __ movq(RAX, Immediate(0x100000000));
-  __ pushq(RAX);
-  __ movq(RAX, Immediate(4));
-  __ movq(RCX, Immediate(0));
-  // 32 bit store of 4.
-  __ movl(Address(RSP, 0), RAX);
-  // Compare 32 bit memory location with RAX (4) and write 0.
-  __ LockCmpxchgl(Address(RSP, 0), RCX);
-  // Pop unchanged high word and zeroed out low word.
-  __ popq(RAX);
-  __ ret();
-}
-
-
-ASSEMBLER_TEST_RUN(CompareSwapEQ32, test) {
-  typedef intptr_t (*CompareSwapEQ32Code)();
-  EXPECT_EQ(0x100000000,
-            reinterpret_cast<CompareSwapEQ32Code>(test->entry())());
-}
-
-
-ASSEMBLER_TEST_GENERATE(CompareSwapNEQ32, assembler) {
-  __ movq(RAX, Immediate(0x100000000));
-  __ pushq(RAX);
-  __ movq(RAX, Immediate(2));
-  __ movq(RCX, Immediate(4));
-  __ movl(Address(RSP, 0), RCX);
-  __ LockCmpxchgl(Address(RSP, 0), RCX);
-  __ popq(RAX);
-  __ ret();
-}
-
-
-ASSEMBLER_TEST_RUN(CompareSwapNEQ32, test) {
-  typedef intptr_t (*CompareSwapNEQ32Code)();
-  EXPECT_EQ(0x100000004l,
-            reinterpret_cast<CompareSwapNEQ32Code>(test->entry())());
-}
-
-
 ASSEMBLER_TEST_GENERATE(Exchange, assembler) {
   __ movq(RAX, Immediate(kLargeConstant));
   __ movq(RDX, Immediate(kAnotherLargeConstant));
   __ xchgq(RAX, RDX);
   __ subq(RAX, RDX);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(Exchange, test) {
@@ skipping 1788 matching lines @@
   int res = reinterpret_cast<ConditionalMovesNoOverflowCode>(test->entry())(
       0x7fffffffffffffff, 2);
   EXPECT_EQ(1, res);
   res = reinterpret_cast<ConditionalMovesNoOverflowCode>(test->entry())(1, 1);
   EXPECT_EQ(0, res);
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64