From: Matt Corallo Date: Thu, 28 Jan 2021 04:33:34 +0000 (-0500) Subject: Turn on warnings on typescript builds again X-Git-Tag: v0.0.1~29 X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=4e1ce4212f94b6fa397ce295851fffdc17242f59;p=ldk-java Turn on warnings on typescript builds again --- diff --git a/genbindings.sh b/genbindings.sh index 5b2c5b9e..7c29c81d 100755 --- a/genbindings.sh +++ b/genbindings.sh @@ -8,9 +8,7 @@ usage() { [ "$1" = "" -o "$2" = "" ] && usage [ "$3" != "true" -a "$3" != "false" ] && usage -# TODO: Merge the two once TS builds warning-free -COMMON_COMPILE="clang -std=c11 -Wno-nullability-completeness -Wno-pointer-sign" -COMPILE_WARNS="-Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-unused-function" +COMMON_COMPILE="clang -std=c11 -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-unused-function -Wno-nullability-completeness -Wno-pointer-sign" set -e @@ -23,7 +21,7 @@ javac -h src/main/jni src/main/java/org/ldk/enums/*.java src/main/java/org/ldk/i rm src/main/java/org/ldk/enums/*.class src/main/java/org/ldk/impl/bindings*.class echo "Building Java bindings..." -COMPILE="$COMMON_COMPILE $COMPILE_WARNS -Isrc/main/jni -pthread -ldl -Wl,--no-undefined -o liblightningjni.so -shared -fPIC" +COMPILE="$COMMON_COMPILE -Isrc/main/jni -pthread -ldl -Wl,--no-undefined -o liblightningjni.so -shared -fPIC" if [ "$3" = "true" ]; then $COMPILE -g -fsanitize=address -shared-libasan -Wl,-wrap,calloc -Wl,-wrap,realloc -Wl,-wrap,reallocarray -Wl,-wrap,malloc -Wl,-wrap,free -rdynamic -I"$1"/lightning-c-bindings/include/ $2 src/main/jni/bindings.c "$1"/lightning-c-bindings/target/debug/libldk.a else @@ -36,11 +34,12 @@ rm -f ts/{enums,structs}/*.ts ./genbindings.py "$1/lightning-c-bindings/include/lightning.h" ts/bindings.ts ts ts/bindings.c $3 typescript echo "Building TS bindings..." -COMPILE="$COMMON_COMPILE -flto -Wl,--no-entry -Wl,--export-dynamic -nostdlib --target=wasm32-unknown-unknown -o liblightningjs.wasm" +COMPILE="$COMMON_COMPILE -flto -Wl,--no-entry -Wl,--export-dynamic -Wl,-allow-undefined -nostdlib --target=wasm32-wasi -o liblightningjs.wasm" # We only need malloc and assert/abort, but for now just use WASI for those: -EXTRA_LINK=/usr/lib/wasm32-wasi/libc.a +#EXTRA_LINK=/usr/lib/wasm32-wasi/libc.a +EXTRA_LINK= if [ "$3" = "true" ]; then - $COMPILE -g -Wl,-wrap,calloc -Wl,-wrap,realloc -Wl,-wrap,reallocarray -Wl,-wrap,malloc -Wl,-wrap,free -I"$1"/lightning-c-bindings/include/ ts/bindings.c "$1"/lightning-c-bindings/target/wasm32-unknown-unknown/debug/libldk.a $EXTRA_LINK + $COMPILE -g -Wl,-wrap,calloc -Wl,-wrap,realloc -Wl,-wrap,reallocarray -Wl,-wrap,malloc -Wl,-wrap,free -I"$1"/lightning-c-bindings/include/ ts/bindings.c "$1"/lightning-c-bindings/target/wasm32-wasi/debug/libldk.a $EXTRA_LINK else - $COMPILE -s -Os -I"$1"/lightning-c-bindings/include/ ts/bindings.c "$1"/lightning-c-bindings/target/wasm32-unknown-unknown/release/libldk.a $EXTRA_LINK + $COMPILE -s -Os -I"$1"/lightning-c-bindings/include/ ts/bindings.c "$1"/lightning-c-bindings/target/wasm32-wasi/release/libldk.a $EXTRA_LINK fi diff --git a/typescript_strings.py b/typescript_strings.py index 620d9d1c..b5fcdc96 100644 --- a/typescript_strings.py +++ b/typescript_strings.py @@ -105,7 +105,9 @@ void *memcpy(void *dest, const void *src, size_t n); int memcmp(const void *s1, const void *s2, size_t n); void __attribute__((noreturn)) abort(void); -void assert(bool expression); +static inline void assert(bool expression) { + if (!expression) { abort(); } +} """ if not DEBUG: @@ -302,7 +304,7 @@ import * as bindings from '../bindings' // TODO: figure out location return "str_ref_to_ts(" + var_name + ", " + str_len + ")" def c_fn_name_define_pfx(self, fn_name, have_args): - return "TS_" + fn_name + "(" + return " __attribute__((visibility(\"default\"))) TS_" + fn_name + "(" def wasm_import_header(self, target): if target == Target.NODEJS: @@ -682,7 +684,7 @@ const decodeString = (stringPointer, free = true) => { elif not fn_line.ret_ty_info.passed_as_ptr: out_c = out_c + "\treturn js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth" else: - out_c = out_c + "\t" + fn_line.ret_ty_info.rust_obj + "* ret; // TODO: Call " + fn_line.fn_name + " on j_calls with instance obj, returning a pointer" + out_c = out_c + "\t" + fn_line.ret_ty_info.rust_obj + "* ret = (" + fn_line.ret_ty_info.rust_obj + "*)js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth" for idx, arg_info in enumerate(fn_line.args_ty): if arg_info.ret_conv is not None: @@ -751,7 +753,7 @@ const decodeString = (stringPointer, free = true) => { out_c = out_c + "\treturn ret;\n" out_c = out_c + "}\n" - out_c = out_c + self.c_fn_ty_pfx + "long TS_" + struct_name + "_new (/*TODO: JS Object Reference */void* o" + out_c = out_c + self.c_fn_ty_pfx + "long " + self.c_fn_name_define_pfx(struct_name + "_new", True) + "/*TODO: JS Object Reference */void* o" for var in field_var_conversions: if isinstance(var, ConvInfo): out_c = out_c + ", " + var.c_ty + " " + var.arg_name @@ -829,7 +831,7 @@ const decodeString = (stringPointer, free = true) => { out_java += ("\tstatic { " + struct_name + ".init(); }\n") out_java += ("\tpublic static native " + struct_name + " " + struct_name + "_ref_from_ptr(long ptr);\n"); - out_c += (self.c_fn_ty_pfx + self.c_complex_enum_pass_ty(struct_name) + " TS_" + struct_name + "_ref_from_ptr (" + self.ptr_c_ty + " ptr) {\n") + out_c += (self.c_fn_ty_pfx + self.c_complex_enum_pass_ty(struct_name) + self.c_fn_name_define_pfx(struct_name + "_ref_from_ptr", True) + self.ptr_c_ty + " ptr) {\n") out_c += ("\t" + struct_name + " *obj = (" + struct_name + "*)ptr;\n") out_c += ("\tswitch(obj->tag) {\n") for var in variant_list: @@ -893,7 +895,7 @@ const decodeString = (stringPointer, free = true) => { if return_type_info.ret_conv is not None: ret_conv_pfx, ret_conv_sfx = return_type_info.ret_conv out_java += (" " + method_name + "(") - out_c += (" TS_" + method_name + "(") + out_c += (" " + self.c_fn_name_define_pfx(method_name, True)) method_argument_string = "" native_call_argument_string = ""