1 files changed, 13 insertions, 13 deletions

diff --git a/deps/v8/src/frames-inl.h b/deps/v8/src/frames-inl.h
index a64404c8ed..419adbf73e 100644
--- a/deps/v8/src/frames-inl.h
+++ b/deps/v8/src/frames-inl.h
@@ -21,7 +21,7 @@ inline Address StackHandler::address() const {
 
 inline StackHandler* StackHandler::next() const {
   const int offset = StackHandlerConstants::kNextOffset;
-  return FromAddress(Memory::Address_at(address() + offset));
+  return FromAddress(Memory<Address>(address() + offset));
 }
 
 
@@ -82,19 +82,19 @@ inline Object* BuiltinExitFrame::receiver_slot_object() const {
 
   const int receiverOffset =
       BuiltinExitFrameConstants::kNewTargetOffset + (argc - 1) * kPointerSize;
-  return Memory::Object_at(fp() + receiverOffset);
+  return Memory<Object*>(fp() + receiverOffset);
 }
 
 inline Object* BuiltinExitFrame::argc_slot_object() const {
-  return Memory::Object_at(fp() + BuiltinExitFrameConstants::kArgcOffset);
+  return Memory<Object*>(fp() + BuiltinExitFrameConstants::kArgcOffset);
 }
 
 inline Object* BuiltinExitFrame::target_slot_object() const {
-  return Memory::Object_at(fp() + BuiltinExitFrameConstants::kTargetOffset);
+  return Memory<Object*>(fp() + BuiltinExitFrameConstants::kTargetOffset);
 }
 
 inline Object* BuiltinExitFrame::new_target_slot_object() const {
-  return Memory::Object_at(fp() + BuiltinExitFrameConstants::kNewTargetOffset);
+  return Memory<Object*>(fp() + BuiltinExitFrameConstants::kNewTargetOffset);
 }
 
 inline StandardFrame::StandardFrame(StackFrameIteratorBase* iterator)
@@ -103,22 +103,22 @@ inline StandardFrame::StandardFrame(StackFrameIteratorBase* iterator)
 
 
 inline Object* StandardFrame::GetExpression(int index) const {
-  return Memory::Object_at(GetExpressionAddress(index));
+  return Memory<Object*>(GetExpressionAddress(index));
 }
 
 
 inline void StandardFrame::SetExpression(int index, Object* value) {
-  Memory::Object_at(GetExpressionAddress(index)) = value;
+  Memory<Object*>(GetExpressionAddress(index)) = value;
 }
 
 
 inline Address StandardFrame::caller_fp() const {
-  return Memory::Address_at(fp() + StandardFrameConstants::kCallerFPOffset);
+  return Memory<Address>(fp() + StandardFrameConstants::kCallerFPOffset);
 }
 
 
 inline Address StandardFrame::caller_pc() const {
-  return Memory::Address_at(ComputePCAddress(fp()));
+  return Memory<Address>(ComputePCAddress(fp()));
 }
 
 
@@ -134,14 +134,14 @@ inline Address StandardFrame::ComputeConstantPoolAddress(Address fp) {
 
 inline bool StandardFrame::IsArgumentsAdaptorFrame(Address fp) {
   intptr_t frame_type =
-      Memory::intptr_at(fp + TypedFrameConstants::kFrameTypeOffset);
+      Memory<intptr_t>(fp + TypedFrameConstants::kFrameTypeOffset);
   return frame_type == StackFrame::TypeToMarker(StackFrame::ARGUMENTS_ADAPTOR);
 }
 
 
 inline bool StandardFrame::IsConstructFrame(Address fp) {
   intptr_t frame_type =
-      Memory::intptr_at(fp + TypedFrameConstants::kFrameTypeOffset);
+      Memory<intptr_t>(fp + TypedFrameConstants::kFrameTypeOffset);
   return frame_type == StackFrame::TypeToMarker(StackFrame::CONSTRUCT);
 }
 
@@ -158,7 +158,7 @@ Address JavaScriptFrame::GetParameterSlot(int index) const {
 }
 
 inline void JavaScriptFrame::set_receiver(Object* value) {
-  Memory::Object_at(GetParameterSlot(-1)) = value;
+  Memory<Object*>(GetParameterSlot(-1)) = value;
 }
 
 
@@ -169,7 +169,7 @@ inline bool JavaScriptFrame::has_adapted_arguments() const {
 
 inline Object* JavaScriptFrame::function_slot_object() const {
   const int offset = JavaScriptFrameConstants::kFunctionOffset;
-  return Memory::Object_at(fp() + offset);
+  return Memory<Object*>(fp() + offset);
 }
 
 inline StubFrame::StubFrame(StackFrameIteratorBase* iterator)