<div dir="ltr">Bill, please also merge this into the 3.4 branch.<div><br></div><div>-Chandler</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Dec 9, 2013 at 8:40 PM, Chandler Carruth <span dir="ltr"><<a href="mailto:chandlerc@gmail.com" target="_blank">chandlerc@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: chandlerc<br>
Date: Mon Dec Â 9 22:40:39 2013<br>
New Revision: 196875<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=196875&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=196875&view=rev</a><br>
Log:<br>
Revert a final patch that was committed without the author contributing<br>
it to the LLVM project through the appropriate channels.<br>
<br>
This reverts:<br>
r195837: "[Sanitizer] Add rudimentary support for using libbacktrace in ..."<br>
<br>
Removed:<br>
  Â  compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc<br>
  Â  compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.h<br>
Modified:<br>
  Â  compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt<br>
  Â  compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt?rev=196875&r1=196874&r2=196875&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt?rev=196875&r1=196874&r2=196875&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt Mon Dec Â 9 22:40:39 2013<br>
@@ -28,7 +28,6 @@ set(SANITIZER_LIBCDEP_SOURCES<br>
  Â sanitizer_posix_libcdep.cc<br>
  Â sanitizer_stacktrace_libcdep.cc<br>
  Â sanitizer_stoptheworld_linux_libcdep.cc<br>
- Â sanitizer_symbolizer_libbacktrace.cc<br>
  Â sanitizer_symbolizer_libcdep.cc<br>
  Â sanitizer_symbolizer_posix_libcdep.cc)<br>
<br>
@@ -66,7 +65,6 @@ set(SANITIZER_HEADERS<br>
  Â sanitizer_stoptheworld.h<br>
  Â sanitizer_suppressions.h<br>
  Â sanitizer_symbolizer.h<br>
- Â sanitizer_symbolizer_libbacktrace.h<br>
  Â sanitizer_syscall_generic.inc<br>
  Â sanitizer_syscall_linux_x86_64.inc<br>
  Â sanitizer_thread_registry.h)<br>
