[llvm-commits] [compiler-rt] r161946 - /compiler-rt/trunk/lib/asan/asan_stack.cc

[Alexander Potapenko]

Author: glider
Date: Wed Aug 15 08:23:03 2012
New Revision: 161946

URL: http://llvm.org/viewvc/llvm-project?rev=161946&view=rev
Log:
Patch the frame address regardless of the frame number.

Modified:
    compiler-rt/trunk/lib/asan/asan_stack.cc

Modified: compiler-rt/trunk/lib/asan/asan_stack.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_stack.cc?rev=161946&r1=161945&r2=161946&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_stack.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_stack.cc Wed Aug 15 08:23:03 2012
@@ -48,9 +48,7 @@
 #if defined(ASAN_USE_EXTERNAL_SYMBOLIZER)
 void AsanStackTrace::PrintStack(uptr *addr, uptr size) {
   for (uptr i = 0; i < size && addr[i]; i++) {
-    uptr pc = addr[i];
-    if (i < size - 1 && addr[i + 1])
-      pc = patch_pc(pc);
+    uptr pc = patch_pc(addr[i]);
     char buff[4096];
     ASAN_USE_EXTERNAL_SYMBOLIZER((void*)pc, buff, sizeof(buff));
     // We can't know anything about the string returned by external
@@ -65,9 +63,7 @@
   ProcessMaps proc_maps;
   uptr frame_num = 0;
   for (uptr i = 0; i < size && addr[i]; i++) {
-    uptr pc = addr[i];
-    if (i < size - 1 && addr[i + 1])
-      pc = patch_pc(pc);
+    uptr pc = patch_pc(addr[i]);
     AddressInfo addr_frames[64];
     uptr addr_frames_num = 0;
     if (flags()->symbolize) {