caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[TSan] Fix missing inst cleanup (#144067)

Browse Source 
Commit 44e875ad5b introduced a change that
replaces `ReplaceInstWithInst` with `Instruction::replaceAllUsesWith`,
without subsequent instruction cleanup.

This results in TSan leaving behind useless `load atomic` instructions
after 'replacing' them.

This commit adds cleanup back, consistent with the context.
This commit is contained in:
Kunqiu Chen
2025-06-18 17:09:32 +08:00
committed by GitHub
parent 43e1a5a411
commit 355725a25e
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -728,6 +728,7 @@ bool ThreadSanitizer::instrumentAtomic(Instruction *I, const DataLayout &DL) {
Value *C = IRB.CreateCall(TsanAtomicLoad[Idx], Args);
Value *Cast = IRB.CreateBitOrPointerCast(C, OrigTy);
I->replaceAllUsesWith(Cast);
I->eraseFromParent();
} else if (StoreInst *SI = dyn_cast<StoreInst>(I)) {
Value *Addr = SI->getPointerOperand();
int Idx =

3
llvm/test/Instrumentation/ThreadSanitizer/atomic-non-integer.ll
View File

@@ -10,7 +10,6 @@ define float @load_float(ptr %fptr) {
; CHECK-NEXT: call void @__tsan_func_entry(ptr [[TMP1]])
; CHECK-NEXT: [[TMP2:%.*]] = call i32 @__tsan_atomic32_load(ptr [[FPTR]], i32 0)
; CHECK-NEXT: [[TMP3:%.*]] = bitcast i32 [[TMP2]] to float
; CHECK-NEXT: [[V:%.*]] = load atomic float, ptr [[FPTR]] unordered, align 4
; CHECK-NEXT: call void @__tsan_func_exit()
; CHECK-NEXT: ret float [[TMP3]]
;
@@ -25,7 +24,6 @@ define double @load_double(ptr %fptr) {
; CHECK-NEXT: call void @__tsan_func_entry(ptr [[TMP1]])
; CHECK-NEXT: [[TMP2:%.*]] = call i64 @__tsan_atomic64_load(ptr [[FPTR]], i32 0)
; CHECK-NEXT: [[TMP3:%.*]] = bitcast i64 [[TMP2]] to double
; CHECK-NEXT: [[V:%.*]] = load atomic double, ptr [[FPTR]] unordered, align 8
; CHECK-NEXT: call void @__tsan_func_exit()
; CHECK-NEXT: ret double [[TMP3]]
;
@@ -40,7 +38,6 @@ define fp128 @load_fp128(ptr %fptr) {
; CHECK-NEXT: call void @__tsan_func_entry(ptr [[TMP1]])
; CHECK-NEXT: [[TMP2:%.*]] = call i128 @__tsan_atomic128_load(ptr [[FPTR]], i32 0)
; CHECK-NEXT: [[TMP3:%.*]] = bitcast i128 [[TMP2]] to fp128
; CHECK-NEXT: [[V:%.*]] = load atomic fp128, ptr [[FPTR]] unordered, align 16
; CHECK-NEXT: call void @__tsan_func_exit()
; CHECK-NEXT: ret fp128 [[TMP3]]
;