Merge bleeding_edge.

test/cctest/test-macro-assembler-x64.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 2631 matching lines @@
   size_t actual_size;
   byte* buffer = static_cast<byte*>(OS::Allocate(Assembler::kMinimalBufferSize,
                                                  &actual_size,
                                                  true));
   CHECK(buffer);
   Isolate* isolate = CcTest::i_isolate();
   HandleScope handles(isolate);
   MacroAssembler assembler(isolate, buffer, static_cast<int>(actual_size));
   MacroAssembler* masm = &assembler;  // Create a pointer for the __ macro.
   masm->set_allow_stub_calls(false);
-  __ push(rbp);
-  __ movq(rbp, rsp);
+  EntryCode(masm);
   __ subq(rsp, Immediate(1 * kPointerSize));
-  EntryCode(masm);
   Label exit;
 
   // Test 1.
   __ movq(rax, Immediate(1));  // Test number.
   __ movq(Operand(rsp, 0 * kPointerSize), Immediate(0));
   __ movq(rcx, Immediate(-1));
   __ Store(Operand(rsp, 0 * kPointerSize), rcx, Representation::Byte());
   __ movq(rcx, Operand(rsp, 0 * kPointerSize));
   __ movl(rdx, Immediate(255));
   __ cmpq(rcx, rdx);
@@ skipping 62 matching lines @@
   __ movq(rcx, Operand(rsp, 0 * kPointerSize));
   __ Set(rdx, V8_2PART_UINT64_C(0x11223344, 55667788));
   __ cmpq(rcx, rdx);
   __ j(not_equal, &exit);
   __ Load(rdx, Operand(rsp, 0 * kPointerSize), Representation::External());
   __ cmpq(rcx, rdx);
   __ j(not_equal, &exit);
 
   __ xor_(rax, rax);  // Success.
   __ bind(&exit);
+  __ addq(rsp, Immediate(1 * kPointerSize));
   ExitCode(masm);
-  __ movq(rsp, rbp);
-  __ pop(rbp);
   __ ret(0);
 
   CodeDesc desc;
   masm->GetCode(&desc);
-  // Call the function from C++.A
+  // Call the function from C++.
   int result = FUNCTION_CAST<F0>(buffer)();
   CHECK_EQ(0, result);
 }
 
 
 #undef __