diff options
Diffstat (limited to 'include/clang/StaticAnalyzer')
4 files changed, 35 insertions, 17 deletions
diff --git a/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h b/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h index 718f54c75a..924bbf9d1c 100644 --- a/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h +++ b/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h @@ -231,6 +231,10 @@ public: // // This is controlled by "ipa-always-inline-size" analyzer-config option. unsigned getAlwaysInlineSize() const; + + /// Returns true if the analyzer engine should synthesize fake bodies + /// for well-known functions. + bool shouldSynthesizeBodies() const; public: AnalyzerOptions() : CXXMemberInliningMode() { diff --git a/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h b/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h index 0e1d15253c..4d054df705 100644 --- a/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h +++ b/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h @@ -396,7 +396,8 @@ public: PathDiagnosticConsumer &PC, ArrayRef<BugReport *> &bugReports) {} - bool RemoveUneededCalls(PathPieces &pieces, BugReport *R); + bool RemoveUneededCalls(PathPieces &pieces, BugReport *R, + PathDiagnosticCallPiece *CallWithLoc = 0); void Register(BugType *BT); diff --git a/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h b/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h index 43b39bf8f9..1ed975fc47 100644 --- a/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h +++ b/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h @@ -137,8 +137,6 @@ private: Kind kind) : K(kind), S(0), D(0), SM(&sm), Loc(genLocation(L)), Range(genRange()) { - assert(Loc.isValid()); - assert(Range.isValid()); } FullSourceLoc @@ -157,12 +155,14 @@ public: PathDiagnosticLocation(const Stmt *s, const SourceManager &sm, LocationOrAnalysisDeclContext lac) - : K(StmtK), S(s), D(0), SM(&sm), + : K(s->getLocStart().isValid() ? StmtK : SingleLocK), + S(K == StmtK ? s : 0), + D(0), SM(&sm), Loc(genLocation(SourceLocation(), lac)), Range(genRange(lac)) { - assert(S); - assert(Loc.isValid()); - assert(Range.isValid()); + assert(K == SingleLocK || S); + assert(K == SingleLocK || Loc.isValid()); + assert(K == SingleLocK || Range.isValid()); } /// Create a location corresponding to the given declaration. diff --git a/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h b/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h index 9dc9491cfd..1b9a33eb0b 100644 --- a/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h +++ b/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h @@ -20,6 +20,7 @@ #include "clang/AST/DeclCXX.h" #include "clang/AST/ExprCXX.h" #include "clang/AST/ExprObjC.h" +#include "clang/Analysis/AnalysisContext.h" #include "clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h" #include "clang/StaticAnalyzer/Core/PathSensitive/SVals.h" #include "llvm/ADT/PointerIntPair.h" @@ -191,7 +192,8 @@ public: /// \brief Returns the definition of the function or method that will be /// called. - virtual RuntimeDefinition getRuntimeDefinition() const = 0; + virtual RuntimeDefinition + getRuntimeDefinition(AnalysisDeclContextManager &M) const = 0; /// \brief Returns the expression whose value will be the result of this call. /// May be null. @@ -364,11 +366,17 @@ public: return cast<FunctionDecl>(CallEvent::getDecl()); } - virtual RuntimeDefinition getRuntimeDefinition() const { + virtual RuntimeDefinition + getRuntimeDefinition(AnalysisDeclContextManager &M) const { const FunctionDecl *FD = getDecl(); - // Note that hasBody() will fill FD with the definition FunctionDecl. - if (FD && FD->hasBody(FD)) - return RuntimeDefinition(FD); + // Note that the AnalysisDeclContext will have the FunctionDecl with + // the definition (if one exists). + if (FD) { + AnalysisDeclContext *AD = M.getContext(FD); + if (AD->getBody()) + return RuntimeDefinition(AD->getDecl()); + } + return RuntimeDefinition(); } @@ -468,7 +476,8 @@ public: return BR->getDecl(); } - virtual RuntimeDefinition getRuntimeDefinition() const { + virtual RuntimeDefinition + getRuntimeDefinition(AnalysisDeclContextManager &M) const { return RuntimeDefinition(getBlockDecl()); } @@ -510,7 +519,8 @@ public: virtual const FunctionDecl *getDecl() const; - virtual RuntimeDefinition getRuntimeDefinition() const; + virtual RuntimeDefinition + getRuntimeDefinition(AnalysisDeclContextManager &M) const; virtual void getInitialStackFrameContents(const StackFrameContext *CalleeCtx, BindingsTy &Bindings) const; @@ -552,7 +562,8 @@ public: virtual const Expr *getCXXThisExpr() const; - virtual RuntimeDefinition getRuntimeDefinition() const; + virtual RuntimeDefinition + getRuntimeDefinition(AnalysisDeclContextManager &M) const; virtual Kind getKind() const { return CE_CXXMember; } @@ -632,7 +643,8 @@ public: virtual SourceRange getSourceRange() const { return Location; } virtual unsigned getNumArgs() const { return 0; } - virtual RuntimeDefinition getRuntimeDefinition() const; + virtual RuntimeDefinition + getRuntimeDefinition(AnalysisDeclContextManager &M) const; /// \brief Returns the value of the implicit 'this' object. virtual SVal getCXXThisVal() const; @@ -838,7 +850,8 @@ public: llvm_unreachable("Unknown message kind"); } - virtual RuntimeDefinition getRuntimeDefinition() const; + virtual RuntimeDefinition + getRuntimeDefinition(AnalysisDeclContextManager &M) const; virtual void getInitialStackFrameContents(const StackFrameContext *CalleeCtx, BindingsTy &Bindings) const; |