diff options
Diffstat (limited to 'compiler/optimizing/graph_visualizer.cc')
| -rw-r--r-- | compiler/optimizing/graph_visualizer.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc index 2a7bbcb72f..d94c1fa2fb 100644 --- a/compiler/optimizing/graph_visualizer.cc +++ b/compiler/optimizing/graph_visualizer.cc @@ -22,6 +22,7 @@ #include <sstream> #include "art_method.h" +#include "base/intrusive_forward_list.h" #include "bounds_check_elimination.h" #include "builder.h" #include "code_generator.h" @@ -38,7 +39,6 @@ #include "scoped_thread_state_change-inl.h" #include "ssa_liveness_analysis.h" #include "utils/assembler.h" -#include "utils/intrusive_forward_list.h" namespace art { @@ -113,16 +113,19 @@ class HGraphVisualizerDisassembler { const uint8_t* base_address, const uint8_t* end_address) : instruction_set_(instruction_set), disassembler_(nullptr) { - libart_disassembler_handle_ = - dlopen(kIsDebugBuild ? "libartd-disassembler.so" : "libart-disassembler.so", RTLD_NOW); + constexpr const char* libart_disassembler_so_name = + kIsDebugBuild ? "libartd-disassembler.so" : "libart-disassembler.so"; + libart_disassembler_handle_ = dlopen(libart_disassembler_so_name, RTLD_NOW); if (libart_disassembler_handle_ == nullptr) { - LOG(WARNING) << "Failed to dlopen libart-disassembler: " << dlerror(); + LOG(ERROR) << "Failed to dlopen " << libart_disassembler_so_name << ": " << dlerror(); return; } + constexpr const char* create_disassembler_symbol = "create_disassembler"; create_disasm_prototype* create_disassembler = reinterpret_cast<create_disasm_prototype*>( - dlsym(libart_disassembler_handle_, "create_disassembler")); + dlsym(libart_disassembler_handle_, create_disassembler_symbol)); if (create_disassembler == nullptr) { - LOG(WARNING) << "Could not find create_disassembler entry: " << dlerror(); + LOG(ERROR) << "Could not find " << create_disassembler_symbol << " entry in " + << libart_disassembler_so_name << ": " << dlerror(); return; } // Reading the disassembly from 0x0 is easier, so we print relative |