diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2014-10-02 17:57:25 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2014-10-02 17:57:25 -0400 |
| commit | 96bbad88330fd942895dfb65a7947edfe77a85b7 (patch) | |
| tree | fee6814d111097672a1f97338dd172634bec88fc | |
| parent | b3c760042dc743bea1620662aed5310121fc4bd0 (diff) | |
| parent | c9e861d2a6964633d12448966e979299c8793466 (diff) | |
Merge branch '1.4.x'.
| -rw-r--r-- | src/smt/smt_engine.cpp | 2 | ||||
| -rw-r--r-- | src/util/array_store_all.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp index 7f9658ba0..015e6a4f4 100644 --- a/src/smt/smt_engine.cpp +++ b/src/smt/smt_engine.cpp @@ -4125,8 +4125,6 @@ void SmtEngine::pop() throw(ModalException) { << d_userContext->getLevel() << endl; // FIXME: should we reset d_status here? // SMT-LIBv2 spec seems to imply no, but it would make sense to.. - // Still, we want the right exit status after any final sequence - // of pops... hm. } void SmtEngine::internalPush() { diff --git a/src/util/array_store_all.h b/src/util/array_store_all.h index bccefdd58..b1d624266 100644 --- a/src/util/array_store_all.h +++ b/src/util/array_store_all.h @@ -46,7 +46,7 @@ public: // because this check is done in production builds too CheckArgument(type.isArray(), type, "array store-all constants can only be created for array types, not `%s'", type.toString().c_str()); - CheckArgument(expr.getType().isSubtypeOf(type.getConstituentType()), expr, "expr type `%s' does not match constituent type of array type `%s'", expr.getType().toString().c_str(), type.toString().c_str()); + CheckArgument(expr.getType().isComparableTo(type.getConstituentType()), expr, "expr type `%s' does not match constituent type of array type `%s'", expr.getType().toString().c_str(), type.toString().c_str()); CheckArgument(expr.isConst(), expr, "ArrayStoreAll requires a constant expression"); } |