<br>
Removed: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc?rev=196874&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc?rev=196874&view=auto</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc (removed)<br>
@@ -1,146 +0,0 @@<br>
-//===-- sanitizer_symbolizer_libbacktrace.cc ------------------------------===//<br>
-//<br>
-// Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  The LLVM Compiler Infrastructure<br>
-//<br>
-// This file is distributed under the University of Illinois Open Source<br>
-// License. See LICENSE.TXT for details.<br>
-//<br>
-//===----------------------------------------------------------------------===//<br>
-//<br>
-// This file is shared between AddressSanitizer and ThreadSanitizer<br>
-// run-time libraries.<br>
-// Libbacktrace implementation of symbolizer parts.<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-#include "sanitizer_platform.h"<br>
-<br>
-#include "sanitizer_internal_defs.h"<br>
-#include "sanitizer_symbolizer.h"<br>
-#include "sanitizer_symbolizer_libbacktrace.h"<br>
-<br>
-#if SANITIZER_LIBBACKTRACE<br>
-# include "backtrace-supported.h"<br>
-# if SANITIZER_POSIX && BACKTRACE_SUPPORTED && !BACKTRACE_USES_MALLOC<br>
-# Â include "backtrace.h"<br>
-# else<br>
-# Â define SANITIZER_LIBBACKTRACE 0<br>
-# endif<br>
-#endif<br>
-<br>
-namespace __sanitizer {<br>
-<br>
-#if SANITIZER_LIBBACKTRACE<br>
-<br>
-namespace {<br>
-<br>
-struct SymbolizeCodeData {<br>
- Â AddressInfo *frames;<br>
- Â uptr n_frames;<br>
- Â uptr max_frames;<br>
- Â const char *module_name;<br>
- Â uptr module_offset;<br>
-};<br>
-<br>
-extern "C" {<br>
-static int SymbolizeCodePCInfoCallback(void *vdata, uintptr_t addr,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  const char *filename, int lineno,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  const char *function) {<br>
- Â SymbolizeCodeData *cdata = (SymbolizeCodeData *)vdata;<br>
- Â if (function) {<br>
- Â  Â AddressInfo *info = &cdata->frames[cdata->n_frames++];<br>
- Â  Â info->Clear();<br>
- Â  Â info->FillAddressAndModuleInfo(addr, cdata->module_name,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  cdata->module_offset);<br>
- Â  Â info->function = internal_strdup(function);<br>
- Â  Â if (filename)<br>
- Â  Â  Â info->file = internal_strdup(filename);<br>
- Â  Â info->line = lineno;<br>
- Â  Â if (cdata->n_frames == cdata->max_frames)<br>
- Â  Â  Â return 1;<br>
- Â }<br>
- Â return 0;<br>
-}<br>
-<br>
-static void SymbolizeCodeCallback(void *vdata, uintptr_t addr,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â const char *symname, uintptr_t, uintptr_t) {<br>
- Â SymbolizeCodeData *cdata = (SymbolizeCodeData *)vdata;<br>
- Â if (symname) {<br>
- Â  Â AddressInfo *info = &cdata->frames[0];<br>
- Â  Â info->Clear();<br>
- Â  Â info->FillAddressAndModuleInfo(addr, cdata->module_name,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  cdata->module_offset);<br>
- Â  Â info->function = internal_strdup(symname);<br>
- Â  Â cdata->n_frames = 1;<br>
- Â }<br>
-}<br>
-<br>
-static void SymbolizeDataCallback(void *vdata, uintptr_t, const char *symname,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â uintptr_t symval, uintptr_t symsize) {<br>
- Â DataInfo *info = (DataInfo *)vdata;<br>
- Â if (symname && symval) {<br>
- Â  Â info->name = internal_strdup(symname);<br>
- Â  Â info->start = symval;<br>
- Â  Â info->size = symsize;<br>
- Â }<br>
-}<br>
-<br>
-static void ErrorCallback(void *, const char *, int) {}<br>
-} Â // extern "C"<br>
-<br>
-} Â // namespace<br>
-<br>
-LibbacktraceSymbolizer *LibbacktraceSymbolizer::get(LowLevelAllocator *alloc) {<br>
- Â // State created in backtrace_create_state is leaked.<br>
- Â void *state = (void *)(backtrace_create_state("/proc/self/exe", 0,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â ErrorCallback, NULL));<br>
- Â if (!state)<br>
- Â  Â return 0;<br>
- Â return new(*alloc) LibbacktraceSymbolizer(state);<br>
-}<br>
-<br>
-uptr LibbacktraceSymbolizer::SymbolizeCode(uptr addr, AddressInfo *frames,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  uptr max_frames,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  const char *module_name,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  uptr module_offset) {<br>
- Â SymbolizeCodeData data;<br>
- Â data.frames = frames;<br>
- Â data.n_frames = 0;<br>
- Â data.max_frames = max_frames;<br>
- Â data.module_name = module_name;<br>
- Â data.module_offset = module_offset;<br>
- Â backtrace_pcinfo((backtrace_state *)state_, addr, SymbolizeCodePCInfoCallback,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  ErrorCallback, &data);<br>
- Â if (data.n_frames)<br>
- Â  Â return data.n_frames;<br>
- Â backtrace_syminfo((backtrace_state *)state_, addr, SymbolizeCodeCallback,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â ErrorCallback, &data);<br>
- Â return data.n_frames;<br>
-}<br>
-<br>
-bool LibbacktraceSymbolizer::SymbolizeData(DataInfo *info) {<br>
- Â backtrace_syminfo((backtrace_state *)state_, info->address,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â SymbolizeDataCallback, ErrorCallback, info);<br>
- Â return true;<br>
-}<br>
-<br>
-#else Â // SANITIZER_LIBBACKTRACE<br>
-<br>
-LibbacktraceSymbolizer *LibbacktraceSymbolizer::get(LowLevelAllocator *alloc) {<br>
- Â return 0;<br>
-}<br>
-<br>
-uptr LibbacktraceSymbolizer::SymbolizeCode(uptr addr, AddressInfo *frames,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  uptr max_frames,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  const char *module_name,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  uptr module_offset) {<br>
- Â (void)state_;<br>
- Â return 0;<br>
-}<br>
-<br>
-bool LibbacktraceSymbolizer::SymbolizeData(DataInfo *info) {<br>
- Â return false;<br>
-}<br>
-<br>
-#endif Â // SANITIZER_LIBBACKTRACE<br>
-<br>
-} Â // namespace __sanitizer<br>
<br>
Removed: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.h?rev=196874&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.h?rev=196874&view=auto</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.h (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.h (removed)<br>
@@ -1,40 +0,0 @@<br>
-//===-- sanitizer_symbolizer_libbacktrace.h -------------------------------===//<br>
-//<br>
-// Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  The LLVM Compiler Infrastructure<br>
-//<br>
-// This file is distributed under the University of Illinois Open Source<br>
-// License. See LICENSE.TXT for details.<br>
-//<br>
-//===----------------------------------------------------------------------===//<br>
-//<br>
-// This file is shared between AddressSanitizer and ThreadSanitizer<br>
-// run-time libraries.<br>
-// Header for libbacktrace symbolizer.<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-#include "sanitizer_platform.h"<br>
-#include "sanitizer_common.h"<br>
-#include "sanitizer_symbolizer.h"<br>
-<br>
-#ifndef SANITIZER_LIBBACKTRACE<br>
-# define SANITIZER_LIBBACKTRACE 0<br>
-#endif<br>
-<br>
-namespace __sanitizer {<br>
-<br>
-class LibbacktraceSymbolizer {<br>
- public:<br>
- Â static LibbacktraceSymbolizer *get(LowLevelAllocator *alloc);<br>
-<br>
- Â uptr SymbolizeCode(uptr addr, AddressInfo *frames, uptr max_frames,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  const char *module_name, uptr module_offset);<br>
-<br>
- Â bool SymbolizeData(DataInfo *info);<br>
-<br>
- private:<br>
- Â explicit LibbacktraceSymbolizer(void *state) : state_(state) {}<br>
-<br>
- Â void *state_; Â // Leaked.<br>
-};<br>
-<br>
-} Â // namespace __sanitizer<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc?rev=196875&r1=196874&r2=196875&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc?rev=196875&r1=196874&r2=196875&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc Mon Dec Â 9 22:40:39 2013<br>
@@ -21,7 +21,6 @@<br>
 #include "sanitizer_placement_new.h"<br>
 #include "sanitizer_procmaps.h"<br>
 #include "sanitizer_symbolizer.h"<br>
-#include "sanitizer_symbolizer_libbacktrace.h"<br>
<br>
 #include <errno.h><br>
 #include <stdlib.h><br>
@@ -387,12 +386,10 @@ class InternalSymbolizer {<br>
 class POSIXSymbolizer : public Symbolizer {<br>
  public:<br>
  Â POSIXSymbolizer(ExternalSymbolizer *external_symbolizer,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â InternalSymbolizer *internal_symbolizer,<br>
- Â  Â  Â  Â  Â  Â  Â  Â  Â LibbacktraceSymbolizer *libbacktrace_symbolizer)<br>
+ Â  Â  Â  Â  Â  Â  Â  Â  Â InternalSymbolizer *internal_symbolizer)<br>
  Â  Â  Â : Symbolizer(),<br>
  Â  Â  Â  Â external_symbolizer_(external_symbolizer),<br>
- Â  Â  Â  Â internal_symbolizer_(internal_symbolizer),<br>
- Â  Â  Â  Â libbacktrace_symbolizer_(libbacktrace_symbolizer) {}<br>
+ Â  Â  Â  Â internal_symbolizer_(internal_symbolizer) {}<br>
<br>
  Â uptr SymbolizeCode(uptr addr, AddressInfo *frames, uptr max_frames) {<br>
  Â  Â BlockingMutexLock l(&mu_);<br>
@@ -403,17 +400,9 @@ class POSIXSymbolizer : public Symbolize<br>
  Â  Â  Â return 0;<br>
  Â  Â const char *module_name = module->full_name();<br>
  Â  Â uptr module_offset = addr - module->base_address();<br>
- Â  Â // First, try to use libbacktrace symbolizer (if it's available).<br>
- Â  Â if (libbacktrace_symbolizer_ != 0) {<br>
- Â  Â  Â mu_.CheckLocked();<br>
- Â  Â  Â uptr res = libbacktrace_symbolizer_->SymbolizeCode(<br>
- Â  Â  Â  Â  Â addr, frames, max_frames, module_name, module_offset);<br>
- Â  Â  Â if (res > 0)<br>
- Â  Â  Â  Â return res;<br>
- Â  Â }<br>
  Â  Â const char *str = SendCommand(false, module_name, module_offset);<br>
  Â  Â if (str == 0) {<br>
- Â  Â  Â // Symbolizer was not initialized or failed. Fill only data<br>
+ Â  Â  Â // External symbolizer was not initialized or failed. Fill only data<br>
  Â  Â  Â // about module name and offset.<br>
  Â  Â  Â AddressInfo *info = &frames[0];<br>
  Â  Â  Â info->Clear();<br>
@@ -474,11 +463,6 @@ class POSIXSymbolizer : public Symbolize<br>
  Â  Â info->address = addr;<br>
  Â  Â info->module = internal_strdup(module_name);<br>
  Â  Â info->module_offset = module_offset;<br>
- Â  Â if (libbacktrace_symbolizer_ != 0) {<br>
- Â  Â  Â mu_.CheckLocked();<br>
- Â  Â  Â if (libbacktrace_symbolizer_->SymbolizeData(info))<br>
- Â  Â  Â  Â return true;<br>
- Â  Â }<br>
  Â  Â const char *str = SendCommand(true, module_name, module_offset);<br>
  Â  Â if (str == 0)<br>
  Â  Â  Â return true;<br>
@@ -490,8 +474,7 @@ class POSIXSymbolizer : public Symbolize<br>
  Â }<br>
<br>
  Â bool IsAvailable() {<br>
- Â  Â return internal_symbolizer_ != 0 || external_symbolizer_ != 0 ||<br>
- Â  Â  Â  Â libbacktrace_symbolizer_ != 0;<br>
+ Â  Â return internal_symbolizer_ != 0 || external_symbolizer_ != 0;<br>
  Â }<br>
<br>
  Â bool IsExternalAvailable() {<br>
@@ -584,30 +567,24 @@ class POSIXSymbolizer : public Symbolize<br>
<br>
  Â ExternalSymbolizer *external_symbolizer_; Â  Â  Â  Â // Leaked.<br>
  Â InternalSymbolizer *const internal_symbolizer_; Â // Leaked.<br>
- Â LibbacktraceSymbolizer *libbacktrace_symbolizer_; Â // Leaked.<br>
 };<br>
<br>
 Symbolizer *Symbolizer::PlatformInit(const char *path_to_external) {<br>
  Â InternalSymbolizer* internal_symbolizer =<br>
  Â  Â  Â InternalSymbolizer::get(&symbolizer_allocator_);<br>
  Â ExternalSymbolizer *external_symbolizer = 0;<br>
- Â LibbacktraceSymbolizer *libbacktrace_symbolizer = 0;<br>
<br>
  Â if (!internal_symbolizer) {<br>
- Â  Â libbacktrace_symbolizer =<br>
- Â  Â  Â  Â LibbacktraceSymbolizer::get(&symbolizer_allocator_);<br>
- Â  Â if (!libbacktrace_symbolizer) {<br>
- Â  Â  Â // Find path to llvm-symbolizer if it's not provided.<br>
- Â  Â  Â if (!path_to_external)<br>
- Â  Â  Â  Â path_to_external = FindPathToBinary("llvm-symbolizer");<br>
- Â  Â  Â if (path_to_external && path_to_external[0] != '\0')<br>
- Â  Â  Â  Â external_symbolizer = new(symbolizer_allocator_)<br>
- Â  Â  Â  Â  Â  Â ExternalSymbolizer(path_to_external);<br>
- Â  Â }<br>
+ Â  Â // Find path to llvm-symbolizer if it's not provided.<br>
+ Â  Â if (!path_to_external)<br>
+ Â  Â  Â path_to_external = FindPathToBinary("llvm-symbolizer");<br>
+ Â  Â if (path_to_external && path_to_external[0] != '\0')<br>
+ Â  Â  Â external_symbolizer = new(symbolizer_allocator_)<br>
+ Â  Â  Â  Â  Â ExternalSymbolizer(path_to_external);<br>
  Â }<br>
<br>
- Â return new(symbolizer_allocator_) POSIXSymbolizer(<br>
- Â  Â  Â external_symbolizer, internal_symbolizer, libbacktrace_symbolizer);<br>
+ Â return new(symbolizer_allocator_)<br>
+ Â  Â  Â POSIXSymbolizer(external_symbolizer, internal_symbolizer);<br>
 }<br>
<br>
 } Â // namespace __sanitizer<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>