control: tags -1 = patch
On 2020-11-01 15:59:19 [+0500], Lev Lamberov wrote:
> Hi,
Hi,
> there is a regression on 32-bits architectures [regression]. It should
> be fixed upstream (in b218a30b5e4bb92ddd399238666448a102117bad), but the
> fix is not tested yet. And currently I'm running low on time, so it
> would be nice if someone could at least test the fix, prepare fixed
> package for upload, or even upload NMU (in this case, please, also push
> your changes to the Salsa repository).
I applied the patch, built i386 and can confirm that the patch you
mentioned did solve the problem by running debian/tests/runtests.
I'm attaching the NMU.
Feel free to either grab the needed pieces or telling to NMU it.
> Cheers!
> Lev
>
Sebastian
diff -Nru swi-prolog-8.2.2+dfsg/debian/changelog swi-prolog-8.2.2+dfsg/debian/changelog
--- swi-prolog-8.2.2+dfsg/debian/changelog 2020-10-29 08:28:15.000000000 +0100
+++ swi-prolog-8.2.2+dfsg/debian/changelog 2020-11-03 21:49:43.000000000 +0100
@@ -1,3 +1,11 @@
+swi-prolog (8.2.2+dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Apply a patch from upstream to address a regression on 32bit architectures
+ (Closes: #973527).
+
+ -- Sebastian Andrzej Siewior <sebast...@breakpoint.cc> Tue, 03 Nov 2020 21:49:43 +0100
+
swi-prolog (8.2.2+dfsg-1) unstable; urgency=medium
[ Debian Janitor ]
diff -Nru swi-prolog-8.2.2+dfsg/debian/patches/b218a30b5e4bb92ddd399238666448a102117bad.patch swi-prolog-8.2.2+dfsg/debian/patches/b218a30b5e4bb92ddd399238666448a102117bad.patch
--- swi-prolog-8.2.2+dfsg/debian/patches/b218a30b5e4bb92ddd399238666448a102117bad.patch 1970-01-01 01:00:00.000000000 +0100
+++ swi-prolog-8.2.2+dfsg/debian/patches/b218a30b5e4bb92ddd399238666448a102117bad.patch 2020-11-03 21:37:52.000000000 +0100
@@ -0,0 +1,34 @@
+From b218a30b5e4bb92ddd399238666448a102117bad Mon Sep 17 00:00:00 2001
+From: Jan Wielemaker <j.wielema...@vu.nl>
+Date: Sat, 31 Oct 2020 16:51:28 +0100
+Subject: [PATCH] FIXED: Possible assertion failure in WFS handling for tabling
+ on 32-bit hardware. Lev Lamberov.
+
+---
+ src/pl-tabling.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/pl-tabling.c b/src/pl-tabling.c
+index ddfc589f04..7d7381acc3 100644
+--- a/src/pl-tabling.c
++++ b/src/pl-tabling.c
+@@ -1140,8 +1140,18 @@ update_delay_list(worklist *wl, trie_node *answer,
+ }
+ deRef2(&f->arguments[1], p);
+ if ( isInteger(*p) )
+- { assert(isTaggedInt(*p));
++ {
++#if SIZEOF_VOIDP == 8
++ assert(isTaggedInt(*p));
+ an = intToPointer(valInt(*p));
++#else
++ if ( isTaggedInt(*p) )
++ { an = intToPointer(valInt(*p));
++ } else
++ { assert(isBignum(*p));
++ an = intToPointer(valBignum(*p));
++ }
++#endif
+ assert(is_ground_trie_node(an));
+ } else
+ { int rc;
diff -Nru swi-prolog-8.2.2+dfsg/debian/patches/series swi-prolog-8.2.2+dfsg/debian/patches/series
--- swi-prolog-8.2.2+dfsg/debian/patches/series 2020-10-29 08:28:15.000000000 +0100
+++ swi-prolog-8.2.2+dfsg/debian/patches/series 2020-11-03 21:38:00.000000000 +0100
@@ -1,3 +1,4 @@
use-local-jquery.diff
no_extra_documentation.diff
disable_http_proxy_test.diff
+b218a30b5e4bb92ddd399238666448a102117bad.patch
