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

[asan] fix the cmake build (hopefully) 

llvm-svn: 162760
This commit is contained in:
Kostya Serebryany 2012-08-28 14:48:28 +00:00
parent 327d0a5666
commit 3a6af66a0e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cc
View File

@ -11,10 +11,10 @@
// run-time libraries. // run-time libraries.
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "sanitizer_common/sanitizer_common.h" #include "sanitizer_common.h"
#include "sanitizer_common/sanitizer_procmaps.h" #include "sanitizer_procmaps.h"
#include "sanitizer_common/sanitizer_stacktrace.h" #include "sanitizer_stacktrace.h"
#include "sanitizer_common/sanitizer_symbolizer.h" #include "sanitizer_symbolizer.h"
namespace __sanitizer { namespace __sanitizer {
static const char *StripPathPrefix(const char *filepath, static const char *StripPathPrefix(const char *filepath,
@ -146,7 +146,7 @@ uptr StackTrace::CompressStack(StackTrace *stack, u32 *compressed, uptr size) {
} else { } else {
uptr hi = pc >> 32; uptr hi = pc >> 32;
uptr lo = (pc << 32) >> 32; uptr lo = (pc << 32) >> 32;
CHECK((hi & (1 << 31)) == 0); CHECK_EQ((hi & (1 << 31)), 0);
if (c_index + 1 >= size) break; if (c_index + 1 >= size) break;
// Printf("C co[%zu] hi/lo: %zx %zx\n", c_index, hi, lo); // Printf("C co[%zu] hi/lo: %zx %zx\n", c_index, hi, lo);
compressed[c_index++] = hi; compressed[c_index++] = hi;
@ -172,7 +172,7 @@ uptr StackTrace::CompressStack(StackTrace *stack, u32 *compressed, uptr size) {
// |res| may be greater than check_stack.size, because // |res| may be greater than check_stack.size, because
// UncompressStack(CompressStack(stack)) eliminates the 0x0 frames. // UncompressStack(CompressStack(stack)) eliminates the 0x0 frames.
CHECK(res >= check_stack.size); CHECK(res >= check_stack.size);
CHECK(0 == REAL(memcmp)(check_stack.trace, stack->trace, CHECK_EQ(0, REAL(memcmp)(check_stack.trace, stack->trace,
check_stack.size * sizeof(uptr))); check_stack.size * sizeof(uptr)));
#endif #endif

2
compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.h
View File

@ -13,7 +13,7 @@
#ifndef SANITIZER_STACKTRACE_H #ifndef SANITIZER_STACKTRACE_H
#define SANITIZER_STACKTRACE_H #define SANITIZER_STACKTRACE_H
#include "sanitizer_common/sanitizer_internal_defs.h" #include "sanitizer_internal_defs.h"
namespace __sanitizer { namespace __sanitizer {