diff options
author | Michaël Zasso <targos@protonmail.com> | 2018-07-25 19:30:07 +0200 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2018-07-26 08:31:50 +0200 |
commit | 6a31d05340b22fc413ee83eaacd0a5565bbbe799 (patch) | |
tree | 78f9e1c2f417244842f6422f17e1816e70317100 /deps/v8/src/gdb-jit.cc | |
parent | 4d94bb2b1f72b6b612983a517a39c5545724a3ad (diff) | |
download | android-node-v8-6a31d05340b22fc413ee83eaacd0a5565bbbe799.tar.gz android-node-v8-6a31d05340b22fc413ee83eaacd0a5565bbbe799.tar.bz2 android-node-v8-6a31d05340b22fc413ee83eaacd0a5565bbbe799.zip |
deps: update V8 to 6.8.275.24
PR-URL: https://github.com/nodejs/node/pull/21079
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yang Guo <yangguo@chromium.org>
Diffstat (limited to 'deps/v8/src/gdb-jit.cc')
-rw-r--r-- | deps/v8/src/gdb-jit.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/deps/v8/src/gdb-jit.cc b/deps/v8/src/gdb-jit.cc index 8fcd410643..48a0228006 100644 --- a/deps/v8/src/gdb-jit.cc +++ b/deps/v8/src/gdb-jit.cc @@ -979,11 +979,11 @@ class CodeDescription BASE_EMBEDDED { } uintptr_t CodeStart() const { - return reinterpret_cast<uintptr_t>(code_->InstructionStart()); + return static_cast<uintptr_t>(code_->InstructionStart()); } uintptr_t CodeEnd() const { - return reinterpret_cast<uintptr_t>(code_->InstructionEnd()); + return static_cast<uintptr_t>(code_->InstructionEnd()); } uintptr_t CodeSize() const { @@ -1204,12 +1204,12 @@ class DebugInfoSection : public DebugSection { // See contexts.h for more information. DCHECK_EQ(Context::MIN_CONTEXT_SLOTS, 4); - DCHECK_EQ(Context::CLOSURE_INDEX, 0); + DCHECK_EQ(Context::SCOPE_INFO_INDEX, 0); DCHECK_EQ(Context::PREVIOUS_INDEX, 1); DCHECK_EQ(Context::EXTENSION_INDEX, 2); DCHECK_EQ(Context::NATIVE_CONTEXT_INDEX, 3); w->WriteULEB128(current_abbreviation++); - w->WriteString(".closure"); + w->WriteString(".scope_info"); w->WriteULEB128(current_abbreviation++); w->WriteString(".previous"); w->WriteULEB128(current_abbreviation++); @@ -1900,7 +1900,8 @@ static JITCodeEntry* CreateCodeEntry(Address symfile_addr, entry->symfile_addr_ = reinterpret_cast<Address>(entry + 1); entry->symfile_size_ = symfile_size; - MemCopy(entry->symfile_addr_, symfile_addr, symfile_size); + MemCopy(reinterpret_cast<void*>(entry->symfile_addr_), + reinterpret_cast<void*>(symfile_addr), symfile_size); entry->prev_ = entry->next_ = nullptr; @@ -1976,7 +1977,7 @@ static JITCodeEntry* CreateELFObject(CodeDescription* desc, Isolate* isolate) { elf.Write(&w); #endif - return CreateCodeEntry(w.buffer(), w.position()); + return CreateCodeEntry(reinterpret_cast<Address>(w.buffer()), w.position()); } @@ -2010,8 +2011,7 @@ static CodeMap* GetCodeMap() { static uint32_t HashCodeAddress(Address addr) { static const uintptr_t kGoldenRatio = 2654435761u; - uintptr_t offset = OffsetFrom(addr); - return static_cast<uint32_t>((offset >> kCodeAlignmentBits) * kGoldenRatio); + return static_cast<uint32_t>((addr >> kCodeAlignmentBits) * kGoldenRatio); } static base::HashMap* GetLineMap() { @@ -2025,15 +2025,16 @@ static base::HashMap* GetLineMap() { static void PutLineInfo(Address addr, LineInfo* info) { base::HashMap* line_map = GetLineMap(); - base::HashMap::Entry* e = - line_map->LookupOrInsert(addr, HashCodeAddress(addr)); + base::HashMap::Entry* e = line_map->LookupOrInsert( + reinterpret_cast<void*>(addr), HashCodeAddress(addr)); if (e->value != nullptr) delete static_cast<LineInfo*>(e->value); e->value = info; } static LineInfo* GetLineInfo(Address addr) { - void* value = GetLineMap()->Remove(addr, HashCodeAddress(addr)); + void* value = GetLineMap()->Remove(reinterpret_cast<void*>(addr), + HashCodeAddress(addr)); return static_cast<LineInfo*>(value); } @@ -2121,7 +2122,7 @@ static void AddJITCodeEntry(CodeMap* map, const AddressRange& range, SNPrintF(Vector<char>(file_name, kMaxFileNameSize), "/tmp/elfdump%s%d.o", (name_hint != nullptr) ? name_hint : "", file_num++); - WriteBytes(file_name, entry->symfile_addr_, + WriteBytes(file_name, reinterpret_cast<byte*>(entry->symfile_addr_), static_cast<int>(entry->symfile_size_)); } #endif |