diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2012-03-27 16:42:20 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2012-03-27 16:42:20 +0000 |
| commit | 835cabe92a6de798ca98ef70e7185c49b5cfe628 (patch) | |
| tree | ad46830fc65c7c1789acd1acfc7b8717c6d13c18 | |
| parent | 8418de168969d3f270500d4a2501631dfb4a8a79 (diff) | |
| download | bcm5719-llvm-835cabe92a6de798ca98ef70e7185c49b5cfe628.tar.gz bcm5719-llvm-835cabe92a6de798ca98ef70e7185c49b5cfe628.zip | |
Remove few if-then-else when both branches are the
same. pr12357.
llvm-svn: 153515
| -rw-r--r-- | clang/lib/Rewrite/RewriteModernObjC.cpp | 12 | ||||
| -rw-r--r-- | clang/lib/Rewrite/RewriteObjC.cpp | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/clang/lib/Rewrite/RewriteModernObjC.cpp b/clang/lib/Rewrite/RewriteModernObjC.cpp index c4f721f8c29..40b806d69d5 100644 --- a/clang/lib/Rewrite/RewriteModernObjC.cpp +++ b/clang/lib/Rewrite/RewriteModernObjC.cpp @@ -1148,10 +1148,8 @@ void RewriteModernObjC::RewriteObjCMethodDecl(const ObjCInterfaceDecl *IDecl, std::string Name = PDecl->getNameAsString(); QualType QT = PDecl->getType(); // Make sure we convert "t (^)(...)" to "t (*)(...)". - if (convertBlockPointerToFunctionPointer(QT)) - QT.getAsStringInternal(Name, Context->getPrintingPolicy()); - else - PDecl->getType().getAsStringInternal(Name, Context->getPrintingPolicy()); + (void)convertBlockPointerToFunctionPointer(QT); + QT.getAsStringInternal(Name, Context->getPrintingPolicy()); ResultStr += Name; } } @@ -3294,10 +3292,8 @@ std::string RewriteModernObjC::SynthesizeBlockFunc(BlockExpr *CE, int i, if (AI != BD->param_begin()) S += ", "; ParamStr = (*AI)->getNameAsString(); QualType QT = (*AI)->getType(); - if (convertBlockPointerToFunctionPointer(QT)) - QT.getAsStringInternal(ParamStr, Context->getPrintingPolicy()); - else - QT.getAsStringInternal(ParamStr, Context->getPrintingPolicy()); + (void)convertBlockPointerToFunctionPointer(QT); + QT.getAsStringInternal(ParamStr, Context->getPrintingPolicy()); S += ParamStr; } if (FT->isVariadic()) { diff --git a/clang/lib/Rewrite/RewriteObjC.cpp b/clang/lib/Rewrite/RewriteObjC.cpp index 3a59cc2bf30..9c0737f659a 100644 --- a/clang/lib/Rewrite/RewriteObjC.cpp +++ b/clang/lib/Rewrite/RewriteObjC.cpp @@ -1137,10 +1137,8 @@ void RewriteObjC::RewriteObjCMethodDecl(const ObjCInterfaceDecl *IDecl, std::string Name = PDecl->getNameAsString(); QualType QT = PDecl->getType(); // Make sure we convert "t (^)(...)" to "t (*)(...)". - if (convertBlockPointerToFunctionPointer(QT)) - QT.getAsStringInternal(Name, Context->getPrintingPolicy()); - else - PDecl->getType().getAsStringInternal(Name, Context->getPrintingPolicy()); + (void)convertBlockPointerToFunctionPointer(QT); + QT.getAsStringInternal(Name, Context->getPrintingPolicy()); ResultStr += Name; } } @@ -3355,10 +3353,8 @@ std::string RewriteObjC::SynthesizeBlockFunc(BlockExpr *CE, int i, if (AI != BD->param_begin()) S += ", "; ParamStr = (*AI)->getNameAsString(); QualType QT = (*AI)->getType(); - if (convertBlockPointerToFunctionPointer(QT)) - QT.getAsStringInternal(ParamStr, Context->getPrintingPolicy()); - else - QT.getAsStringInternal(ParamStr, Context->getPrintingPolicy()); + (void)convertBlockPointerToFunctionPointer(QT); + QT.getAsStringInternal(ParamStr, Context->getPrintingPolicy()); S += ParamStr; } if (FT->isVariadic()) { |
