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

[msan] Remove leftover MSanDR bits in tests. 

llvm-svn: 222762
This commit is contained in:
Evgeniy Stepanov 2014-11-25 15:00:23 +00:00
parent 290e2cc520
commit 089c066bd6
4 changed files with 1 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler-rt/lib/msan/tests/CMakeLists.txt
View File

@ -15,10 +15,8 @@ set(MSAN_UNITTEST_SOURCES msan_test.cc msan_test_main.cc)
set(MSAN_LOADABLE_SOURCE msan_loadable.cc)
set(MSAN_UNITTEST_HEADERS
msan_test_config.h
msandr_test_so.h
../../../include/sanitizer/msan_interface.h
)
set(MSANDR_UNITTEST_SOURCE msandr_test_so.cc)
set(MSAN_UNITTEST_COMMON_CFLAGS
-I${COMPILER_RT_LIBCXX_PATH}/include
${COMPILER_RT_GTEST_CFLAGS}
@ -113,25 +111,13 @@ macro(add_msan_tests_for_arch arch kind)
msan_compile(MSAN_INST_LOADABLE_OBJECTS ${MSAN_LOADABLE_SOURCE} ${arch} "${kind}"
${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${ARGN})
# Uninstrumented shared object for MSanDR tests.
set(MSANDR_TEST_OBJECTS)
msan_compile(MSANDR_TEST_OBJECTS ${MSANDR_UNITTEST_SOURCE} ${arch} "${kind}"
${MSAN_UNITTEST_COMMON_CFLAGS})
# Instrumented loadable library tests.
set(MSAN_LOADABLE_SO)
msan_link_shared(MSAN_LOADABLE_SO "libmsan_loadable" ${arch} "${kind}"
OBJECTS ${MSAN_INST_LOADABLE_OBJECTS}
DEPS ${MSAN_INST_LOADABLE_OBJECTS})
# Uninstrumented shared library tests.
set(MSANDR_TEST_SO)
msan_link_shared(MSANDR_TEST_SO "libmsandr_test" ${arch} "${kind}"
OBJECTS ${MSANDR_TEST_OBJECTS}
DEPS ${MSANDR_TEST_OBJECTS})
set(MSAN_TEST_OBJECTS ${MSAN_INST_TEST_OBJECTS} ${MSAN_INST_GTEST}
${MSANDR_TEST_SO})
set(MSAN_TEST_OBJECTS ${MSAN_INST_TEST_OBJECTS} ${MSAN_INST_GTEST})
set(MSAN_TEST_DEPS ${MSAN_TEST_OBJECTS} libcxx_msan${kind}
${MSAN_LOADABLE_SO})
if(NOT COMPILER_RT_STANDALONE_BUILD)

1
compiler-rt/lib/msan/tests/msan_test.cc
View File

@ -20,7 +20,6 @@
#include "sanitizer/allocator_interface.h"
#include "sanitizer/msan_interface.h"
#include "msandr_test_so.h"
#include <inttypes.h>
#include <stdlib.h>

38
compiler-rt/lib/msan/tests/msandr_test_so.cc
View File

@ -1,38 +0,0 @@
//===-- msandr_test_so.cc ------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
// This file is a part of MemorySanitizer.
//
// MemorySanitizer unit tests.
//===----------------------------------------------------------------------===//
#include "msandr_test_so.h"
void dso_memfill(char* s, unsigned n) {
for (unsigned i = 0; i < n; ++i)
s[i] = i;
}
int dso_callfn(int (*fn)(void)) {
volatile int x = fn();
return x;
}
int dso_callfn1(int (*fn)(long long, long long, long long)) { //NOLINT
volatile int x = fn(1, 2, 3);
return x;
}
int dso_stack_store(void (*fn)(int*, int*), int x) {
int y = x + 1;
fn(&x, &y);
return y;
}
void break_optimization(void *x) {}

24
compiler-rt/lib/msan/tests/msandr_test_so.h
View File

@ -1,24 +0,0 @@
//===-- msandr_test_so.h ----------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
// This file is a part of MemorySanitizer.
//
// MemorySanitizer unit tests.
//===----------------------------------------------------------------------===//
#ifndef MSANDR_MSANDR_TEST_SO_H
#define MSANDR_MSANDR_TEST_SO_H
void dso_memfill(char* s, unsigned n);
int dso_callfn(int (*fn)(void));
int dso_callfn1(int (*fn)(long long, long long, long long)); //NOLINT
int dso_stack_store(void (*fn)(int*, int*), int x);
void break_optimization(void *x);
#endif