From 59a255152d5af0f2f5d432a06400dd30d17df2a0 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Fri, 27 May 2016 02:06:19 +0000 Subject: [PATCH] [CodeGen] Don't crash when sizeof(long) != 4 for some intrins _InterlockedIncrement and _InterlockedDecrement have 'long' in their prototypes. We assumed 'long' was the same size as an i32 which is incorrect for other targets. This fixes PR27892. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@270953 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGBuiltin.cpp | 15 +++++++++------ test/CodeGen/pr27892.c | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 test/CodeGen/pr27892.c diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp index daf89b4a74..2f96549355 100644 --- a/lib/CodeGen/CGBuiltin.cpp +++ b/lib/CodeGen/CGBuiltin.cpp @@ -1884,22 +1884,24 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD, return RValue::get(Builder.CreateExtractValue(CXI, 0)); } case Builtin::BI_InterlockedIncrement: { + llvm::Type *IntTy = ConvertType(E->getType()); AtomicRMWInst *RMWI = Builder.CreateAtomicRMW( AtomicRMWInst::Add, EmitScalarExpr(E->getArg(0)), - ConstantInt::get(Int32Ty, 1), + ConstantInt::get(IntTy, 1), llvm::AtomicOrdering::SequentiallyConsistent); RMWI->setVolatile(true); - return RValue::get(Builder.CreateAdd(RMWI, ConstantInt::get(Int32Ty, 1))); + return RValue::get(Builder.CreateAdd(RMWI, ConstantInt::get(IntTy, 1))); } case Builtin::BI_InterlockedDecrement: { + llvm::Type *IntTy = ConvertType(E->getType()); AtomicRMWInst *RMWI = Builder.CreateAtomicRMW( AtomicRMWInst::Sub, EmitScalarExpr(E->getArg(0)), - ConstantInt::get(Int32Ty, 1), + ConstantInt::get(IntTy, 1), llvm::AtomicOrdering::SequentiallyConsistent); RMWI->setVolatile(true); - return RValue::get(Builder.CreateSub(RMWI, ConstantInt::get(Int32Ty, 1))); + return RValue::get(Builder.CreateSub(RMWI, ConstantInt::get(IntTy, 1))); } case Builtin::BI_InterlockedExchangeAdd: { AtomicRMWInst *RMWI = Builder.CreateAtomicRMW( @@ -1911,11 +1913,12 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD, return RValue::get(RMWI); } case Builtin::BI__readfsdword: { + llvm::Type *IntTy = ConvertType(E->getType()); Value *IntToPtr = Builder.CreateIntToPtr(EmitScalarExpr(E->getArg(0)), - llvm::PointerType::get(CGM.Int32Ty, 257)); + llvm::PointerType::get(IntTy, 257)); LoadInst *Load = - Builder.CreateAlignedLoad(IntToPtr, /*Align=*/4, /*isVolatile=*/true); + Builder.CreateDefaultAlignedLoad(IntToPtr, /*isVolatile=*/true); return RValue::get(Load); } diff --git a/test/CodeGen/pr27892.c b/test/CodeGen/pr27892.c new file mode 100644 index 0000000000..694ce9eb0a --- /dev/null +++ b/test/CodeGen/pr27892.c @@ -0,0 +1,23 @@ +// RUN: %clang_cc1 -triple x86_64-linux-gnu -fms-extensions %s -emit-llvm -o - | FileCheck %s + +long test1(long *p) { + return _InterlockedIncrement(p); +} +// CHECK-DAG: define i64 @test1( +// CHECK: %[[p_addr:.*]] = alloca i64*, align 8 +// CHECK: store i64* %p, i64** %[[p_addr]], align 8 +// CHECK: %[[p_load:.*]] = load i64*, i64** %[[p_addr]], align 8 +// CHECK: %[[atomic_add:.*]] = atomicrmw volatile add i64* %[[p_load]], i64 1 seq_cst +// CHECK: %[[res:.*]] = add i64 %[[atomic_add]], 1 +// CHECK: ret i64 %[[res]] + +long test2(long *p) { + return _InterlockedDecrement(p); +} +// CHECK-DAG: define i64 @test2( +// CHECK: %[[p_addr:.*]] = alloca i64*, align 8 +// CHECK: store i64* %p, i64** %[[p_addr]], align 8 +// CHECK: %[[p_load:.*]] = load i64*, i64** %[[p_addr]], align 8 +// CHECK: %[[atomic_sub:.*]] = atomicrmw volatile sub i64* %[[p_load]], i64 1 seq_cst +// CHECK: %[[res:.*]] = sub i64 %[[atomic_sub]], 1 +// CHECK: ret i64 %[[res]] -- 2.40.0