1 files changed, 27 insertions, 24 deletions
diff --git a/include/clang/Analysis/AnalysisDeclContext.h b/include/clang/Analysis/AnalysisDeclContext.h
index 1961d571e9e12..9faa78cde89c2 100644
--- a/include/clang/Analysis/AnalysisDeclContext.h
+++ b/include/clang/Analysis/AnalysisDeclContext.h
@@ -183,9 +183,8 @@ public:
   const ImplicitParamDecl *getSelfDecl() const;
 
   const StackFrameContext *getStackFrame(LocationContext const *Parent,
-                                         const Stmt *S,
-                                         const CFGBlock *Blk,
-                                         unsigned Idx);
+                                         const Stmt *S, const CFGBlock *Blk,
+                                         unsigned BlockCount, unsigned Idx);
 
   const BlockInvocationContext *
   getBlockInvocationContext(const LocationContext *parent,
@@ -258,7 +257,7 @@ public:
     return getAnalysisDeclContext()->getAnalysis<T>();
   }
 
-  ParentMap &getParentMap() const {
+  const ParentMap &getParentMap() const {
     return getAnalysisDeclContext()->getParentMap();
   }
 
@@ -303,15 +302,19 @@ class StackFrameContext : public LocationContext {
   // The parent block of the callsite.
   const CFGBlock *Block;
 
+  // The number of times the 'Block' has been visited.
+  // It allows discriminating between stack frames of the same call that is
+  // called multiple times in a loop.
+  const unsigned BlockCount;
+
   // The index of the callsite in the CFGBlock.
-  unsigned Index;
+  const unsigned Index;
 
   StackFrameContext(AnalysisDeclContext *ctx, const LocationContext *parent,
-                    const Stmt *s, const CFGBlock *blk,
-                    unsigned idx,
-                    int64_t ID)
-      : LocationContext(StackFrame, ctx, parent, ID), CallSite(s),
-        Block(blk), Index(idx) {}
+                    const Stmt *s, const CFGBlock *blk, unsigned blockCount,
+                    unsigned idx, int64_t ID)
+      : LocationContext(StackFrame, ctx, parent, ID), CallSite(s), Block(blk),
+        BlockCount(blockCount), Index(idx) {}
 
 public:
   ~StackFrameContext() override = default;
@@ -329,9 +332,10 @@ public:
 
   static void Profile(llvm::FoldingSetNodeID &ID, AnalysisDeclContext *ctx,
                       const LocationContext *parent, const Stmt *s,
-                      const CFGBlock *blk, unsigned idx) {
+                      const CFGBlock *blk, unsigned blockCount, unsigned idx) {
     ProfileCommon(ID, StackFrame, ctx, parent, s);
     ID.AddPointer(blk);
+    ID.AddInteger(blockCount);
     ID.AddInteger(idx);
   }
 
@@ -410,8 +414,8 @@ public:
 
   const StackFrameContext *getStackFrame(AnalysisDeclContext *ctx,
                                          const LocationContext *parent,
-                                         const Stmt *s,
-                                         const CFGBlock *blk, unsigned idx);
+                                         const Stmt *s, const CFGBlock *blk,
+                                         unsigned blockCount, unsigned idx);
 
   const ScopeContext *getScope(AnalysisDeclContext *ctx,
                                const LocationContext *parent,
@@ -483,26 +487,25 @@ public:
   bool synthesizeBodies() const { return SynthesizeBodies; }
 
   const StackFrameContext *getStackFrame(AnalysisDeclContext *Ctx,
-                                         LocationContext const *Parent,
-                                         const Stmt *S,
-                                         const CFGBlock *Blk,
-                                         unsigned Idx) {
-    return LocContexts.getStackFrame(Ctx, Parent, S, Blk, Idx);
+                                         const LocationContext *Parent,
+                                         const Stmt *S, const CFGBlock *Blk,
+                                         unsigned BlockCount, unsigned Idx) {
+    return LocContexts.getStackFrame(Ctx, Parent, S, Blk, BlockCount, Idx);
   }
 
   // Get the top level stack frame.
   const StackFrameContext *getStackFrame(const Decl *D) {
     return LocContexts.getStackFrame(getContext(D), nullptr, nullptr, nullptr,
-                                     0);
+                                     0, 0);
   }
 
   // Get a stack frame with parent.
   StackFrameContext const *getStackFrame(const Decl *D,
-                                         LocationContext const *Parent,
-                                         const Stmt *S,
-                                         const CFGBlock *Blk,
-                                         unsigned Idx) {
-    return LocContexts.getStackFrame(getContext(D), Parent, S, Blk, Idx);
+                                         const LocationContext *Parent,
+                                         const Stmt *S, const CFGBlock *Blk,
+                                         unsigned BlockCount, unsigned Idx) {
+    return LocContexts.getStackFrame(getContext(D), Parent, S, Blk, BlockCount,
+                                     Idx);
   }
 
   /// Get a reference to {@code BodyFarm} instance.