From a6c4a387ee430b7a6e99df08e78e95ca8f29269a Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Fri, 18 Jan 2013 13:01:18 +0000 Subject: [PATCH] [sanitizer] Rename 2 files *.h->*.inc as appropriate. Also add a missing include. llvm-svn: 172814 --- compiler-rt/lib/asan/asan_interceptors.cc | 2 +- compiler-rt/lib/msan/msan_interceptors.cc | 2 +- compiler-rt/lib/sanitizer_common/CMakeLists.txt | 4 ++-- ...tors.h => sanitizer_common_interceptors.inc} | 11 +++-------- ... => sanitizer_common_interceptors_scanf.inc} | 17 +++++++++++++---- .../tests/sanitizer_scanf_interceptor_test.cc | 14 +++++++++++++- compiler-rt/lib/tsan/rtl/tsan_interceptors.cc | 2 +- 7 files changed, 34 insertions(+), 18 deletions(-) rename compiler-rt/lib/sanitizer_common/{sanitizer_common_interceptors.h => sanitizer_common_interceptors.inc} (95%) rename compiler-rt/lib/sanitizer_common/{sanitizer_common_interceptors_scanf.h => sanitizer_common_interceptors_scanf.inc} (85%) diff --git a/compiler-rt/lib/asan/asan_interceptors.cc b/compiler-rt/lib/asan/asan_interceptors.cc index c3fd67bc274a..05038e8f240a 100644 --- a/compiler-rt/lib/asan/asan_interceptors.cc +++ b/compiler-rt/lib/asan/asan_interceptors.cc @@ -93,7 +93,7 @@ using namespace __asan; // NOLINT #define COMMON_INTERCEPTOR_FD_ACQUIRE(ctx, fd) do { } while (false) #define COMMON_INTERCEPTOR_FD_RELEASE(ctx, fd) do { } while (false) #define COMMON_INTERCEPTOR_SET_THREAD_NAME(ctx, name) SetThreadName(name) -#include "sanitizer_common/sanitizer_common_interceptors.h" +#include "sanitizer_common/sanitizer_common_interceptors.inc" static thread_return_t THREAD_CALLING_CONV asan_thread_start(void *arg) { AsanThread *t = (AsanThread*)arg; diff --git a/compiler-rt/lib/msan/msan_interceptors.cc b/compiler-rt/lib/msan/msan_interceptors.cc index e0e642442a9d..69904ddca57d 100644 --- a/compiler-rt/lib/msan/msan_interceptors.cc +++ b/compiler-rt/lib/msan/msan_interceptors.cc @@ -743,7 +743,7 @@ INTERCEPTOR(int, getrusage, int who, void *usage) { #define COMMON_INTERCEPTOR_FD_ACQUIRE(ctx, fd) do { } while (false) #define COMMON_INTERCEPTOR_FD_RELEASE(ctx, fd) do { } while (false) #define COMMON_INTERCEPTOR_SET_THREAD_NAME(ctx, name) do { } while (false) // FIXME -#include "sanitizer_common/sanitizer_common_interceptors.h" +#include "sanitizer_common/sanitizer_common_interceptors.inc" // static void *fast_memset(void *ptr, int c, SIZE_T n) { diff --git a/compiler-rt/lib/sanitizer_common/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/CMakeLists.txt index d7b186942494..bd1d19ef9bfb 100644 --- a/compiler-rt/lib/sanitizer_common/CMakeLists.txt +++ b/compiler-rt/lib/sanitizer_common/CMakeLists.txt @@ -29,8 +29,8 @@ set(SANITIZER_HEADERS sanitizer_atomic_msvc.h sanitizer_atomic.h sanitizer_common.h - sanitizer_common_interceptors.h - sanitizer_common_interceptors_scanf.h + sanitizer_common_interceptors.inc + sanitizer_common_interceptors_scanf.inc sanitizer_flags.h sanitizer_internal_defs.h sanitizer_lfstack.h diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.h b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc similarity index 95% rename from compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.h rename to compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc index ab3ef20acd83..172fe9d52020 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc @@ -1,4 +1,4 @@ -//===-- sanitizer_common_interceptors.h -------------------------*- C++ -*-===// +//===-- sanitizer_common_interceptors.inc -----------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -19,9 +19,6 @@ // COMMON_INTERCEPTOR_FD_RELEASE // COMMON_INTERCEPTOR_SET_THREAD_NAME //===----------------------------------------------------------------------===// -#ifndef SANITIZER_COMMON_INTERCEPTORS_H -#define SANITIZER_COMMON_INTERCEPTORS_H - #include "interception/interception.h" #include "sanitizer_platform_interceptors.h" @@ -147,7 +144,7 @@ INTERCEPTOR(int, prctl, int option, #if SANITIZER_INTERCEPT_SCANF -#include "sanitizer_common_interceptors_scanf.h" +#include "sanitizer_common_interceptors_scanf.inc" INTERCEPTOR(int, vscanf, const char *format, va_list ap) { // NOLINT void* ctx; @@ -224,6 +221,4 @@ INTERCEPTOR(int, sscanf, const char *str, const char *format, ...) { // NOLINT INIT_PREAD64; \ INIT_PRCTL; \ INIT_WRITE; \ - INIT_SCANF; \ - -#endif // SANITIZER_COMMON_INTERCEPTORS_H + INIT_SCANF; diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_scanf.h b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_scanf.inc similarity index 85% rename from compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_scanf.h rename to compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_scanf.inc index 767b9c60790d..e327cadc5bc2 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_scanf.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_scanf.inc @@ -1,5 +1,16 @@ -#ifndef SANITIZER_COMMON_INTERCEPTORS_SCANF_H -#define SANITIZER_COMMON_INTERCEPTORS_SCANF_H +//===-- sanitizer_common_interceptors_scanf.inc -----------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// Scanf implementation for use in *Sanitizer interceptors. +// +//===----------------------------------------------------------------------===// +#include struct ScanfSpec { char c; @@ -129,5 +140,3 @@ static void scanf_common(void *ctx, const char *format, va_list ap_const) { } va_end(aq); } - -#endif // SANITIZER_COMMON_INTERCEPTORS_SCANF_H diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_scanf_interceptor_test.cc b/compiler-rt/lib/sanitizer_common/tests/sanitizer_scanf_interceptor_test.cc index d93bc3fd231f..31d6d5d50961 100644 --- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_scanf_interceptor_test.cc +++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_scanf_interceptor_test.cc @@ -1,3 +1,15 @@ +//===-- sanitizer_scanf_interceptor_test.cc -------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// Tests for *scanf interceptors implementation in sanitizer_common. +// +//===----------------------------------------------------------------------===// #include #include "interception/interception.h" @@ -10,7 +22,7 @@ using namespace __sanitizer; #define COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ptr, size) \ ((std::vector *)ctx)->push_back(size) -#include "sanitizer_common/sanitizer_common_interceptors_scanf.h" +#include "sanitizer_common/sanitizer_common_interceptors_scanf.inc" static void testScanf2(void *ctx, const char *format, ...) { va_list ap; diff --git a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc index d914a96aa4df..c0846e71f1cd 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc @@ -1618,7 +1618,7 @@ struct TsanInterceptorContext { FdRelease(((TsanInterceptorContext*)ctx)->thr, pc, fd) #define COMMON_INTERCEPTOR_SET_THREAD_NAME(ctx, name) \ ThreadSetName(((TsanInterceptorContext*)ctx)->thr, name) -#include "sanitizer_common/sanitizer_common_interceptors.h" +#include "sanitizer_common/sanitizer_common_interceptors.inc" namespace __tsan {