Index: lib/Transforms/Instrumentation/ThreadSanitizer.cpp =================================================================== --- lib/Transforms/Instrumentation/ThreadSanitizer.cpp +++ lib/Transforms/Instrumentation/ThreadSanitizer.cpp @@ -550,8 +550,7 @@ } static Value *createIntOrPtrToIntCast(Value *V, Type* Ty, IRBuilder<> &IRB) { - return isa(V->getType()) ? - IRB.CreatePtrToInt(V, Ty) : IRB.CreateIntCast(V, Ty, false); + return IRB.CreateBitOrPointerCast(V, Ty); } // Both llvm and ThreadSanitizer atomic operations are based on C++11/C1x @@ -576,15 +575,9 @@ Value *Args[] = {IRB.CreatePointerCast(Addr, PtrTy), createOrdering(&IRB, LI->getOrdering())}; Type *OrigTy = cast(Addr->getType())->getElementType(); - if (Ty == OrigTy) { - Instruction *C = CallInst::Create(TsanAtomicLoad[Idx], Args); - ReplaceInstWithInst(I, C); - } else { - // We are loading a pointer, so we need to cast the return value. - Value *C = IRB.CreateCall(TsanAtomicLoad[Idx], Args); - Instruction *Cast = CastInst::Create(Instruction::IntToPtr, C, OrigTy); - ReplaceInstWithInst(I, Cast); - } + Value *C = IRB.CreateCall(TsanAtomicLoad[Idx], Args); + Value *Cast = IRB.CreateBitOrPointerCast(C, OrigTy); + I->replaceAllUsesWith(Cast); } else if (StoreInst *SI = dyn_cast(I)) { Value *Addr = SI->getPointerOperand(); int Idx = getMemoryAccessFuncIndex(Addr, DL); Index: projects/compiler-rt/test/tsan/Darwin/objc-double-property.mm =================================================================== --- projects/compiler-rt/test/tsan/Darwin/objc-double-property.mm +++ projects/compiler-rt/test/tsan/Darwin/objc-double-property.mm @@ -0,0 +1,19 @@ +// RUN: %clang_tsan %s -o %t -framework Foundation +// RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 | FileCheck %s + +#import + +@interface MyClass : NSObject +@property float a; +@property double b; +@property long double c; +@end + +@implementation MyClass +@end + +int main() { + NSLog(@"Hello world"); +} + +// CHECK: Hello world Index: test/Instrumentation/ThreadSanitizer/atomic-non-integer.ll =================================================================== --- test/Instrumentation/ThreadSanitizer/atomic-non-integer.ll +++ test/Instrumentation/ThreadSanitizer/atomic-non-integer.ll @@ -0,0 +1,51 @@ +; RUN: opt < %s -tsan -S | FileCheck %s +; Check that atomic memory operations on floating-point types are converted to calls into ThreadSanitizer runtime. +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" + +define float @load_float(float* %fptr) { + %v = load atomic float, float* %fptr unordered, align 4 + ret float %v + ; CHECK-LABEL: load_float + ; CHECK: call i32 @__tsan_atomic32_load(i32* %{{.+}}, i32 0) + ; CHECK: bitcast i32 {{.+}} to float +} + +define double @load_double(double* %fptr) { + %v = load atomic double, double* %fptr unordered, align 8 + ret double %v + ; CHECK-LABEL: load_double + ; CHECK: call i64 @__tsan_atomic64_load(i64* %{{.+}}, i32 0) + ; CHECK: bitcast i64 {{.+}} to double +} + +define fp128 @load_fp128(fp128* %fptr) { + %v = load atomic fp128, fp128* %fptr unordered, align 16 + ret fp128 %v + ; CHECK-LABEL: load_fp128 + ; CHECK: call i128 @__tsan_atomic128_load(i128* %{{.+}}, i32 0) + ; CHECK: bitcast i128 {{.+}} to fp128 +} + +define void @store_float(float* %fptr, float %v) { + store atomic float %v, float* %fptr unordered, align 4 + ret void + ; CHECK-LABEL: store_float + ; CHECK: bitcast float %v to i32 + ; CHECK: call void @__tsan_atomic32_store(i32* %{{.+}}, i32 %{{.+}}, i32 0) +} + +define void @store_double(double* %fptr, double %v) { + store atomic double %v, double* %fptr unordered, align 8 + ret void + ; CHECK-LABEL: store_double + ; CHECK: bitcast double %v to i64 + ; CHECK: call void @__tsan_atomic64_store(i64* %{{.+}}, i64 %{{.+}}, i32 0) +} + +define void @store_fp128(fp128* %fptr, fp128 %v) { + store atomic fp128 %v, fp128* %fptr unordered, align 16 + ret void + ; CHECK-LABEL: store_fp128 + ; CHECK: bitcast fp128 %v to i128 + ; CHECK: call void @__tsan_atomic128_store(i128* %{{.+}}, i128 %{{.+}}, i32 0) +}