| Index: runtime/vm/native_symbol_android.cc
|
| diff --git a/runtime/vm/native_symbol_android.cc b/runtime/vm/native_symbol_android.cc
|
| index 1647e59556372e9dc2ab7cfd147d8e2864ba43ef..d08c8ada3f4e79708a0eda9e30c9d85d5a6a0cca 100644
|
| --- a/runtime/vm/native_symbol_android.cc
|
| +++ b/runtime/vm/native_symbol_android.cc
|
| @@ -7,7 +7,8 @@
|
|
|
| #include "vm/native_symbol.h"
|
|
|
| -#include <dlfcn.h> // NOLINT
|
| +#include <cxxabi.h> // NOLINT
|
| +#include <dlfcn.h> // NOLINT
|
|
|
| namespace dart {
|
|
|
| @@ -29,6 +30,13 @@ char* NativeSymbolResolver::LookupSymbolName(uintptr_t pc, uintptr_t* start) {
|
| if (start != NULL) {
|
| *start = reinterpret_cast<uintptr_t>(info.dli_saddr);
|
| }
|
| + int status = 0;
|
| + size_t len = 0;
|
| + char* demangled = abi::__cxa_demangle(info.dli_sname, NULL, &len, &status);
|
| + MSAN_UNPOISON(demangled, len);
|
| + if (status == 0) {
|
| + return demangled;
|
| + }
|
| return strdup(info.dli_sname);
|
| }
|
|
|
|
|