Merge r3525 to trunk.

src/x64/fast-codegen-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 1660 matching lines @@
 }
 
 
 Register FastCodeGenerator::result_register() { return rax; }
 
 
 Register FastCodeGenerator::context_register() { return rsi; }
 
 
 void FastCodeGenerator::StoreToFrameField(int frame_offset, Register value) {
-  ASSERT_EQ(POINTER_SIZE_ALIGN(frame_offset), frame_offset);
+  ASSERT(IsAligned(frame_offset, kPointerSize));
   __ movq(Operand(rbp, frame_offset), value);
 }
 
 
 void FastCodeGenerator::LoadContextField(Register dst, int context_index) {
   __ movq(dst, CodeGenerator::ContextOperand(rsi, context_index));
 }
 
 
 // ----------------------------------------------------------------------------
@@ skipping 32 matching lines @@
 
 void FastCodeGenerator::ThrowException() {
   __ push(result_register());
   __ CallRuntime(Runtime::kThrow, 1);
 }
 
 #undef __
 
 
 } }  // namespace v8::internal