summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2012-08-28 14:14:30 +0000
committerKostya Serebryany <kcc@google.com>2012-08-28 14:14:30 +0000
commit69f2174b3bdee7fe6c6911778147fc7e35d57693 (patch)
treedbf2557516e22f392d9e2c39769b4813501fd560 /lib
parent1b5ea8fbbef73f5d9b41dbb26a21b9a0f4d1445e (diff)
[asan] fix Windows build
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162758 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/asan/asan_win.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/asan/asan_win.cc b/lib/asan/asan_win.cc
index 176876287..dc2654a3a 100644
--- a/lib/asan/asan_win.cc
+++ b/lib/asan/asan_win.cc
@@ -32,15 +32,15 @@ static AsanLock dbghelp_lock(LINKER_INITIALIZED);
static bool dbghelp_initialized = false;
#pragma comment(lib, "dbghelp.lib")
-void StackTrace::GetStackTrace(uptr max_s, uptr pc, uptr bp) {
- max_size = max_s;
+void GetStackTrace(StackTrace *stack, uptr max_s, uptr pc, uptr bp) {
+ stack->max_size = max_s;
void *tmp[kStackTraceMax];
// FIXME: CaptureStackBackTrace might be too slow for us.
// FIXME: Compare with StackWalk64.
// FIXME: Look at LLVMUnhandledExceptionFilter in Signals.inc
- uptr cs_ret = CaptureStackBackTrace(1, max_size, tmp, 0),
- offset = 0;
+ uptr cs_ret = CaptureStackBackTrace(1, stack->max_size, tmp, 0);
+ uptr offset = 0;
// Skip the RTL frames by searching for the PC in the stacktrace.
// FIXME: this doesn't work well for the malloc/free stacks yet.
for (uptr i = 0; i < cs_ret; i++) {
@@ -50,9 +50,9 @@ void StackTrace::GetStackTrace(uptr max_s, uptr pc, uptr bp) {
break;
}
- size = cs_ret - offset;
- for (uptr i = 0; i < size; i++)
- trace[i] = (uptr)tmp[i + offset];
+ stack->size = cs_ret - offset;
+ for (uptr i = 0; i < stack->size; i++)
+ stack->trace[i] = (uptr)tmp[i + offset];
}
bool WinSymbolize(const void *addr, char *out_buffer, int buffer_size) {