[compiler-rt] r355376 - [NFC] Reorder ifs in BufferedStackTrace::UnwindImpl

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Mon Mar  4 20:36:49 2019
New Revision: 355376

URL: http://llvm.org/viewvc/llvm-project?rev=355376&view=rev
Log:
[NFC] Reorder ifs in BufferedStackTrace::UnwindImpl

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=355376&r1=355375&r2=355376&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_stack.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_stack.cc Mon Mar  4 20:36:49 2019
@@ -38,20 +38,24 @@ void __sanitizer::BufferedStackTrace::Un
   Unwind(max_depth, pc, bp, context, 0, 0, false);
 #else
   AsanThread *t = GetCurrentThread();
-  if (t && !t->isUnwinding()) {
-    uptr stack_top = t->stack_top();
-    uptr stack_bottom = t->stack_bottom();
-    ScopedUnwinding unwind_scope(t);
-    if (SANITIZER_MIPS && !IsValidFrame(bp, stack_top, stack_bottom))
-      return;
-    if (StackTrace::WillUseFastUnwind(request_fast))
-      Unwind(max_depth, pc, bp, nullptr, stack_top, stack_bottom, true);
-    else
+  if (!t) {
+    if (!request_fast) {
+      /* If GetCurrentThread() has failed, try to do slow unwind anyways. */
       Unwind(max_depth, pc, bp, context, 0, 0, false);
-  } else if (!t && !request_fast) {
-    /* If GetCurrentThread() has failed, try to do slow unwind anyways. */
-    Unwind(max_depth, pc, bp, context, 0, 0, false);
+    }
+    return;
   }
+  if (t->isUnwinding())
+    return;
+  uptr stack_top = t->stack_top();
+  uptr stack_bottom = t->stack_bottom();
+  ScopedUnwinding unwind_scope(t);
+  if (SANITIZER_MIPS && !IsValidFrame(bp, stack_top, stack_bottom))
+    return;
+  if (StackTrace::WillUseFastUnwind(request_fast))
+    Unwind(max_depth, pc, bp, nullptr, stack_top, stack_bottom, true);
+  else
+    Unwind(max_depth, pc, bp, context, 0, 0, false);
 #endif // SANITIZER_WINDOWS
 }