LLVM Bump

lib/Conversion/CFToHandshake/CFToHandshake.cpp

@@ -882,7 +882,7 @@ static Value getOperandFromBlock(MuxOp mux, Block *block) {
     return block == operand.getParentBlock();
   });
   assert(
-      inValueIt != mux.getOperands().end() &&
+      inValueIt != mux.getDataOperands().end() &&
       "Expected mux to have an operand originating from the requested block.");
   return *inValueIt;
 }

lib/Dialect/Arc/Transforms/Dedup.cpp

@@ -396,8 +396,8 @@ void DedupPass::runOnOperation() {
 
   // Collect the arc call sites.
   getOperation().walk([&](mlir::CallOpInterface callOp) {
-    if (auto defOp =
-            dyn_cast_or_null<DefineOp>(callOp.resolveCallable(&symbolTable)))
+    if (auto defOp = dyn_cast_or_null<DefineOp>(
+            callOp.resolveCallableInTable(&symbolTable)))
       callSites[defOp].insert(callOp);
   });
 
@@ -732,8 +732,8 @@ void DedupPass::replaceArcWith(DefineOp oldArc, DefineOp newArc,
   }
 
   oldArc.walk([&](mlir::CallOpInterface callOp) {
-    if (auto defOp =
-            dyn_cast_or_null<DefineOp>(callOp.resolveCallable(&symbolTable)))
+    if (auto defOp = dyn_cast_or_null<DefineOp>(
+            callOp.resolveCallableInTable(&symbolTable)))
       callSites[defOp].remove(callOp);
   });
   callSites.erase(oldArc);

lib/Dialect/Arc/Transforms/InferStateProperties.cpp

@@ -396,7 +396,7 @@ void InferStatePropertiesPass::runOnOperation() {
   getOperation()->walk([&](arc::StateOp stateOp) {
     auto arc =
         cast<arc::DefineOp>(cast<mlir::CallOpInterface>(stateOp.getOperation())
-                                .resolveCallable(&symbolTable));
+                                .resolveCallableInTable(&symbolTable));
     runOnStateOp(stateOp, arc, resetConditionMap);
   });
 }

lib/Dialect/Arc/Transforms/LegalizeStateUpdate.cpp

@@ -159,7 +159,7 @@ LogicalResult AccessAnalysis::analyze(Operation *op) {
 
     // Track the relationship between callers and callees.
     if (auto callOp = dyn_cast<CallOpInterface>(opNode.op))
-      if (auto *calleeOp = callOp.resolveCallable(&symbolTable))
+      if (auto *calleeOp = callOp.resolveCallableInTable(&symbolTable))
         get(calleeOp).callers.insert(&opNode);
 
     // Create the seed accesses.