aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2013-03-24 16:04:55 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2013-03-24 16:04:55 +0000
commitf4492448a201c352be3d2e1e76220cf7cd499c55 (patch)
tree19ea5effa259b69d967774183736c259dc70ca97
parent29511875348c49c9c5a14bb086cd51e17feb01c9 (diff)
Simplify code. No functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177842 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/CodeGen/CodeGenFunction.cpp27
1 files changed, 7 insertions, 20 deletions
diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp
index a43148cce7..473a1cba76 100644
--- a/lib/CodeGen/CodeGenFunction.cpp
+++ b/lib/CodeGen/CodeGenFunction.cpp
@@ -331,10 +331,8 @@ static void GenOpenCLArgMetadata(const FunctionDecl *FD, llvm::Function *Fn,
// Turn "unsigned type" to "utype"
std::string::size_type pos = typeName.find("unsigned");
- if(pos != std::string::npos) {
- typeName = typeName.substr(0, pos+1) +
- typeName.substr(pos+9, typeName.size());
- }
+ if (pos != std::string::npos)
+ typeName.erase(pos+1, 8);
argTypeNames.push_back(llvm::MDString::get(Context, typeName));
@@ -343,15 +341,9 @@ static void GenOpenCLArgMetadata(const FunctionDecl *FD, llvm::Function *Fn,
typeQuals = "restrict";
if (pointeeTy.isConstQualified() ||
(pointeeTy.getAddressSpace() == LangAS::opencl_constant))
- if (typeQuals != "")
- typeQuals += " const";
- else
- typeQuals += "const";
+ typeQuals += typeQuals.empty() ? "const" : " const";
if (pointeeTy.isVolatileQualified())
- if (typeQuals != "")
- typeQuals += " volatile";
- else
- typeQuals += "volatile";
+ typeQuals += typeQuals.empty() ? "volatile" : " volatile";
} else {
addressQuals.push_back(Builder.getInt32(0));
@@ -360,10 +352,8 @@ static void GenOpenCLArgMetadata(const FunctionDecl *FD, llvm::Function *Fn,
// Turn "unsigned type" to "utype"
std::string::size_type pos = typeName.find("unsigned");
- if(pos != std::string::npos) {
- typeName = typeName.substr(0, pos+1) +
- typeName.substr(pos+9, typeName.size());
- }
+ if (pos != std::string::npos)
+ typeName.erase(pos+1, 8);
argTypeNames.push_back(llvm::MDString::get(Context, typeName));
@@ -371,10 +361,7 @@ static void GenOpenCLArgMetadata(const FunctionDecl *FD, llvm::Function *Fn,
if (ty.isConstQualified())
typeQuals = "const";
if (ty.isVolatileQualified())
- if (typeQuals != "")
- typeQuals += " volatile";
- else
- typeQuals += "volatile";
+ typeQuals += typeQuals.empty() ? "volatile" : " volatile";
}
argTypeQuals.push_back(llvm::MDString::get(Context, typeQuals));