/// imply that `Val` is true.
bool flowConditionImplies(BoolValue &Val) const;
+ /// Returns the `DeclContext` of the block being analysed, if any. Otherwise,
+ /// returns null.
+ const DeclContext *getDeclCtx() { return DeclCtx; }
+
+ /// Sets the `DeclContext` of the block being analysed.
+ void setDeclCtx(const DeclContext *Ctx) { DeclCtx = Ctx; }
+
/// Returns the `ControlFlowContext` registered for `F`, if any. Otherwise,
/// returns null.
const ControlFlowContext *getControlFlowContext(const FunctionDecl *F) {
// `DACtx` is not null and not owned by this object.
DataflowAnalysisContext *DACtx;
+ // `DeclContext` of the block being analysed if provided.
+ const DeclContext *DeclCtx = nullptr;
+
// In a properly initialized `Environment`, `ReturnLoc` should only be null if
// its `DeclContext` could not be cast to a `FunctionDecl`.
StorageLocation *ReturnLoc = nullptr;
: DACtx(&DACtx), FlowConditionToken(&DACtx.makeFlowConditionToken()) {}
Environment::Environment(const Environment &Other)
- : DACtx(Other.DACtx), ReturnLoc(Other.ReturnLoc),
+ : DACtx(Other.DACtx), DeclCtx(Other.DeclCtx), ReturnLoc(Other.ReturnLoc),
ThisPointeeLoc(Other.ThisPointeeLoc), DeclToLoc(Other.DeclToLoc),
ExprToLoc(Other.ExprToLoc), LocToVal(Other.LocToVal),
MemberLocToStruct(Other.MemberLocToStruct),
}
Environment::Environment(DataflowAnalysisContext &DACtx,
- const DeclContext &DeclCtx)
+ const DeclContext &DeclCtxArg)
: Environment(DACtx) {
- if (const auto *FuncDecl = dyn_cast<FunctionDecl>(&DeclCtx)) {
+ setDeclCtx(&DeclCtxArg);
+
+ if (const auto *FuncDecl = dyn_cast<FunctionDecl>(DeclCtx)) {
assert(FuncDecl->getBody() != nullptr);
initGlobalVars(*FuncDecl->getBody(), *this);
for (const auto *ParamDecl : FuncDecl->parameters()) {
ReturnLoc = &createStorageLocation(ReturnType);
}
- if (const auto *MethodDecl = dyn_cast<CXXMethodDecl>(&DeclCtx)) {
+ if (const auto *MethodDecl = dyn_cast<CXXMethodDecl>(DeclCtx)) {
auto *Parent = MethodDecl->getParent();
assert(Parent != nullptr);
if (Parent->isLambda())
const auto *FuncDecl = Call->getDirectCallee();
assert(FuncDecl != nullptr);
+
+ Env.setDeclCtx(FuncDecl);
+
// FIXME: In order to allow the callee to reference globals, we probably need
// to call `initGlobalVars` here in some way.
void Environment::popCall(const Environment &CalleeEnv) {
// We ignore `DACtx` because it's already the same in both. We don't want the
- // callee's `ReturnLoc` or `ThisPointeeLoc`. We don't bring back `DeclToLoc`
- // and `ExprToLoc` because we want to be able to later analyze the same callee
- // in a different context, and `setStorageLocation` requires there to not
- // already be a storage location assigned. Conceptually, these maps capture
- // information from the local scope, so when popping that scope, we do not
- // propagate the maps.
+ // callee's `DeclCtx`, `ReturnLoc` or `ThisPointeeLoc`. We don't bring back
+ // `DeclToLoc` and `ExprToLoc` because we want to be able to later analyze the
+ // same callee in a different context, and `setStorageLocation` requires there
+ // to not already be a storage location assigned. Conceptually, these maps
+ // capture information from the local scope, so when popping that scope, we do
+ // not propagate the maps.
this->LocToVal = std::move(CalleeEnv.LocToVal);
this->MemberLocToStruct = std::move(CalleeEnv.MemberLocToStruct);
this->FlowConditionToken = std::move(CalleeEnv.FlowConditionToken);
assert(DACtx == Other.DACtx);
assert(ReturnLoc == Other.ReturnLoc);
assert(ThisPointeeLoc == Other.ThisPointeeLoc);
+ assert(DeclCtx == Other.DeclCtx);
auto Effect = LatticeJoinEffect::Unchanged;
Environment JoinedEnv(*DACtx);
+ JoinedEnv.setDeclCtx(DeclCtx);
JoinedEnv.ReturnLoc = ReturnLoc;
JoinedEnv.ThisPointeeLoc = ThisPointeeLoc;