r187509 - ObjectiveC arc: minor refactoring in my last patch

[Fariborz Jahanian]

Author: fjahanian
Date: Wed Jul 31 13:39:08 2013
New Revision: 187509

URL: http://llvm.org/viewvc/llvm-project?rev=187509&view=rev
Log:
ObjectiveC arc: minor refactoring in my last patch
to avoid future false positives. // rdar://14569171

Modified:
    cfe/trunk/lib/Sema/SemaExpr.cpp

Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=187509&r1=187508&r2=187509&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Wed Jul 31 13:39:08 2013
@@ -4061,10 +4061,14 @@ bool Sema::GatherArgumentsForCall(Source
         Param = FDecl->getParamDecl(i);
 
       // Strip the unbridged-cast placeholder expression off, if applicable.
+      bool CFAudited = false;
       if (Arg->getType() == Context.ARCUnbridgedCastTy &&
           FDecl && FDecl->hasAttr<CFAuditedTransferAttr>() &&
           (!Param || !Param->hasAttr<CFConsumedAttr>()))
         Arg = stripARCUnbridgedCast(Arg);
+      else if (FDecl && FDecl->hasAttr<CFAuditedTransferAttr>() &&
+               (!Param || !Param->hasAttr<CFConsumedAttr>()))
+        CFAudited = true;
 
       InitializedEntity Entity = Param ?
           InitializedEntity::InitializeParameter(Context, Param, ProtoArgType)
@@ -4072,8 +4076,7 @@ bool Sema::GatherArgumentsForCall(Source
                                                  Proto->isArgConsumed(i));
       
       // Remember that parameter belongs to a CF audited API.
-      if (FDecl && FDecl->hasAttr<CFAuditedTransferAttr>() &&
-          (!Param || !Param->hasAttr<CFConsumedAttr>()))
+      if (CFAudited)
         Entity.setParameterCFAudited();
       
       ExprResult ArgE = PerformCopyInitialization(Entity,