maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[NFC] Move isUnwinding check into ScopedUnwinding 

llvm-svn: 355380
This commit is contained in:
Vitaly Buka 2019-03-05 05:40:05 +00:00
parent 7a091ae580
commit 1ac22bfef0
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler-rt/lib/asan/asan_stack.cc
View File

@ -31,11 +31,22 @@ namespace {
// ScopedUnwinding is a scope for stacktracing member of a context
class ScopedUnwinding {
public:
explicit ScopedUnwinding(AsanThread *t) : thread(t) { t->setUnwinding(true); }
~ScopedUnwinding() { thread->setUnwinding(false); }
explicit ScopedUnwinding(AsanThread *t) : thread(t) {
if (thread) {
can_unwind = !thread->isUnwinding();
thread->setUnwinding(true);
}
}
~ScopedUnwinding() {
if (thread)
thread->setUnwinding(false);
}
bool CanUnwind() const { return can_unwind; }
private:
AsanThread *thread;
AsanThread *thread = nullptr;
bool can_unwind = true;
};
} // namespace
@ -52,6 +63,9 @@ void __sanitizer::BufferedStackTrace::UnwindImpl(
Unwind(max_depth, pc, bp, context, 0, 0, false);
#else
AsanThread *t = GetCurrentThread();
ScopedUnwinding unwind_scope(t);
if (!unwind_scope.CanUnwind())
return;
if (!t) {
if (!request_fast) {
/* If GetCurrentThread() has failed, try to do slow unwind anyways. */
@ -59,11 +73,10 @@ void __sanitizer::BufferedStackTrace::UnwindImpl(
}
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))