update comments, use latest and greatest methods from kirin

Author: johnzl-777

src/bloqade/analysis/measure_id/analysis.py

@@ -1,8 +1,7 @@
-from typing import TypeVar
 from dataclasses import field, dataclass
 
 from kirin import ir
-from kirin.analysis import ForwardExtra, const
+from kirin.analysis import ForwardExtra
 from kirin.analysis.forward import ForwardFrame
 
 from .lattice import MeasureId, NotMeasureId
@@ -33,22 +32,5 @@ def eval_fallback(
     ) -> tuple[MeasureId, ...]:
         return tuple(NotMeasureId() for _ in node.results)
 
-    # Xiu-zhe (Roger) Luo came up with this in the address analysis,
-    # reused here for convenience (now modified to be a bit more graceful)
-    # TODO: Remove this function once upgrade to kirin 0.18 happens,
-    #       method is built-in to interpreter then
-
-    T = TypeVar("T")
-
-    def get_const_value(
-        self, input_type: type[T] | tuple[type[T], ...], value: ir.SSAValue
-    ) -> type[T] | None:
-        if isinstance(hint := value.hints.get("const"), const.Value):
-            data = hint.data
-            if isinstance(data, input_type):
-                return hint.data
-
-        return None
-
     def method_self(self, method: ir.Method) -> MeasureId:
         return self.lattice.bottom()

src/bloqade/analysis/measure_id/impls.py

@@ -15,10 +15,6 @@
 )
 from .analysis import MeasureIDFrame, MeasurementIDAnalysis
 
-## Can't do wire right now because of
-## unresolved RFC on return type
-# from bloqade.squin import wire
-
 
 @qubit.dialect.register(key="measure_id")
 class SquinQubit(interp.MethodTable):
@@ -32,7 +28,6 @@ def measure_qubit_list(
     ):
 
         # try to get the length of the list
-        ## "...safely assume the type inference will give you what you need"
         qubits_type = stmt.qubits.type
         # vars[0] is just the type of the elements in the ilist,
         # vars[1] can contain a literal with length information
@@ -57,15 +52,12 @@ def measurement_predicate(
         stmt: qubit.stmts.IsLost | qubit.stmts.IsOne | qubit.stmts.IsZero,
     ):
         original_measure_id_tuple = frame.get(stmt.measurements)
-        # all members should be RawMeasureId, if it's anything else
-        # it's Invalid.
         if not all(
             isinstance(measure_id, RawMeasureId)
             for measure_id in original_measure_id_tuple.data
         ):
             return (InvalidMeasureId(),)
 
-        # get the proper predicate type
         if isinstance(stmt, qubit.stmts.IsLost):
             predicate = Predicate.IS_LOST
         elif isinstance(stmt, qubit.stmts.IsOne):
@@ -75,7 +67,6 @@ def measurement_predicate(
         else:
             return (InvalidMeasureId(),)
 
-        # Create new MeasureIdBools with proper predicate type
         predicate_measure_ids = [
             MeasureIdBool(measure_id.idx, predicate)
             for measure_id in original_measure_id_tuple.data
@@ -131,14 +122,10 @@ def getitem(
         self, interp: MeasurementIDAnalysis, frame: interp.Frame, stmt: py.GetItem
     ):
 
-        idx_or_slice = interp.get_const_value((int, slice), stmt.index)
+        idx_or_slice = interp.maybe_const(stmt.index, (int, slice))
         if idx_or_slice is None:
             return (InvalidMeasureId(),)
 
-        # hint = stmt.index.hints.get("const")
-        # if hint is None or not isinstance(hint, const.Value):
-        #    return (InvalidMeasureId(),)
-
         obj = frame.get(stmt.obj)
         if isinstance(obj, MeasureIdTuple):
             if isinstance(idx_or_slice, slice):