Preserve aggregate state through SCF

changelogs/unreleased/codex__circom-analysis-2-aggregate-storage.yaml

@@ -0,0 +1,2 @@
+fixed:
+  - Preserve SourceRef storage identities while exposing initialized, written, and rebased values through explicit dependency queries

changelogs/unreleased/codex__circom-analysis-3-scf-aggregates.yaml

@@ -0,0 +1,2 @@
+fixed:
+  - Preserve array and POD SourceRef state through SCF loops and resultless aggregate writes

include/llzk/Analysis/ConstraintDependencyGraph.h

@@ -41,7 +41,15 @@ class SourceRefAnalysis : public dataflow::SparseForwardDataFlowAnalysis<SourceR
   using Base::SparseForwardDataFlowAnalysis;
 
   static const Lattice *getLattice(mlir::DataFlowSolver &solver, mlir::Value val);
+
+  /// Return the storage references represented by `val` without replacing them with values
+  /// written to those locations.
   static SourceRefLatticeValue getValueState(mlir::DataFlowSolver &solver, mlir::Value val);
+
+  /// Return the logical dependencies of `val` by following known storage writes transitively.
+  /// Unwritten storage remains represented by its address.
+  static SourceRefLatticeValue getDependencyState(mlir::DataFlowSolver &solver, mlir::Value val);
+
   static mlir::FailureOr<SourceRefLatticeValue>
   getWriteTargetState(mlir::DataFlowSolver &solver, mlir::Operation *op);
 
@@ -68,10 +76,15 @@ class SourceRefAnalysis : public dataflow::SparseForwardDataFlowAnalysis<SourceR
   // Create the references for either an array.read op or an array.extract op, which
   // operate very similarly: index into the first operand using a variable number
   // of provided indices.
-  static SourceRefLatticeValue
-  arraySubdivisionOpUpdate(array::ArrayAccessOpInterface op, const OperandValues &operandVals);
+  static SourceRefLatticeValue arraySubdivisionOpUpdate(
+      array::ArrayAccessOpInterface op, const OperandValues &operandVals,
+      std::vector<SourceRefIndex> *resolvedIndices = nullptr
+  );
 
 private:
+  class StorageState;
+  StorageState *getStorageState(mlir::Operation *op);
+
   mlir::SymbolTableCollection tables;
 };
 

include/llzk/Analysis/SourceRef.h

@@ -243,6 +243,8 @@ class SourceRef {
   bool isTemplateConstant() const {
     return isConstant() && llvm::isa_and_present<polymorphic::ConstReadOp>(value.getDefiningOp());
   }
+  /// Return whether this reference originates from a read of an immutable global.
+  bool isImmutableGlobal() const;
 
   bool isConstant() const { return constant; }
   bool isConstantInt() const { return isConstantFelt() || isConstantIndex(); }