[llvm-commits] [compiler-rt] r162760 - in /compiler-rt/trunk/lib/sanitizer_common: sanitizer_stacktrace.cc sanitizer_stacktrace.h

[Kostya Serebryany]

Author: kcc
Date: Tue Aug 28 09:48:28 2012
New Revision: 162760

URL: http://llvm.org/viewvc/llvm-project?rev=162760&view=rev
Log:
[asan] fix the cmake build (hopefully)

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.h

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc?rev=162760&r1=162759&r2=162760&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.cc Tue Aug 28 09:48:28 2012
@@ -11,10 +11,10 @@
 // run-time libraries.
 //===----------------------------------------------------------------------===//
 
-#include "sanitizer_common/sanitizer_common.h"
-#include "sanitizer_common/sanitizer_procmaps.h"
-#include "sanitizer_common/sanitizer_stacktrace.h"
-#include "sanitizer_common/sanitizer_symbolizer.h"
+#include "sanitizer_common.h"
+#include "sanitizer_procmaps.h"
+#include "sanitizer_stacktrace.h"
+#include "sanitizer_symbolizer.h"
 
 namespace __sanitizer {
 static const char *StripPathPrefix(const char *filepath,
@@ -146,7 +146,7 @@
     } else {
       uptr hi = pc >> 32;
       uptr lo = (pc << 32) >> 32;
-      CHECK((hi & (1 << 31)) == 0);
+      CHECK_EQ((hi & (1 << 31)), 0);
       if (c_index + 1 >= size) break;
       // Printf("C co[%zu] hi/lo: %zx %zx\n", c_index, hi, lo);
       compressed[c_index++] = hi;
@@ -172,7 +172,7 @@
   // |res| may be greater than check_stack.size, because
   // UncompressStack(CompressStack(stack)) eliminates the 0x0 frames.
   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)));
 #endif
 

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.h?rev=162760&r1=162759&r2=162760&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_stacktrace.h Tue Aug 28 09:48:28 2012
@@ -13,7 +13,7 @@
 #ifndef SANITIZER_STACKTRACE_H
 #define SANITIZER_STACKTRACE_H
 
-#include "sanitizer_common/sanitizer_internal_defs.h"
+#include "sanitizer_internal_defs.h"
 
 namespace __sanitizer {