ARM64: Update the disassembler after the VIXL update.
Test: top-level `make -j40`
`mma -j40 test-art-target-test-optimizing dist`
`mma -j40 test-art-host dist`
Change-Id: I173976998dc8e3e466ca8502c3fdc447f9019cee
diff --git a/disassembler/disassembler_arm.cc b/disassembler/disassembler_arm.cc
index 925047f..30b708c 100644
--- a/disassembler/disassembler_arm.cc
+++ b/disassembler/disassembler_arm.cc
@@ -116,8 +116,7 @@
public:
CustomDisassembler(std::ostream& os, const DisassemblerOptions* options)
- // vixl::aarch32::Disassembler::~Disassembler() will delete the stream.
- : PrintDisassembler(new CustomDisassemblerStream(os, this, options)) {}
+ : PrintDisassembler(&disassembler_stream_), disassembler_stream_(os, this, options) {}
void PrintPc(uint32_t prog_ctr) OVERRIDE {
os() << "0x" << std::hex << std::setw(8) << std::setfill('0') << prog_ctr << ": ";
@@ -133,6 +132,7 @@
private:
bool is_t32_;
+ CustomDisassemblerStream disassembler_stream_;
};
void DisassemblerArm::CustomDisassembler::CustomDisassemblerStream::PrintLiteral(LocationType type,