Skip to content

Commit 64e8ef3

Browse files
Bitwuzla: Update to Bitwuzla version 0.7.0 and fix an issue in the SWIG headers where some exceptions were not properly caught
1 parent 00298dc commit 64e8ef3

File tree

6 files changed

+209
-177
lines changed

6 files changed

+209
-177
lines changed

lib/ivy.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ SPDX-License-Identifier: Apache-2.0
174174
<dependency org="org.sosy_lab" name="javasmt-solver-cvc4" rev="1.8-prerelease-2020-06-24-g7825d8f28" conf="runtime-cvc4->solver-cvc4" />
175175
<dependency org="org.sosy_lab" name="javasmt-solver-cvc5" rev="1.0.5-g4cb2ab9eb" conf="runtime-cvc5->solver-cvc5" />
176176
<dependency org="org.sosy_lab" name="javasmt-solver-boolector" rev="3.2.2-g1a89c229" conf="runtime-boolector->solver-boolector" />
177-
<dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.6.0-g2b3d69a7" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
177+
<dependency org="org.sosy_lab" name="javasmt-solver-bitwuzla" rev="0.7.0-gb48e722b" conf="runtime-bitwuzla->solver-bitwuzla; contrib->sources,javadoc"/>
178178

179179
<!-- additional JavaSMT components with Solver Binaries -->
180180
<dependency org="org.sosy_lab" name="javasmt-yices2" rev="4.1.1-734-g3732f7e08" conf="runtime-yices2->runtime; contrib->sources" />

lib/native/source/libbitwuzla/bitwuzla.i

+4-11
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
%exception {
3636
try {
3737
$action
38-
} catch(bitwuzla::Exception& e) {
38+
} catch(std::exception& e) {
3939
jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
4040
jenv->ThrowNew(exceptionType, e.what());
4141
return $null;
@@ -51,9 +51,12 @@ namespace std {
5151
%include "include/bitwuzla/enums.h"
5252
%include "include/bitwuzla/option.h"
5353

54+
%ignore bitwuzla::option::Exception;
55+
5456
namespace bitwuzla {
5557
/** Output streams */
5658
%ignore set_bv_format;
59+
%ignore set_letify;
5760
%ignore operator<< (std::ostream &ostream, const set_bv_format &f);
5861
%ignore operator<< (std::ostream &out, Result result);
5962
%ignore operator<< (std::ostream &out, Kind kind);
@@ -312,16 +315,6 @@ namespace bitwuzla::parser {
312315
%ignore Parser::configure_auto_print_model(bool value);
313316
%ignore Parser::parse(const std::string &infile_name, std::istream &input, bool parse_only=false);
314317

315-
%exception {
316-
try {
317-
$action
318-
} catch(Exception& e) {
319-
jclass exceptionType = jenv->FindClass("java/lang/IllegalArgumentException");
320-
jenv->ThrowNew(exceptionType, e.what());
321-
return $null;
322-
}
323-
}
324-
325318
/** Exception */
326319
%ignore Exception;
327320
}

0 commit comments

Comments
 (0)