From 62bb4134358d0d1f8b892cf0df42d758ac8e19e7 Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Sat, 18 Jul 2009 08:34:51 +0000 Subject: [PATCH] Fix simplifylibcalls memset recognition to work on 64-bit platforms where int is 32 bits. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@76293 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Scalar/SimplifyLibCalls.cpp | 4 ++-- test/Transforms/SimplifyLibCalls/memset-64.ll | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 test/Transforms/SimplifyLibCalls/memset-64.ll diff --git a/lib/Transforms/Scalar/SimplifyLibCalls.cpp b/lib/Transforms/Scalar/SimplifyLibCalls.cpp index f285406b190..7e6b3534625 100644 --- a/lib/Transforms/Scalar/SimplifyLibCalls.cpp +++ b/lib/Transforms/Scalar/SimplifyLibCalls.cpp @@ -994,12 +994,12 @@ struct VISIBILITY_HIDDEN MemSetOpt : public LibCallOptimization { const FunctionType *FT = Callee->getFunctionType(); if (FT->getNumParams() != 3 || FT->getReturnType() != FT->getParamType(0) || !isa(FT->getParamType(0)) || - FT->getParamType(1) != TD->getIntPtrType() || + !isa(FT->getParamType(1)) || FT->getParamType(2) != TD->getIntPtrType()) return 0; // memset(p, v, n) -> llvm.memset(p, v, n, 1) - Value *Val = B.CreateTrunc(CI->getOperand(2), Type::Int8Ty); + Value *Val = B.CreateIntCast(CI->getOperand(2), Type::Int8Ty, false); EmitMemSet(CI->getOperand(1), Val, CI->getOperand(3), B); return CI->getOperand(1); } diff --git a/test/Transforms/SimplifyLibCalls/memset-64.ll b/test/Transforms/SimplifyLibCalls/memset-64.ll new file mode 100644 index 00000000000..a6a277e080a --- /dev/null +++ b/test/Transforms/SimplifyLibCalls/memset-64.ll @@ -0,0 +1,12 @@ +; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep {llvm.memset} +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" +target triple = "x86_64-pc-linux-gnu" + +define void @a(i8* %x) nounwind { +entry: + %call = call i8* @memset(i8* %x, i32 1, i64 100) ; [#uses=0] + ret void +} + +declare i8* @memset(i8*, i32, i64) +