Fix the regression on test/Sema/cfstring.c

llvm-svn: 41396

1 files changed, 9 insertions, 4 deletions

diff --git a/clang/Sema/SemaChecking.cpp b/clang/Sema/SemaChecking.cpp
index a1deb3d256d..a62c73e8fb7 100644
--- a/clang/Sema/SemaChecking.cpp
+++ b/clang/Sema/SemaChecking.cpp
@@ -80,10 +80,15 @@ Sema::CheckFunctionCall(Expr *Fn,
 
 /// CheckBuiltinCFStringArgument - Checks that the argument to the builtin
 /// CFString constructor is correct
-bool Sema::CheckBuiltinCFStringArgument(Expr* Arg)
-{
-  while (ParenExpr *PE = dyn_cast<ParenExpr>(Arg))
-    Arg = PE->getSubExpr();
+bool Sema::CheckBuiltinCFStringArgument(Expr* Arg) {
+  while (1) {
+    if (ParenExpr *PE = dyn_cast<ParenExpr>(Arg))
+      Arg = PE->getSubExpr();
+    else if (ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(Arg))
+      Arg = ICE->getSubExpr();
+    else
+      break;
+  }
   
   StringLiteral *Literal = dyn_cast<StringLiteral>(Arg);