diff options
Diffstat (limited to 'V8Binding/v8/src/heap.h')
| -rw-r--r-- | V8Binding/v8/src/heap.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/V8Binding/v8/src/heap.h b/V8Binding/v8/src/heap.h index 3667348..9f61ce2 100644 --- a/V8Binding/v8/src/heap.h +++ b/V8Binding/v8/src/heap.h @@ -118,8 +118,8 @@ namespace internal { V(Map, neander_map) \ V(JSObject, message_listeners) \ V(Proxy, prototype_accessors) \ - V(Dictionary, code_stubs) \ - V(Dictionary, non_monomorphic_cache) \ + V(NumberDictionary, code_stubs) \ + V(NumberDictionary, non_monomorphic_cache) \ V(Code, js_entry_code) \ V(Code, js_construct_entry_code) \ V(Code, c_entry_code) \ @@ -289,11 +289,11 @@ class Heap : public AllStatic { static Object* AllocateJSObject(JSFunction* constructor, PretenureFlag pretenure = NOT_TENURED); - // Allocates and initializes a new JS global object based on a constructor. + // Allocates and initializes a new global object based on a constructor. // Returns Failure::RetryAfterGC(requested_bytes, space) if the allocation // failed. // Please note this does not perform a garbage collection. - static Object* AllocateJSGlobalObject(JSFunction* constructor); + static Object* AllocateGlobalObject(JSFunction* constructor); // Returns a deep copy of the JavaScript object. // Properties and elements are copied too. @@ -692,10 +692,10 @@ class Heap : public AllStatic { static inline AllocationSpace TargetSpaceId(InstanceType type); // Sets the stub_cache_ (only used when expanding the dictionary). - static void set_code_stubs(Dictionary* value) { code_stubs_ = value; } + static void set_code_stubs(NumberDictionary* value) { code_stubs_ = value; } // Sets the non_monomorphic_cache_ (only used when expanding the dictionary). - static void set_non_monomorphic_cache(Dictionary* value) { + static void set_non_monomorphic_cache(NumberDictionary* value) { non_monomorphic_cache_ = value; } @@ -1063,9 +1063,11 @@ class VerifyPointersAndRSetVisitor: public ObjectVisitor { HeapObject* object = HeapObject::cast(*current); ASSERT(Heap::Contains(object)); ASSERT(object->map()->IsMap()); +#ifndef V8_TARGET_ARCH_X64 if (Heap::InNewSpace(object)) { ASSERT(Page::IsRSetSet(reinterpret_cast<Address>(current), 0)); } +#endif } } } |