From 8872cadb33bb1c62d3e67cb74badb1a9309a6a69 Mon Sep 17 00:00:00 2001 From: Alexandre Rames Date: Mon, 26 Sep 2016 14:14:01 +0100 Subject: [PATCH] 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 --- disassembler/disassembler_arm.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/disassembler/disassembler_arm.cc b/disassembler/disassembler_arm.cc index 925047f8b..30b708c0f 100644 --- a/disassembler/disassembler_arm.cc +++ b/disassembler/disassembler_arm.cc @@ -116,8 +116,7 @@ class DisassemblerArm::CustomDisassembler FINAL : public PrintDisassembler { 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 @@ class DisassemblerArm::CustomDisassembler FINAL : public PrintDisassembler { private: bool is_t32_; + CustomDisassemblerStream disassembler_stream_; }; void DisassemblerArm::CustomDisassembler::CustomDisassemblerStream::PrintLiteral(LocationType type, -- 2.11.0