Merge branch 'koriakin/xc7nocarrymux' into xaig

[yosys.git] / kernel / consteval.h

diff --git a/kernel/consteval.h b/kernel/consteval.h
index 0229f5045419abcbc42ae77bb22007605b17782a..154373a8deeef29bb2223ae6029d4ffeb167a31c 100644 (file)
--- a/kernel/consteval.h
+++ b/kernel/consteval.h
@@ -321,8 +321,13 @@ struct ConstEval
                        if (sig_d.size() > 0 && !eval(sig_d, undef, cell))
                                return false;
 
-                       set(sig_y, CellTypes::eval(cell, sig_a.as_const(), sig_b.as_const(),
-                                       sig_c.as_const(), sig_d.as_const()));
+                       bool eval_err = false;
+                       RTLIL::Const eval_ret = CellTypes::eval(cell, sig_a.as_const(), sig_b.as_const(), sig_c.as_const(), sig_d.as_const(), &eval_err);
+
+                       if (eval_err)
+                               return false;
+
+                       set(sig_y, eval_ret);
                }
 
                return true;