diff options
author | Ali Ijaz Sheikh <ofrobots@google.com> | 2016-04-07 14:06:55 -0700 |
---|---|---|
committer | Ali Ijaz Sheikh <ofrobots@google.com> | 2016-04-14 10:03:39 -0700 |
commit | 52af5c4eebf4de8638aef0338bd826656312a02a (patch) | |
tree | 628dc9fb0b558c3a73a2160706fef368876fe548 /deps/v8/src/objects-debug.cc | |
parent | 6e3e8acc7cc7ebd3d67db5ade1247b8b558efe09 (diff) | |
download | android-node-v8-52af5c4eebf4de8638aef0338bd826656312a02a.tar.gz android-node-v8-52af5c4eebf4de8638aef0338bd826656312a02a.tar.bz2 android-node-v8-52af5c4eebf4de8638aef0338bd826656312a02a.zip |
deps: upgrade V8 to 5.0.71.32
* Pick up the branch head for V8 5.0 stable [1]
* Edit v8 gitignore to allow trace_event copy
* Update V8 DEP trace_event as per deps/v8/DEPS [2]
[1] https://chromium.googlesource.com/v8/v8.git/+/3c67831
[2] https://chromium.googlesource.com/chromium/src/base/trace_event/common/+/4b09207e447ae5bd34643b4c6321bee7b76d35f9
Ref: https://github.com/nodejs/node/pull/5945
PR-URL: https://github.com/nodejs/node/pull/6111
Reviewed-By: targos - Michaƫl Zasso <mic.besace@gmail.com>
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: indutny - Fedor Indutny <fedor.indutny@gmail.com>
Diffstat (limited to 'deps/v8/src/objects-debug.cc')
-rw-r--r-- | deps/v8/src/objects-debug.cc | 47 |
1 files changed, 17 insertions, 30 deletions
diff --git a/deps/v8/src/objects-debug.cc b/deps/v8/src/objects-debug.cc index b6dd42553c..0d01ec2f5b 100644 --- a/deps/v8/src/objects-debug.cc +++ b/deps/v8/src/objects-debug.cc @@ -7,6 +7,7 @@ #include "src/bootstrapper.h" #include "src/disasm.h" #include "src/disassembler.h" +#include "src/field-type.h" #include "src/macro-assembler.h" #include "src/ostreams.h" #include "src/regexp/jsregexp.h" @@ -150,9 +151,6 @@ void HeapObject::HeapObjectVerify() { case JS_MAP_ITERATOR_TYPE: JSMapIterator::cast(this)->JSMapIteratorVerify(); break; - case JS_ITERATOR_RESULT_TYPE: - JSIteratorResult::cast(this)->JSIteratorResultVerify(); - break; case JS_WEAK_MAP_TYPE: JSWeakMap::cast(this)->JSWeakMapVerify(); break; @@ -210,7 +208,7 @@ void HeapObject::VerifyHeapPointer(Object* p) { void Symbol::SymbolVerify() { CHECK(IsSymbol()); CHECK(HasHashCode()); - CHECK_GT(Hash(), 0u); + CHECK(GetHeap()->hidden_properties_symbol() == this || Hash() > 0u); CHECK(name()->IsUndefined() || name()->IsString()); } @@ -298,9 +296,9 @@ void JSObject::JSObjectVerify() { if (value->IsUninitialized()) continue; if (r.IsSmi()) DCHECK(value->IsSmi()); if (r.IsHeapObject()) DCHECK(value->IsHeapObject()); - HeapType* field_type = descriptors->GetFieldType(i); - bool type_is_none = field_type->Is(HeapType::None()); - bool type_is_any = HeapType::Any()->Is(field_type); + FieldType* field_type = descriptors->GetFieldType(i); + bool type_is_none = field_type->IsNone(); + bool type_is_any = field_type->IsAny(); if (r.IsNone()) { CHECK(type_is_none); } else if (!type_is_any && !(type_is_none && r.IsHeapObject())) { @@ -318,7 +316,8 @@ void JSObject::JSObjectVerify() { // pointer may point to a one pointer filler map. if (ElementsAreSafeToExamine()) { CHECK_EQ((map()->has_fast_smi_or_object_elements() || - (elements() == GetHeap()->empty_fixed_array())), + (elements() == GetHeap()->empty_fixed_array()) || + HasFastStringWrapperElements()), (elements()->map() == GetHeap()->fixed_array_map() || elements()->map() == GetHeap()->fixed_cow_array_map())); CHECK(map()->has_fast_object_elements() == HasFastObjectElements()); @@ -553,9 +552,7 @@ void JSBoundFunction::JSBoundFunctionVerify() { VerifyObjectField(kBoundThisOffset); VerifyObjectField(kBoundTargetFunctionOffset); VerifyObjectField(kBoundArgumentsOffset); - VerifyObjectField(kCreationContextOffset); CHECK(bound_target_function()->IsCallable()); - CHECK(creation_context()->IsNativeContext()); CHECK(IsCallable()); CHECK_EQ(IsConstructor(), bound_target_function()->IsConstructor()); } @@ -765,14 +762,6 @@ void JSMapIterator::JSMapIteratorVerify() { } -void JSIteratorResult::JSIteratorResultVerify() { - CHECK(IsJSIteratorResult()); - JSObjectVerify(); - VerifyPointer(done()); - VerifyPointer(value()); -} - - void JSWeakMap::JSWeakMapVerify() { CHECK(IsJSWeakMap()); JSObjectVerify(); @@ -911,12 +900,6 @@ void PrototypeInfo::PrototypeInfoVerify() { } -void AccessorInfo::AccessorInfoVerify() { - VerifyPointer(name()); - VerifyPointer(expected_receiver_type()); -} - - void SloppyBlockWithEvalContextExtension:: SloppyBlockWithEvalContextExtensionVerify() { CHECK(IsSloppyBlockWithEvalContextExtension()); @@ -925,9 +908,10 @@ void SloppyBlockWithEvalContextExtension:: } -void ExecutableAccessorInfo::ExecutableAccessorInfoVerify() { - CHECK(IsExecutableAccessorInfo()); - AccessorInfoVerify(); +void AccessorInfo::AccessorInfoVerify() { + CHECK(IsAccessorInfo()); + VerifyPointer(name()); + VerifyPointer(expected_receiver_type()); VerifyPointer(getter()); VerifyPointer(setter()); VerifyPointer(data()); @@ -1038,7 +1022,7 @@ void NormalizedMapCache::NormalizedMapCacheVerify() { void DebugInfo::DebugInfoVerify() { CHECK(IsDebugInfo()); VerifyPointer(shared()); - VerifyPointer(code()); + VerifyPointer(abstract_code()); VerifyPointer(break_points()); } @@ -1076,7 +1060,8 @@ void JSObject::IncrementSpillStatistics(SpillInformation* info) { case FAST_HOLEY_DOUBLE_ELEMENTS: case FAST_DOUBLE_ELEMENTS: case FAST_HOLEY_ELEMENTS: - case FAST_ELEMENTS: { + case FAST_ELEMENTS: + case FAST_STRING_WRAPPER_ELEMENTS: { info->number_of_objects_with_fast_elements_++; int holes = 0; FixedArray* e = FixedArray::cast(elements()); @@ -1100,7 +1085,8 @@ void JSObject::IncrementSpillStatistics(SpillInformation* info) { info->number_of_fast_used_elements_ += e->length(); break; } - case DICTIONARY_ELEMENTS: { + case DICTIONARY_ELEMENTS: + case SLOW_STRING_WRAPPER_ELEMENTS: { SeededNumberDictionary* dict = element_dictionary(); info->number_of_slow_used_elements_ += dict->NumberOfElements(); info->number_of_slow_unused_elements_ += @@ -1109,6 +1095,7 @@ void JSObject::IncrementSpillStatistics(SpillInformation* info) { } case FAST_SLOPPY_ARGUMENTS_ELEMENTS: case SLOW_SLOPPY_ARGUMENTS_ELEMENTS: + case NO_ELEMENTS: break; } } |