3 files changed, 5 insertions, 5 deletions
diff --git a/mlir/lib/Analysis/AffineAnalysis.cpp b/mlir/lib/Analysis/AffineAnalysis.cpp
index 0a2b283738c..2323cb3ef71 100644
--- a/mlir/lib/Analysis/AffineAnalysis.cpp
+++ b/mlir/lib/Analysis/AffineAnalysis.cpp
@@ -681,7 +681,7 @@ static void buildDimAndSymbolPositionMaps(
     for (unsigned i = 0, e = values.size(); i < e; ++i) {
       auto *value = values[i];
       if (!isForInductionVar(values[i])) {
-        assert(values[i]->isValidSymbol() &&
+        assert(isValidSymbol(values[i]) &&
                "access operand has to be either a loop IV or a symbol");
         valuePosMap->addSymbolValue(value);
       } else if (isSrc) {
@@ -743,7 +743,7 @@ void initDependenceConstraints(const FlatAffineConstraints &srcDomain,
   auto setSymbolIds = [&](ArrayRef<Value *> values) {
     for (auto *value : values) {
       if (!isForInductionVar(value)) {
-        assert(value->isValidSymbol() && "expected symbol");
+        assert(isValidSymbol(value) && "expected symbol");
         dependenceConstraints->setIdValue(valuePosMap.getSymPos(value), value);
       }
     }
@@ -913,7 +913,7 @@ addMemRefAccessConstraints(const AffineValueMap &srcAccessMap,
       if (isForInductionVar(operands[i]))
         continue;
       auto *symbol = operands[i];
-      assert(symbol->isValidSymbol());
+      assert(isValidSymbol(symbol));
       // Check if the symbol is a constant.
       if (auto *opInst = symbol->getDefiningInst()) {
         if (auto constOp = opInst->dyn_cast<ConstantIndexOp>()) {
diff --git a/mlir/lib/Analysis/AffineStructures.cpp b/mlir/lib/Analysis/AffineStructures.cpp
index 468e79b8545..b764d69c298 100644
--- a/mlir/lib/Analysis/AffineStructures.cpp
+++ b/mlir/lib/Analysis/AffineStructures.cpp
@@ -1268,7 +1268,7 @@ bool FlatAffineConstraints::addAffineForOpDomain(
     for (const auto &operand : operands) {
       unsigned loc;
       if (!findId(*operand, &loc)) {
-        if (operand->isValidSymbol()) {
+        if (isValidSymbol(operand)) {
           addSymbolId(getNumSymbolIds(), const_cast<Value *>(operand));
           loc = getNumDimIds() + getNumSymbolIds() - 1;
           // Check if the symbol is a constant.
diff --git a/mlir/lib/Analysis/Utils.cpp b/mlir/lib/Analysis/Utils.cpp
index d27715333c8..9f5fd65e774 100644
--- a/mlir/lib/Analysis/Utils.cpp
+++ b/mlir/lib/Analysis/Utils.cpp
@@ -168,7 +168,7 @@ bool MemRefRegion::compute(Instruction *inst, unsigned loopDepth) {
     } else {
       // Has to be a valid symbol.
       auto *symbol = accessValueMap.getOperand(i);
-      assert(symbol->isValidSymbol());
+      assert(isValidSymbol(symbol));
       // Check if the symbol is a constant.
       if (auto *inst = symbol->getDefiningInst()) {
         if (auto constOp = inst->dyn_cast<ConstantIndexOp>()) {