diff options
| author | Ben Murdoch <benm@google.com> | 2011-11-30 16:04:58 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:28:30 +0000 |
| commit | 589d6979ff2ef66fca2d8fa51404c369ca5e9250 (patch) | |
| tree | 1d9032fcae9d18a05430a4ba9c14e5c635c4096e /src/objects-debug.cc | |
| parent | 69a99ed0b2b2ef69d393c371b03db3a98aaf880e (diff) | |
| download | android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.tar.gz android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.tar.bz2 android_external_v8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.zip | |
Upgrade to V8 3.6
Merge V8 at 3.6.6.11
Simple merge required updates to makefiles only.
Bug: 5688872
Change-Id: Ib38b7ffbcd409585f6cb6fccc59c767029cecc77
Diffstat (limited to 'src/objects-debug.cc')
| -rw-r--r-- | src/objects-debug.cc | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/objects-debug.cc b/src/objects-debug.cc index 4da360b8..8de7162a 100644 --- a/src/objects-debug.cc +++ b/src/objects-debug.cc @@ -164,6 +164,9 @@ void HeapObject::HeapObjectVerify() { case JS_PROXY_TYPE: JSProxy::cast(this)->JSProxyVerify(); break; + case JS_FUNCTION_PROXY_TYPE: + JSFunctionProxy::cast(this)->JSFunctionProxyVerify(); + break; case FOREIGN_TYPE: Foreign::cast(this)->ForeignVerify(); break; @@ -257,9 +260,9 @@ void JSObject::JSObjectVerify() { (map()->inobject_properties() + properties()->length() - map()->NextFreePropertyIndex())); } - ASSERT(map()->has_fast_elements() == - (elements()->map() == GetHeap()->fixed_array_map() || - elements()->map() == GetHeap()->fixed_cow_array_map())); + ASSERT_EQ(map()->has_fast_elements(), + (elements()->map() == GetHeap()->fixed_array_map() || + elements()->map() == GetHeap()->fixed_cow_array_map())); ASSERT(map()->has_fast_elements() == HasFastElements()); } @@ -536,6 +539,15 @@ void JSProxy::JSProxyVerify() { VerifyPointer(handler()); } + +void JSFunctionProxy::JSFunctionProxyVerify() { + ASSERT(IsJSFunctionProxy()); + JSProxyVerify(); + VerifyPointer(call_trap()); + VerifyPointer(construct_trap()); +} + + void Foreign::ForeignVerify() { ASSERT(IsForeign()); } |
