[assembler] Remove {RelocInfo::set_constant_pool} setter.
R=jgruber@chromium.org
Change-Id: I9925ded8cee5c620f543171b2f93abb1f954e72e
Reviewed-on: https://chromium-review.googlesource.com/1078438
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53435}diff --git a/src/assembler.h b/src/assembler.h
index ac19438..037f531 100644
--- a/src/assembler.h
+++ b/src/assembler.h
@@ -414,8 +414,13 @@
RelocInfo() = default;
- RelocInfo(Address pc, Mode rmode, intptr_t data, Code* host)
- : pc_(pc), rmode_(rmode), data_(data), host_(host) {}
+ RelocInfo(Address pc, Mode rmode, intptr_t data, Code* host,
+ Address constant_pool = kNullAddress)
+ : pc_(pc),
+ rmode_(rmode),
+ data_(data),
+ host_(host),
+ constant_pool_(constant_pool) {}
static inline bool IsRealRelocMode(Mode mode) {
return mode >= FIRST_REAL_RELOC_MODE && mode <= LAST_REAL_RELOC_MODE;
@@ -480,9 +485,6 @@
intptr_t data() const { return data_; }
Code* host() const { return host_; }
Address constant_pool() const { return constant_pool_; }
- void set_constant_pool(Address constant_pool) {
- constant_pool_ = constant_pool;
- }
// Apply a relocation by delta bytes. When the code object is moved, PC
// relative addresses have to be updated as well as absolute addresses
diff --git a/src/disassembler.cc b/src/disassembler.cc
index 6fc4bf1..f680ed4 100644
--- a/src/disassembler.cc
+++ b/src/disassembler.cc
@@ -275,9 +275,9 @@
for (size_t i = 0; i < pcs.size(); i++) {
// Put together the reloc info
const CodeReference& host = converter.code();
- RelocInfo relocinfo(pcs[i], rmodes[i], datas[i], nullptr);
- relocinfo.set_constant_pool(host.is_null() ? kNullAddress
- : host.constant_pool());
+ Address constant_pool =
+ host.is_null() ? kNullAddress : host.constant_pool();
+ RelocInfo relocinfo(pcs[i], rmodes[i], datas[i], nullptr, constant_pool);
bool first_reloc_info = (i == 0);
PrintRelocInfo(&out, isolate, ref_encoder, os, &relocinfo,
