Index: src/objects-inl.h |
diff --git a/src/objects-inl.h b/src/objects-inl.h |
index dc3aa466693f8cf7557fbcc3218171f9807b89d5..51d92baad7da8702f35ac10e9cbbaf95699f1d27 100644 |
--- a/src/objects-inl.h |
+++ b/src/objects-inl.h |
@@ -1855,7 +1855,7 @@ Object* DescriptorArray::GetCallbacksObject(int descriptor_number) { |
AccessorDescriptor* DescriptorArray::GetCallbacks(int descriptor_number) { |
ASSERT(GetType(descriptor_number) == CALLBACKS); |
Foreign* p = Foreign::cast(GetCallbacksObject(descriptor_number)); |
- return reinterpret_cast<AccessorDescriptor*>(p->address()); |
+ return reinterpret_cast<AccessorDescriptor*>(p->foreign_address()); |
} |
@@ -3847,13 +3847,13 @@ ObjectHashTable* JSWeakMap::unchecked_table() { |
} |
-Address Foreign::address() { |
- return AddressFrom<Address>(READ_INTPTR_FIELD(this, kAddressOffset)); |
+Address Foreign::foreign_address() { |
+ return AddressFrom<Address>(READ_INTPTR_FIELD(this, kForeignAddressOffset)); |
} |
-void Foreign::set_address(Address value) { |
- WRITE_INTPTR_FIELD(this, kAddressOffset, OffsetFrom(value)); |
+void Foreign::set_foreign_address(Address value) { |
+ WRITE_INTPTR_FIELD(this, kForeignAddressOffset, OffsetFrom(value)); |
} |
@@ -4536,14 +4536,14 @@ int JSObject::BodyDescriptor::SizeOf(Map* map, HeapObject* object) { |
void Foreign::ForeignIterateBody(ObjectVisitor* v) { |
v->VisitExternalReference( |
- reinterpret_cast<Address *>(FIELD_ADDR(this, kAddressOffset))); |
+ reinterpret_cast<Address*>(FIELD_ADDR(this, kForeignAddressOffset))); |
} |
template<typename StaticVisitor> |
void Foreign::ForeignIterateBody() { |
StaticVisitor::VisitExternalReference( |
- reinterpret_cast<Address *>(FIELD_ADDR(this, kAddressOffset))); |
+ reinterpret_cast<Address*>(FIELD_ADDR(this, kForeignAddressOffset))); |
} |