From 9415e06da74daa11c187a02ef339009d80a5268c Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Wed, 30 Mar 2016 12:31:51 +0000 Subject: [PATCH] [NVPTX] Avoid temporary std::string and make single-use function local to the cpp file. No functionality change intended. llvm-svn: 264861 --- llvm/lib/Target/NVPTX/NVPTX.h | 2 -- llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/llvm/lib/Target/NVPTX/NVPTX.h b/llvm/lib/Target/NVPTX/NVPTX.h index fd1b847..5f429b6 100644 --- a/llvm/lib/Target/NVPTX/NVPTX.h +++ b/llvm/lib/Target/NVPTX/NVPTX.h @@ -56,8 +56,6 @@ FunctionPass *createNVPTXLowerKernelArgsPass(const NVPTXTargetMachine *TM); BasicBlockPass *createNVPTXLowerAllocaPass(); MachineFunctionPass *createNVPTXPeephole(); -bool isImageOrSamplerVal(const Value *, const Module *); - extern Target TheNVPTXTarget32; extern Target TheNVPTXTarget64; diff --git a/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp b/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp index 592a269..79689b4 100644 --- a/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp +++ b/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp @@ -2039,7 +2039,7 @@ NVPTXTargetLowering::getParamSymbol(SelectionDAG &DAG, int idx, EVT v) const { // Check to see if the kernel argument is image*_t or sampler_t -bool llvm::isImageOrSamplerVal(const Value *arg, const Module *context) { +static bool isImageOrSamplerVal(const Value *arg, const Module *context) { static const char *const specialTypes[] = { "struct._image2d_t", "struct._image3d_t", "struct._sampler_t" }; @@ -2054,10 +2054,11 @@ bool llvm::isImageOrSamplerVal(const Value *arg, const Module *context) { return false; auto *STy = dyn_cast(PTy->getElementType()); - const std::string TypeName = STy && !STy->isLiteral() ? STy->getName() : ""; + if (!STy || STy->isLiteral()) + return false; return std::find(std::begin(specialTypes), std::end(specialTypes), - TypeName) != std::end(specialTypes); + STy->getName()) != std::end(specialTypes); } SDValue NVPTXTargetLowering::LowerFormalArguments( -- 2.7.4