diff options
| author | Myles Borins <mylesborins@google.com> | 2018-04-10 21:39:51 -0400 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2018-04-11 13:22:42 -0400 |
| commit | 12a1b9b8049462e47181a298120243dc83e81c55 (patch) | |
| tree | 8605276308c8b4e3597516961266bae1af57557a /deps/v8/src/disassembler.cc | |
| parent | 78cd8263354705b767ef8c6a651740efe4931ba0 (diff) | |
| download | android-node-v8-12a1b9b8049462e47181a298120243dc83e81c55.tar.gz android-node-v8-12a1b9b8049462e47181a298120243dc83e81c55.tar.bz2 android-node-v8-12a1b9b8049462e47181a298120243dc83e81c55.zip | |
deps: update V8 to 6.6.346.23
PR-URL: https://github.com/nodejs/node/pull/19201
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/v8/src/disassembler.cc')
| -rw-r--r-- | deps/v8/src/disassembler.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/deps/v8/src/disassembler.cc b/deps/v8/src/disassembler.cc index a26517b432..86cce891ec 100644 --- a/deps/v8/src/disassembler.cc +++ b/deps/v8/src/disassembler.cc @@ -256,7 +256,9 @@ static int DecodeIt(Isolate* isolate, std::ostream* os, // Print all the reloc info for this instruction which are not comments. for (size_t i = 0; i < pcs.size(); i++) { // Put together the reloc info - RelocInfo relocinfo(pcs[i], rmodes[i], datas[i], converter.code()); + Code* host = converter.code(); + RelocInfo relocinfo(pcs[i], rmodes[i], datas[i], host); + relocinfo.set_constant_pool(host ? host->constant_pool() : nullptr); bool first_reloc_info = (i == 0); PrintRelocInfo(&out, isolate, ref_encoder, os, &relocinfo, @@ -267,7 +269,7 @@ static int DecodeIt(Isolate* isolate, std::ostream* os, // already, check if we can find some RelocInfo for the target address in // the constant pool. if (pcs.empty() && converter.code() != nullptr) { - RelocInfo dummy_rinfo(prev_pc, RelocInfo::NONE32, 0, nullptr); + RelocInfo dummy_rinfo(prev_pc, RelocInfo::NONE, 0, nullptr); if (dummy_rinfo.IsInConstantPool()) { byte* constant_pool_entry_address = dummy_rinfo.constant_pool_entry_address(); |