Fix detecting scalar accesses in binary operator statements

BoiseState-AdaptLab · Nov 25, 2021 · 63b493d · 63b493d
1 parent 72eebb5
commit 63b493d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/ComputationBuilder.cpp b/src/ComputationBuilder.cpp
@@ -167,10 +167,7 @@ void ComputationBuilder::addStmt(clang::Stmt *clangStmt) {
       dataAccesses.processWriteToScalarName(varName);
     }
   } else if (auto *asBinOper = dyn_cast<BinaryOperator>(clangStmt)) {
-    if (auto *lhsAsArrayAccess =
-        dyn_cast<ArraySubscriptExpr>(asBinOper->getLHS())) {
-      dataAccesses.processExprAsWrite(lhsAsArrayAccess);
-    }
+    dataAccesses.processExprAsWrite(asBinOper->getLHS());
     if (asBinOper->isCompoundAssignmentOp()) {
       dataAccesses.processComplexExprAsReads(asBinOper->getLHS());
     }

diff --git a/src/DataAccessHandler.cpp b/src/DataAccessHandler.cpp
@@ -100,10 +100,11 @@ std::vector<DataAccess> DataAccessHandler::makeDataAccessesFromExpr(
   if (auto *asArraySubscriptExpr =
       dyn_cast<ArraySubscriptExpr>(fullExpr)) {
     doBuildArrayAccessWork(asArraySubscriptExpr, isRead, accesses);
-  } else {
-    std::string varName = Utils::stmtToString(fullExpr);
+  } else if (auto *asDeclRefExpr = dyn_cast<DeclRefExpr>(fullExpr)) {
+    std::string varName = Utils::stmtToString(asDeclRefExpr);
     if (!ComputationBuilder::positionContext->isIteratorName(varName)) {
-      accesses.emplace_back(DataAccess(varName, fullExpr->getID(*Context), isRead, false, {}));
+      accesses.emplace_back(
+          DataAccess(varName, asDeclRefExpr->getID(*Context), isRead, false, {}));
     }
   }
   return accesses;