[PATCH] D19961: [LSAN] Fix test swapcontext.cc on MIPS

[Sagar Thakur via llvm-commits]

sagar updated this revision to Diff 57437.
sagar added a comment.

As suggested by Mike, updated patch to avoid platform ifdefs.


Repository:
  rL LLVM

http://reviews.llvm.org/D19961

Files:
  lib/asan/asan_stack.h
  lib/lsan/lsan.h
  lib/sanitizer_common/sanitizer_stacktrace.cc
  lib/sanitizer_common/sanitizer_stacktrace.h

Index: lib/sanitizer_common/sanitizer_stacktrace.h
===================================================================
--- lib/sanitizer_common/sanitizer_stacktrace.h
+++ lib/sanitizer_common/sanitizer_stacktrace.h
@@ -110,6 +110,11 @@
   void operator=(const BufferedStackTrace &);
 };
 
+// Check if given pointer points into allocated stack area.
+static inline bool IsValidFrame(uptr frame, uptr stack_top, uptr stack_bottom) {
+  return frame > stack_bottom && frame < stack_top - 2 * sizeof (uhwptr);
+}
+
 }  // namespace __sanitizer
 
 // Use this macro if you want to print stack trace with the caller
Index: lib/sanitizer_common/sanitizer_stacktrace.cc
===================================================================
--- lib/sanitizer_common/sanitizer_stacktrace.cc
+++ lib/sanitizer_common/sanitizer_stacktrace.cc
@@ -40,11 +40,6 @@
   top_frame_bp = 0;
 }
 
-// Check if given pointer points into allocated stack area.
-static inline bool IsValidFrame(uptr frame, uptr stack_top, uptr stack_bottom) {
-  return frame > stack_bottom && frame < stack_top - 2 * sizeof (uhwptr);
-}
-
 // In GCC on ARM bp points to saved lr, not fp, so we should check the next
 // cell in stack to be a saved frame pointer. GetCanonicFrame returns the
 // pointer to saved frame pointer in any case.
Index: lib/lsan/lsan.h
===================================================================
--- lib/lsan/lsan.h
+++ lib/lsan/lsan.h
@@ -24,8 +24,16 @@
       stack_top = t->stack_end();                                              \
       stack_bottom = t->stack_begin();                                         \
     }                                                                          \
-    stack.Unwind(max_size, StackTrace::GetCurrentPc(), GET_CURRENT_FRAME(),    \
-                 /* context */ 0, stack_top, stack_bottom, fast);              \
+    if (SANITIZER_MIPS) {                                                      \
+      if (IsValidFrame(GET_CURRENT_FRAME(), stack_top, stack_bottom)) {        \
+        stack.Unwind(max_size, StackTrace::GetCurrentPc(),                     \
+                     GET_CURRENT_FRAME(), /* context */ 0, stack_top,          \
+                     stack_bottom, fast);                                      \
+      }                                                                        \
+    } else {                                                                   \
+      stack.Unwind(max_size, StackTrace::GetCurrentPc(), GET_CURRENT_FRAME(),  \
+                   /* context */ 0, stack_top, stack_bottom, fast);            \
+    }                                                                          \
   }
 
 #define GET_STACK_TRACE_FATAL \
Index: lib/asan/asan_stack.h
===================================================================
--- lib/asan/asan_stack.h
+++ lib/asan/asan_stack.h
@@ -48,7 +48,15 @@
       uptr stack_top = t->stack_top();
       uptr stack_bottom = t->stack_bottom();
       ScopedUnwinding unwind_scope(t);
-      stack->Unwind(max_depth, pc, bp, context, stack_top, stack_bottom, fast);
+      if (SANITIZER_MIPS) {
+        if (IsValidFrame(bp, stack_top, stack_bottom)) {
+          stack->Unwind(max_depth, pc, bp, context, stack_top, stack_bottom,
+                        fast);
+        }
+      } else {
+        stack->Unwind(max_depth, pc, bp, context, stack_top, stack_bottom,
+                      fast);
+      }
     } else if (!t && !fast) {
       /* If GetCurrentThread() has failed, try to do slow unwind anyways. */
       stack->Unwind(max_depth, pc, bp, context, 0, 0, false);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D19961.57437.patch
Type: text/x-patch
Size: 3603 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160517/fbebc12a/attachment.bin>