diff options
author | Michaël Zasso <targos@protonmail.com> | 2018-09-07 17:07:13 +0200 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2018-09-07 20:59:13 +0200 |
commit | 586db2414a338e1bf6eaf6e672a3adc7ce309f6a (patch) | |
tree | 139fa972aef648481ddee22a3a85b99707d28df5 /deps/v8/src/gdb-jit.cc | |
parent | 12ed7c94e5160aa6d38e3d2cb2a73dae0a6f9342 (diff) | |
download | android-node-v8-586db2414a338e1bf6eaf6e672a3adc7ce309f6a.tar.gz android-node-v8-586db2414a338e1bf6eaf6e672a3adc7ce309f6a.tar.bz2 android-node-v8-586db2414a338e1bf6eaf6e672a3adc7ce309f6a.zip |
deps: update V8 to 6.9.427.22
PR-URL: https://github.com/nodejs/node/pull/21983
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Diffstat (limited to 'deps/v8/src/gdb-jit.cc')
-rw-r--r-- | deps/v8/src/gdb-jit.cc | 50 |
1 files changed, 9 insertions, 41 deletions
diff --git a/deps/v8/src/gdb-jit.cc b/deps/v8/src/gdb-jit.cc index 48a0228006..4e2587dec2 100644 --- a/deps/v8/src/gdb-jit.cc +++ b/deps/v8/src/gdb-jit.cc @@ -1171,17 +1171,19 @@ class DebugInfoSection : public DebugSection { fb_block_size.set(static_cast<uint32_t>(w->position() - fb_block_start)); int params = scope->ParameterCount(); - int slots = scope->StackLocalCount(); int context_slots = scope->ContextLocalCount(); // The real slot ID is internal_slots + context_slot_id. int internal_slots = Context::MIN_CONTEXT_SLOTS; - int locals = scope->StackLocalCount(); int current_abbreviation = 4; + EmbeddedVector<char, 256> buffer; + StringBuilder builder(buffer.start(), buffer.length()); + for (int param = 0; param < params; ++param) { w->WriteULEB128(current_abbreviation++); - w->WriteString( - scope->ParameterName(param)->ToCString(DISALLOW_NULLS).get()); + builder.Reset(); + builder.AddFormatted("param%d", param); + w->WriteString(builder.Finalize()); w->Write<uint32_t>(ty_offset); Writer::Slot<uint32_t> block_size = w->CreateSlotHere<uint32_t>(); uintptr_t block_start = w->position(); @@ -1192,16 +1194,6 @@ class DebugInfoSection : public DebugSection { block_size.set(static_cast<uint32_t>(w->position() - block_start)); } - EmbeddedVector<char, 256> buffer; - StringBuilder builder(buffer.start(), buffer.length()); - - for (int slot = 0; slot < slots; ++slot) { - w->WriteULEB128(current_abbreviation++); - builder.Reset(); - builder.AddFormatted("slot%d", slot); - w->WriteString(builder.Finalize()); - } - // See contexts.h for more information. DCHECK_EQ(Context::MIN_CONTEXT_SLOTS, 4); DCHECK_EQ(Context::SCOPE_INFO_INDEX, 0); @@ -1226,20 +1218,6 @@ class DebugInfoSection : public DebugSection { w->WriteString(builder.Finalize()); } - for (int local = 0; local < locals; ++local) { - w->WriteULEB128(current_abbreviation++); - w->WriteString( - scope->StackLocalName(local)->ToCString(DISALLOW_NULLS).get()); - w->Write<uint32_t>(ty_offset); - Writer::Slot<uint32_t> block_size = w->CreateSlotHere<uint32_t>(); - uintptr_t block_start = w->position(); - w->Write<uint8_t>(DW_OP_fbreg); - w->WriteSLEB128( - JavaScriptFrameConstants::kLocal0Offset - - kPointerSize * local); - block_size.set(static_cast<uint32_t>(w->position() - block_start)); - } - { w->WriteULEB128(current_abbreviation++); w->WriteString("__function"); @@ -1370,13 +1348,11 @@ class DebugAbbrevSection : public DebugSection { if (extra_info) { ScopeInfo* scope = desc_->scope_info(); int params = scope->ParameterCount(); - int slots = scope->StackLocalCount(); int context_slots = scope->ContextLocalCount(); // The real slot ID is internal_slots + context_slot_id. int internal_slots = Context::MIN_CONTEXT_SLOTS; - int locals = scope->StackLocalCount(); - // Total children is params + slots + context_slots + internal_slots + - // locals + 2 (__function and __context). + // Total children is params + context_slots + internal_slots + 2 + // (__function and __context). // The extra duplication below seems to be necessary to keep // gdb from getting upset on OSX. @@ -1408,10 +1384,6 @@ class DebugAbbrevSection : public DebugSection { WriteVariableAbbreviation(w, current_abbreviation++, true, true); } - for (int slot = 0; slot < slots; ++slot) { - WriteVariableAbbreviation(w, current_abbreviation++, false, false); - } - for (int internal_slot = 0; internal_slot < internal_slots; ++internal_slot) { @@ -1424,10 +1396,6 @@ class DebugAbbrevSection : public DebugSection { WriteVariableAbbreviation(w, current_abbreviation++, false, false); } - for (int local = 0; local < locals; ++local) { - WriteVariableAbbreviation(w, current_abbreviation++, true, false); - } - // The function. WriteVariableAbbreviation(w, current_abbreviation++, true, false); @@ -1885,7 +1853,7 @@ extern "C" { #ifdef OBJECT_PRINT void __gdb_print_v8_object(Object* object) { - OFStream os(stdout); + StdoutStream os; object->Print(os); os << std::flush; } |