Fix calling Java/TS methods that return strings

[ldk-java] / genbindings.sh

diff --git a/genbindings.sh b/genbindings.sh
index 15a574da38f59f2f9ed4c7ebb04c070688637fc7..7e5588fa21058f891cc245b46863000e4b272e2f 100755 (executable)
--- a/genbindings.sh
+++ b/genbindings.sh
@@ -49,13 +49,19 @@ set -e
 if [ "$LDK_GARBAGECOLLECTED_GIT_OVERRIDE" = "" ]; then
        export LDK_GARBAGECOLLECTED_GIT_OVERRIDE=$(git describe --tag --dirty)
 fi
+if [ "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:0:1}" != "v" ]; then
+       echo "Version tag should start with a v" > /dev/stderr
+       exit 1
+fi
 
 cp "$1/lightning-c-bindings/include/lightning.h" ./
 if [ "$(rustc --version --verbose | grep "host:")" = "host: x86_64-apple-darwin" ]; then
        # OSX sed is for some reason not compatible with GNU sed
        sed -i '' "s/TransactionOutputs/C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ/g" ./lightning.h
+       sed -i '' "s/^    <version>.*<\/version>/    <version>${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}<\/version>/g" pom.xml
 else
        sed -i "s/TransactionOutputs/C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ/g" ./lightning.h
+       sed -i "s/^    <version>.*<\/version>/    <version>${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}<\/version>/g" pom.xml
 fi
 
 echo "Creating Java bindings..."
@@ -85,15 +91,15 @@ if [ "$3" = "true" ]; then
        $COMPILE -o liblightningjni_debug$LDK_TARGET_SUFFIX.so -g -fsanitize=address -shared-libasan -rdynamic -I"$1"/lightning-c-bindings/include/ $2 src/main/jni/bindings.c "$1"/lightning-c-bindings/target/$LDK_TARGET/debug/libldk.a -lm
 else
        LDK_LIB="$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a
-       if [ "$IS_MAC" = "false" ]; then
+       if [ "$IS_MAC" = "false" -a "$4" = "false" ]; then
                COMPILE="$COMPILE -Wl,--version-script=libcode.version -fuse-ld=lld"
-               echo "// __cxa_thread_atexit_impl is used to more effeciently cleanup per-thread local storage by rust libstd." >> src/main/jni/bindings.c
-               echo "// However, it is not available on glibc versions 2.17 or earlier, and rust libstd has a null-check and fallback in case it is missing." >> src/main/jni/bindings.c
-               echo "// Because it is weak-linked on the rust side, we should be able to simply define it explicitly here, forcing rust to use the fallback." >> src/main/jni/bindings.c
-               echo "void *__cxa_thread_atexit_impl = NULL;" >> src/main/jni/bindings.c
-               # Note that the above is not sufficient. For some reason involving ancient dark magic and
-               # haunted code segments, overriding the weak symbol only impacts sites which *call* the
-               # symbol in question, not sites which *compare with* the symbol in question.
+               # __cxa_thread_atexit_impl is used to more effeciently cleanup per-thread local storage by rust libstd.
+               # However, it is not available on glibc versions 2.17 or earlier, and rust libstd has a null-check and
+               # fallback in case it is missing.
+               # Because it is weak-linked on the rust side, we should be able to simply define it
+               # explicitly, forcing rust to use the fallback. However, for some reason involving ancient
+               # dark magic and haunted code segments, overriding the weak symbol only impacts sites which
+               # *call* the symbol in question, not sites which *compare with* the symbol in question.
                # This means that the NULL check in rust's libstd will always think the function is
                # callable while the function which is called ends up being NULL (leading to a jmp to the
                # zero page and a quick SEGFAULT).
@@ -104,6 +110,9 @@ else
                # After exhausting nearly every flag documented in lld, the only reliable method appears
                # to be editing the LDK binary. Luckily, LLVM's tooling makes this rather easy as we can
                # disassemble it into very readable code, edit it, and then reassemble it.
+               # Note that if we do so we don't have to bother overriding the actual call, LLVM should
+               # optimize it away, which also provides a good check that there isn't anything actually
+               # relying on it elsewhere.
                [ ! -f "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a ] && exit 1
                if [ "$(ar t "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a | grep -v "\.o$" || echo)" != "" ]; then
                        echo "Archive contained non-object files!"
@@ -125,7 +134,7 @@ else
                LDK_LIB="tmp/libldk.bc tmp/libldk.a"
        fi
        $COMPILE -o liblightningjni_release$LDK_TARGET_SUFFIX.so -flto -O3 -I"$1"/lightning-c-bindings/include/ $2 src/main/jni/bindings.c $LDK_LIB
-       if [ "$IS_MAC" = "false" ]; then
+       if [ "$IS_MAC" = "false" -a "$4" = "false" ]; then
                GLIBC_SYMBS="$(objdump -T liblightningjni_release$LDK_TARGET_SUFFIX.so | grep GLIBC_ | grep -v "GLIBC_2\.2\." | grep -v "GLIBC_2\.3\(\.\| \)" | grep -v "GLIBC_2.\(14\|17\) " || echo)"
                if [ "$GLIBC_SYMBS" != "" ]; then
                        echo "Unexpected glibc version dependency! Some users need glibc 2.17 support, symbols for newer glibcs cannot be included."