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

Revert "[tsan] Replace mem intrinsics with calls to interceptors" 

Breaks
http://45.33.8.238/macm1/43944/step_4.txt
https://lab.llvm.org/buildbot/#/builders/70/builds/26926

This reverts commit 77654a65a3.
This commit is contained in:
Vitaly Buka 2022-09-06 09:46:46 -07:00
parent 0c7abd3924
commit c51a12d598
5 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler-rt/lib/tsan/rtl/tsan.syms.extra
View File

@ -9,9 +9,6 @@ __tsan_java*
__tsan_unaligned*
__tsan_release
__tsan_acquire
__tsan_memcpy
__tsan_memmove
__tsan_memset
__tsan_mutex_create
__tsan_mutex_destroy
__tsan_mutex_pre_lock

14
compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp
View File

@ -3059,17 +3059,3 @@ extern "C" SANITIZER_INTERFACE_ATTRIBUTE void __tsan_testonly_barrier_wait(
FutexWait(barrier, cur);
}
}
extern "C" {
__attribute__((alias(SANITIZER_STRINGIFY(WRAP(memcpy))),
visibility("default"))) void *
__tsan_memcpy(void *dst, const void *src, uptr size);
__attribute__((alias(SANITIZER_STRINGIFY(WRAP(memset))),
visibility("default"))) void *
__tsan_memset(void *dst, int c, uptr size);
__attribute__((alias(SANITIZER_STRINGIFY(WRAP(memmove))),
visibility("default"))) void *
__tsan_memmove(void *dst, const void *src, uptr size);
}

7
compiler-rt/lib/tsan/rtl/tsan_interface.h
View File

@ -72,13 +72,6 @@ SANITIZER_INTERFACE_ATTRIBUTE void __tsan_vptr_read(void **vptr_p);
SANITIZER_INTERFACE_ATTRIBUTE
void __tsan_vptr_update(void **vptr_p, void *new_val);
SANITIZER_INTERFACE_ATTRIBUTE
void *__tsan_memcpy(void *dest, const void *src, uptr count);
SANITIZER_INTERFACE_ATTRIBUTE
void *__tsan_memset(void *dest, int ch, uptr count);
SANITIZER_INTERFACE_ATTRIBUTE
void *__tsan_memmove(void *dest, const void *src, uptr count);
SANITIZER_INTERFACE_ATTRIBUTE void __tsan_func_entry(void *call_pc);
SANITIZER_INTERFACE_ATTRIBUTE void __tsan_func_exit();

6
llvm/lib/Transforms/Instrumentation/ThreadSanitizer.cpp
View File

@ -341,13 +341,13 @@ void ThreadSanitizer::initialize(Module &M) {
}
MemmoveFn =
M.getOrInsertFunction("__tsan_memmove", Attr, IRB.getInt8PtrTy(),
M.getOrInsertFunction("memmove", Attr, IRB.getInt8PtrTy(),
IRB.getInt8PtrTy(), IRB.getInt8PtrTy(), IntptrTy);
MemcpyFn =
M.getOrInsertFunction("__tsan_memcpy", Attr, IRB.getInt8PtrTy(),
M.getOrInsertFunction("memcpy", Attr, IRB.getInt8PtrTy(),
IRB.getInt8PtrTy(), IRB.getInt8PtrTy(), IntptrTy);
MemsetFn =
M.getOrInsertFunction("__tsan_memset", Attr, IRB.getInt8PtrTy(),
M.getOrInsertFunction("memset", Attr, IRB.getInt8PtrTy(),
IRB.getInt8PtrTy(), IRB.getInt32Ty(), IntptrTy);
}

10
llvm/test/Instrumentation/ThreadSanitizer/tsan_basic.ll
View File

@ -35,7 +35,7 @@ entry:
tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 4 %x, i8* align 4 %y, i64 16, i1 false)
ret void
; CHECK: define void @MemCpyTest
; CHECK: call i8* @__tsan_memcpy
; CHECK: call i8* @memcpy
; CHECK: ret void
}
@ -44,7 +44,7 @@ entry:
tail call void @llvm.memcpy.inline.p0i8.p0i8.i64(i8* align 4 %x, i8* align 4 %y, i64 16, i1 false)
ret void
; CHECK: define void @MemCpyInlineTest
; CHECK: call i8* @__tsan_memcpy
; CHECK: call i8* @memcpy
; CHECK: ret void
}
@ -53,7 +53,7 @@ entry:
tail call void @llvm.memmove.p0i8.p0i8.i64(i8* align 4 %x, i8* align 4 %y, i64 16, i1 false)
ret void
; CHECK: define void @MemMoveTest
; CHECK: call i8* @__tsan_memmove
; CHECK: call i8* @memmove
; CHECK: ret void
}
@ -62,7 +62,7 @@ entry:
tail call void @llvm.memset.p0i8.i64(i8* align 4 %x, i8 77, i64 16, i1 false)
ret void
; CHECK: define void @MemSetTest
; CHECK: call i8* @__tsan_memset
; CHECK: call i8* @memset
; CHECK: ret void
}
@ -71,7 +71,7 @@ entry:
tail call void @llvm.memset.inline.p0i8.i64(i8* align 4 %x, i8 77, i64 16, i1 false)
ret void
; CHECK: define void @MemSetInlineTest
; CHECK: call i8* @__tsan_memset
; CHECK: call i8* @memset
; CHECK: ret void
}