[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.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@174245 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Anna Zaks 2013-02-02 00:30:04 +00:00
Родитель a5245a5159
Коммит 453cb859a3
4 изменённых файлов: 68 добавлений и 3 удалений

Просмотреть файл

@ -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();

Просмотреть файл

@ -86,11 +86,13 @@ static BodyFarm &getBodyFarm(ASTContext &C) {
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() const {
llvm_unreachable("unknown code decl");
}
Stmt *AnalysisDeclContext::getBody() const {
bool Tmp;
return getBody(Tmp);
}
bool AnalysisDeclContext::isBodyAutosynthesized() const {
bool Tmp;
getBody(Tmp);
return Tmp;
}
const ImplicitParamDecl *AnalysisDeclContext::getSelfDecl() const {
if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(D))
return MD->getSelfDecl();

Просмотреть файл

@ -733,13 +733,27 @@ void ExprEngine::conservativeEvalCall(const CallEvent &Call, NodeBuilder &Bldr,
Bldr.generateNode(Call.getProgramPoint(), State, Pred);
}
static bool isEssentialToInline(const CallEvent &Call) {
const Decl *D = Call.getDecl();
if (D) {
AnalysisDeclContext *AD =
Call.getLocationContext()->getAnalysisDeclContext()->
getManager()->getContext(D);
// The auto-synthesized bodies are essential to inline as they are
// usually small and commonly used.
return AD->isBodyAutosynthesized();
}
return false;
}
void ExprEngine::defaultEvalCall(NodeBuilder &Bldr, ExplodedNode *Pred,
const CallEvent &CallTemplate) {
// Make sure we have the most recent state attached to the call.
ProgramStateRef State = Pred->getState();
CallEventRef<> Call = CallTemplate.cloneWithState(State);
if (HowToInline == Inline_None) {
if (HowToInline == Inline_None && !isEssentialToInline(CallTemplate)) {
conservativeEvalCall(*Call, Bldr, Pred, State);
return;
}

Просмотреть файл

@ -404,3 +404,27 @@ void testOSCompareAndSwapXXBarrier_parameter_no_direct_release(NSString **old) {
else
return;
}
@interface AlwaysInlineBodyFarmBodies : NSObject {
NSString *_value;
}
- (NSString *)_value;
- (void)callValue;
@end
@implementation AlwaysInlineBodyFarmBodies
- (NSString *)_value {
if (!_value) {
NSString *s = [[NSString alloc] init];
if (!OSAtomicCompareAndSwapPtr(0, s, (void**)&_value)) {
[s release];
}
}
return _value;
}
- (void)callValue {
[self _value];
}
@end