================
@@ -95,32 +94,32 @@ class ProgramPoint {
   const void *Data1;
   llvm::PointerIntPair<const void *, 2, unsigned> Data2;
 
-  // The LocationContext could be NULL to allow ProgramPoint to be used in
+  // The StackFrame could be NULL to allow ProgramPoint to be used in
   // context insensitive analysis.
-  llvm::PointerIntPair<const LocationContext *, 2, unsigned> L;
+  llvm::PointerIntPair<const StackFrame *, 2, unsigned> S;
 
   llvm::PointerIntPair<const ProgramPointTag *, 2, unsigned> Tag;
 
   CFGBlock::ConstCFGElementRef ElemRef = {nullptr, 0};
 
 protected:
   ProgramPoint() = default;
-  ProgramPoint(const void *P, Kind k, const LocationContext *l,
+  ProgramPoint(const void *P, Kind k, const StackFrame *SF,
                const ProgramPointTag *tag = nullptr,
                CFGBlock::ConstCFGElementRef ElemRef = {nullptr, 0})
       : Data1(P), Data2(nullptr, (((unsigned)k) >> 0) & 0x3),
-        L(l, (((unsigned)k) >> 2) & 0x3), Tag(tag, (((unsigned)k) >> 4) & 0x3),
+        S(SF, (((unsigned)k) >> 2) & 0x3), Tag(tag, (((unsigned)k) >> 4) & 
0x3),
         ElemRef(ElemRef) {
     assert(getKind() == k);
-    assert(getLocationContext() == l);
+    assert(getStackFrame() == SF);
     assert(getData1() == P);
   }
 
-  ProgramPoint(const void *P1, const void *P2, Kind k, const LocationContext 
*l,
+  ProgramPoint(const void *P1, const void *P2, Kind k, const StackFrame *SF,
                const ProgramPointTag *tag = nullptr,
                CFGBlock::ConstCFGElementRef ElemRef = {nullptr, 0})
       : Data1(P1), Data2(P2, (((unsigned)k) >> 0) & 0x3),
-        L(l, (((unsigned)k) >> 2) & 0x3), Tag(tag, (((unsigned)k) >> 4) & 0x3),
+        S(SF, (((unsigned)k) >> 2) & 0x3), Tag(tag, (((unsigned)k) >> 4) & 
0x3),
----------------
tigbr wrote:

For some reason the Github ui does not let me reply to the suggestion about 
`final` directly so I will reply here. 

So by making it `final` we document that a class hierarchy should not be made 
out of `StackFrame` (as was with `LocationContext`). That's a nice touch I will 
do that.

https://github.com/llvm/llvm-project/pull/198211
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to