Add symbol table version of callCircuitOp

openqasm · Mar 12, 2024 · 1db129e · 1db129e
1 parent b0841ad
commit 1db129e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/include/Dialect/QUIR/Utils/Utils.h b/include/Dialect/QUIR/Utils/Utils.h
@@ -150,6 +150,8 @@ std::tuple<Value, MeasureOp> qubitFromMeasResult(MeasureOp measureOp,
                                                  Value result);
 std::tuple<Value, MeasureOp> qubitFromMeasResult(CallCircuitOp callCircuitOp,
                                                  Value result);
+std::tuple<Value, MeasureOp> qubitFromMeasResult(CircuitOp circuitOp,
+                                                 Value result);
 
 } // end namespace mlir::quir
 

diff --git a/lib/Dialect/QUIR/Utils/Utils.cpp b/lib/Dialect/QUIR/Utils/Utils.cpp
@@ -357,14 +357,18 @@ std::tuple<Value, MeasureOp> qubitFromMeasResult(MeasureOp measureOp,
 
 std::tuple<Value, MeasureOp> qubitFromMeasResult(CallCircuitOp callCircuitOp,
                                                  Value result) {
-  auto opRes = result.cast<OpResult>();
-  uint const resNum = opRes.getResultNumber();
-
   Operation *findOp =
       SymbolTable::lookupNearestSymbolFrom<mlir::quir::CircuitOp>(
           callCircuitOp, callCircuitOp.getCalleeAttr());
 
   auto circuitOp = dyn_cast<CircuitOp>(findOp);
+  return qubitFromMeasResult(circuitOp, result);
+}
+
+std::tuple<Value, MeasureOp> qubitFromMeasResult(CircuitOp circuitOp,
+                                                 Value result) {
+  auto opRes = result.cast<OpResult>();
+  uint const resNum = opRes.getResultNumber();
   auto returnOp = dyn_cast<quir::ReturnOp>(circuitOp.back().getTerminator());
   auto circuitResult = returnOp->getOperand(resNum).cast<OpResult>();
   auto measureOp = dyn_cast<MeasureOp>(circuitResult.getDefiningOp());