Improve CallExpr analysis

vgvassilev · Nov 25, 2024 · d63cb79 · d63cb79
1 parent ef4ff13
commit d63cb79
Show file tree

Hide file tree

Showing 5 changed files with 199 additions and 193 deletions.
diff --git a/include/clad/Differentiator/DiffPlanner.h b/include/clad/Differentiator/DiffPlanner.h
@@ -34,11 +34,12 @@ struct DiffRequest {
   } m_TbrRunInfo;
 
   mutable struct ActivityRunInfo {
-    std::set<const clang::VarDecl*> ToBeRecorded;
     bool HasAnalysisRun = false;
   } m_ActivityRunInfo;
 
 public:
+  /// All varied declarations.
+  static std::set<const clang::VarDecl*> AllVariedDecls;
   /// Function to be differentiated.
   const clang::FunctionDecl* Function = nullptr;
   /// Name of the base function to be differentiated. Can be different from
@@ -144,13 +145,6 @@ struct DiffRequest {
 
   bool shouldBeRecorded(clang::Expr* E) const;
   bool shouldHaveAdjoint(const clang::VarDecl* VD) const;
-
-  void setToBeRecorded(std::set<const clang::VarDecl*> init) {
-    this->m_ActivityRunInfo.ToBeRecorded = init;
-  }
-  std::set<const clang::VarDecl*> getToBeRecorded() const {
-    return this->m_ActivityRunInfo.ToBeRecorded;
-  }
 };
 
   using DiffInterval = std::vector<clang::SourceRange>;

diff --git a/lib/Differentiator/ActivityAnalyzer.cpp b/lib/Differentiator/ActivityAnalyzer.cpp
@@ -121,6 +121,8 @@ bool VariedAnalyzer::VisitCallExpr(CallExpr* CE) {
   FunctionDecl* FD = CE->getDirectCallee();
   bool noHiddenParam = (CE->getNumArgs() == FD->getNumParams());
   if (noHiddenParam) {
+    bool restoreMarking = m_Marking;
+    bool restoreVaried = m_Varied;
     MutableArrayRef<ParmVarDecl*> FDparam = FD->parameters();
     for (std::size_t i = 0, e = CE->getNumArgs(); i != e; ++i) {
       clang::Expr* par = CE->getArg(i);
@@ -130,25 +132,24 @@ bool VariedAnalyzer::VisitCallExpr(CallExpr* CE) {
       while (innermostType->isPointerType())
         innermostType = innermostType->getPointeeType();
 
-      if ((parType->isReferenceType() ||
-           utils::isArrayOrPointerType(parType)) &&
-          !innermostType.isConstQualified()) {
-        m_Marking = true;
-        m_Varied = true;
-      }
-
+      m_Varied = false;
+      m_Marking = false;
       TraverseStmt(par);
-      if ((parType->isReferenceType() ||
-           utils::isArrayOrPointerType(parType)) &&
-          !innermostType.isConstQualified()) {
-        m_Marking = false; //?
-        m_Varied = false;
-      }
-
-      if ((m_Varied || !innermostType.isConstQualified()))
+      if (m_Varied)
         m_VariedDecls.insert(FDparam[i]);
+      else if ((parType->isReferenceType() ||
+                (utils::isArrayOrPointerType(parType) &&
+                 !innermostType.isConstQualified()))) {
+        m_Varied = true;
+        m_Marking = true;
+        TraverseStmt(par);
+        m_VariedDecls.insert(FDparam[i]);
+      }
     }
+    m_Varied = restoreVaried;
+    m_Marking = restoreMarking;
   }
+
   return true;
 }
 
@@ -159,12 +160,10 @@ bool VariedAnalyzer::VisitDeclStmt(DeclStmt* DS) {
     QualType innermost = VDTy;
     while (innermost->isPointerType())
       innermost = innermost->getPointeeType();
-    if (VDTy->isPointerType() && !innermost.isConstQualified()) {
-      copyVarToCurBlock(cast<VarDecl>(D));
-      continue;
-    } else if (VDTy->isArrayType()) {
+    if (VDTy->isArrayType() ||
+        (VDTy->isPointerType() && !innermost.isConstQualified())) {
       copyVarToCurBlock(cast<VarDecl>(D));
-      continue;
+      m_Varied = true;
     }
 
     if (Expr* init = cast<VarDecl>(D)->getInit()) {