[cfe-commits] r156880 - in /cfe/trunk: lib/Edit/RewriteObjCFoundationAPI.cpp test/ARCMT/objcmt-boxing.m test/ARCMT/objcmt-boxing.m.result

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Tue May 15 19:21:21 2012
New Revision: 156880

URL: http://llvm.org/viewvc/llvm-project?rev=156880&view=rev
Log:
[objcmt] Accept char arrays for rewriting to @() syntax.

Part of rdar://11438360

Modified:
    cfe/trunk/lib/Edit/RewriteObjCFoundationAPI.cpp
    cfe/trunk/test/ARCMT/objcmt-boxing.m
    cfe/trunk/test/ARCMT/objcmt-boxing.m.result

Modified: cfe/trunk/lib/Edit/RewriteObjCFoundationAPI.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Edit/RewriteObjCFoundationAPI.cpp?rev=156880&r1=156879&r2=156880&view=diff
==============================================================================
--- cfe/trunk/lib/Edit/RewriteObjCFoundationAPI.cpp (original)
+++ cfe/trunk/lib/Edit/RewriteObjCFoundationAPI.cpp Tue May 15 19:21:21 2012
@@ -824,8 +824,12 @@
   if (Arg->isTypeDependent())
     return false;
 
+  ASTContext &Ctx = NS.getASTContext();
+
   const Expr *OrigArg = Arg->IgnoreImpCasts();
   QualType OrigTy = OrigArg->getType();
+  if (OrigTy->isArrayType())
+    OrigTy = Ctx.getArrayDecayedType(OrigTy);
 
   if (const StringLiteral *
         StrE = dyn_cast<StringLiteral>(OrigArg->IgnoreParens())) {
@@ -834,8 +838,6 @@
     return true;
   }
 
-  ASTContext &Ctx = NS.getASTContext();
-
   if (const PointerType *PT = OrigTy->getAs<PointerType>()) {
     QualType PointeeType = PT->getPointeeType();
     if (Ctx.hasSameUnqualifiedType(PointeeType, Ctx.CharTy)) {

Modified: cfe/trunk/test/ARCMT/objcmt-boxing.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/objcmt-boxing.m?rev=156880&r1=156879&r2=156880&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/objcmt-boxing.m (original)
+++ cfe/trunk/test/ARCMT/objcmt-boxing.m Tue May 15 19:21:21 2012
@@ -95,4 +95,7 @@
   NSStringEncoding encode;
   s = [NSString stringWithCString:cstr1 encoding:encode];
   s = [NSString stringWithCString:cstr1];
+
+  static const char strarr[] = "coolbox";
+  s = [NSString stringWithUTF8String:strarr];
 }

Modified: cfe/trunk/test/ARCMT/objcmt-boxing.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/objcmt-boxing.m.result?rev=156880&r1=156879&r2=156880&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/objcmt-boxing.m.result (original)
+++ cfe/trunk/test/ARCMT/objcmt-boxing.m.result Tue May 15 19:21:21 2012
@@ -95,4 +95,7 @@
   NSStringEncoding encode;
   s = [NSString stringWithCString:cstr1 encoding:encode];
   s = @(cstr1);
+
+  static const char strarr[] = "coolbox";
+  s = @(strarr);
 }