restore eval's skip-terminator behavior; bibc decoder adds expected R…

…eturnOp
risc0 · Oct 28, 2024 · d5c8dee · d5c8dee
1 parent 4a22c97
commit d5c8dee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/zirgen/Dialect/BigInt/Bytecode/decode.cpp b/zirgen/Dialect/BigInt/Bytecode/decode.cpp
@@ -149,6 +149,8 @@ mlir::func::FuncOp decode(mlir::ModuleOp module, const Program& prog) {
     }
   }
 
+  // Add terminator op, for the sake of propriety.
+  builder.create<mlir::func::ReturnOp>(loc);
   return out;
 }
 

diff --git a/zirgen/Dialect/BigInt/IR/Eval.cpp b/zirgen/Dialect/BigInt/IR/Eval.cpp
@@ -188,7 +188,7 @@ EvalOutput eval(func::FuncOp inFunc, ArrayRef<APInt> witnessValues) {
 
   llvm::DenseMap<Value, BytePoly> polys;
 
-  for (Operation& origOp : inFunc.getBody().front()) {
+  for (Operation& origOp : inFunc.getBody().front().without_terminator()) {
     llvm::TypeSwitch<Operation*>(&origOp)
         .Case<DefOp>([&](auto op) {
           APInt val = witnessValues[op.getLabel()];
-Original file line number
+Diff line change
@@ Expand Up @@
         }
       }
+      // Add terminator op, for the sake of propriety.
+      builder.create<mlir::func::ReturnOp>(loc);
       return out;
     }
@@ Expand Down @@