Oilpan: GC_TRACING: Improve object path dump

Source/wtf/Assertions.cpp

 /*
  * Copyright (C) 2003, 2006, 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2007-2009 Torch Mobile, Inc.
  * Copyright (C) 2011 University of Szeged. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 244 matching lines @@
 {
     static const int framesToSkip = 2;
     // Use alloca to allocate on the stack since this function is used in OOM situations.
     void** samples = static_cast<void**>(alloca((framesToShow + framesToSkip) * sizeof(void *)));
     int frames = framesToShow + framesToSkip;
 
     WTFGetBacktrace(samples, &frames);
     WTFPrintBacktrace(samples + framesToSkip, frames - framesToSkip);
 }
 
+FrameToNameScope::FrameToNameScope(void* addr)
+    : m_name(0)
+    , m_cxaDemangled(0)
+{
+#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
+    Dl_info info;
+    if (!dladdr(addr, &info) || !info.dli_sname)
+        return;
+    const char* mangledName = info.dli_sname;
+    if ((m_cxaDemangled = abi::__cxa_demangle(mangledName, 0, 0, 0)))
+        m_name = m_cxaDemangled;
+    else
+        m_name = mangledName;
+#else
+    (void)addr;
+#endif
+}
+
+FrameToNameScope::~FrameToNameScope()
+{
+    free(m_cxaDemangled);
+}
+
 void WTFPrintBacktrace(void** stack, int size)
 {
     for (int i = 0; i < size; ++i) {
-        const char* mangledName = 0;
-        char* cxaDemangled = 0;
-#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
-        Dl_info info;
-        if (dladdr(stack[i], &info) && info.dli_sname)
-            mangledName = info.dli_sname;
-        if (mangledName)
-            cxaDemangled = abi::__cxa_demangle(mangledName, 0, 0, 0);
-#endif
+        FrameToNameScope frameToName(stack[i]);
         const int frameNumber = i + 1;
-        if (mangledName || cxaDemangled)
-            printf_stderr_common("%-3d %p %s\n", frameNumber, stack[i], cxaDemangled ? cxaDemangled : mangledName);
+        if (frameToName.nullableName())
+            printf_stderr_common("%-3d %p %s\n", frameNumber, stack[i], frameToName.nullableName());
         else
             printf_stderr_common("%-3d %p\n", frameNumber, stack[i]);
-        free(cxaDemangled);
     }
 }
 
 static WTFCrashHookFunction globalHook = 0;
 
 void WTFSetCrashHook(WTFCrashHookFunction function)
 {
     globalHook = function;
 }
 
@@ skipping 85 matching lines @@
 
 void WTFLogAlways(const char* format, ...)
 {
     va_list args;
     va_start(args, format);
     vprintf_stderr_with_trailing_newline(format, args);
     va_end(args);
 }
 
 } // extern "C"