r174245 - [analyzer] Always inline functions with bodies generated by BodyFarm.

[Anna Zaks]

On Feb 3, 2013, at 9:09 PM, NAKAMURA Takumi <geek4civic at gmail.com> wrote:

> 2013/2/2 Anna Zaks <ganna at apple.com>:
>> Author: zaks
>> Date: Fri Feb  1 18:30:04 2013
>> New Revision: 174245
>> 
>> URL: http://llvm.org/viewvc/llvm-project?rev=174245&view=rev
>> Log:
>> [analyzer] Always inline functions with bodies generated by BodyFarm.
>> 
>> Inlining these functions is essential for correctness. We often have
>> cases where we do not inline calls. For example, the shallow mode and
>> when reanalyzing previously inlined ObjC methods as top level.
>> 
>> Modified:
>>    cfe/trunk/include/clang/Analysis/AnalysisContext.h
>>    cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp
>>    cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
>>    cfe/trunk/test/Analysis/NSString.m
>> 
>> Modified: cfe/trunk/include/clang/Analysis/AnalysisContext.h
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/AnalysisContext.h?rev=174245&r1=174244&r2=174245&view=diff
>> ==============================================================================
>> --- cfe/trunk/include/clang/Analysis/AnalysisContext.h (original)
>> +++ cfe/trunk/include/clang/Analysis/AnalysisContext.h Fri Feb  1 18:30:04 2013
>> @@ -133,7 +133,21 @@ public:
>>   void registerForcedBlockExpression(const Stmt *stmt);
>>   const CFGBlock *getBlockForRegisteredExpression(const Stmt *stmt);
>> 
>> +  /// \brief Get the body of the Declaration.
>>   Stmt *getBody() const;
>> +
>> +  /// \brief Get the body of the Declaration.
>> +  /// \param IsAutosynthesized Output parameter that specifies if the body is
>> +  /// auto-generated by the BodyFarm.
>> +  Stmt *getBody(bool &IsAutosynthesized) const;
>> +
>> +  /// \brief Checks if the body of the Decl is generated by the BodyFarm.
>> +  ///
>> +  /// Note, the lookup is not free. We are going to call getBody behind
>> +  /// the sceines.
>> +  /// \sa getBody
>> +  bool isBodyAutosynthesized() const;
>> +
>>   CFG *getCFG();
>> 
>>   CFGStmtMap *getCFGStmtMap();
>> 
>> Modified: cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp?rev=174245&r1=174244&r2=174245&view=diff
>> ==============================================================================
>> --- cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp (original)
>> +++ cfe/trunk/lib/Analysis/AnalysisDeclContext.cpp Fri Feb  1 18:30:04 2013
>> @@ -86,11 +86,13 @@ static BodyFarm &getBodyFarm(ASTContext
>>   return *BF;
>> }
>> 
>> -Stmt *AnalysisDeclContext::getBody() const {
>> +Stmt *AnalysisDeclContext::getBody(bool &IsAutosynthesized) const {
>>   if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
>>     Stmt *Body = FD->getBody();
>> -    if (!Body && Manager && Manager->synthesizeBodies())
>> +    if (!Body && Manager && Manager->synthesizeBodies()) {
>> +      IsAutosynthesized = true;
>>       return getBodyFarm(getASTContext()).getBody(FD);
>> +    }
>>     return Body;
>>   }
>>   else if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(D))
>> @@ -104,6 +106,17 @@ Stmt *AnalysisDeclContext::getBody() con
>>   llvm_unreachable("unknown code decl");
>> }
>> 
>> +Stmt *AnalysisDeclContext::getBody() const {
>> +  bool Tmp;
>> +  return getBody(Tmp);
>> +}
>> +
>> +bool AnalysisDeclContext::isBodyAutosynthesized() const {
>> +  bool Tmp;
>> +  getBody(Tmp);
>> +  return Tmp;
> 
> Tmp was true or undef. Fixed in r174303. Could you reconfirm?
> http://lab.llvm.org:8011/builders/clang-x86_64-linux-vg/builds/675
> 

Takumi, it should have been initialized to false. Thanks for fixing this.
Anna.

>> +}
> 
> 
> ...Takumi