1 files changed, 20 insertions, 11 deletions
diff --git a/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc b/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc
index 3d352cb97a5e..2b842cd8134a 100644
--- a/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc
@@ -20,6 +20,13 @@ namespace __sanitizer {
 class FastUnwindTest : public ::testing::Test {
  protected:
   virtual void SetUp();
+  bool TryFastUnwind(uptr max_depth) {
+    if (!StackTrace::WillUseFastUnwind(true))
+      return false;
+    trace.Unwind(max_depth, start_pc, (uptr)&fake_stack[0], fake_top,
+                 fake_bottom, true);
+    return true;
+  }
 
   uptr fake_stack[10];
   uptr start_pc;
@@ -47,16 +54,11 @@ void FastUnwindTest::SetUp() {
   // Bottom is one slot before the start because FastUnwindStack uses >.
   fake_bottom = (uptr)&fake_stack[-1];
   start_pc = PC(0);
-
-  // This is common setup done by __asan::GetStackTrace().
-  trace.size = 0;
-  trace.max_size = ARRAY_SIZE(fake_stack);
-  trace.trace[0] = start_pc;
 }
 
 TEST_F(FastUnwindTest, Basic) {
-  trace.FastUnwindStack(start_pc, (uptr)&fake_stack[0],
-                        fake_top, fake_bottom);
+  if (!TryFastUnwind(kStackTraceMax))
+    return;
   // Should get all on-stack retaddrs and start_pc.
   EXPECT_EQ(6U, trace.size);
   EXPECT_EQ(start_pc, trace.trace[0]);
@@ -69,8 +71,8 @@ TEST_F(FastUnwindTest, Basic) {
 TEST_F(FastUnwindTest, FramePointerLoop) {
   // Make one fp point to itself.
   fake_stack[4] = (uptr)&fake_stack[4];
-  trace.FastUnwindStack(start_pc, (uptr)&fake_stack[0],
-                        fake_top, fake_bottom);
+  if (!TryFastUnwind(kStackTraceMax))
+    return;
   // Should get all on-stack retaddrs up to the 4th slot and start_pc.
   EXPECT_EQ(4U, trace.size);
   EXPECT_EQ(start_pc, trace.trace[0]);
@@ -82,8 +84,8 @@ TEST_F(FastUnwindTest, FramePointerLoop) {
 TEST_F(FastUnwindTest, MisalignedFramePointer) {
   // Make one fp misaligned.
   fake_stack[4] += 3;
-  trace.FastUnwindStack(start_pc, (uptr)&fake_stack[0],
-                        fake_top, fake_bottom);
+  if (!TryFastUnwind(kStackTraceMax))
+    return;
   // Should get all on-stack retaddrs up to the 4th slot and start_pc.
   EXPECT_EQ(4U, trace.size);
   EXPECT_EQ(start_pc, trace.trace[0]);
@@ -92,5 +94,12 @@ TEST_F(FastUnwindTest, MisalignedFramePointer) {
   }
 }
 
+TEST_F(FastUnwindTest, OneFrameStackTrace) {
+  if (!TryFastUnwind(1))
+    return;
+  EXPECT_EQ(1U, trace.size);
+  EXPECT_EQ(start_pc, trace.trace[0]);
+  EXPECT_EQ((uptr)&fake_stack[0], trace.top_frame_bp);
+}
 
 }  // namespace __sanitizer