I see this made it back to trunk already, but just as an addendum, I roughly checked the overhead of the fix, using gcc (GCC) 10.1.1 20200507 (Red Hat 10.1.1-1) at -O2: | text | data | bss | dec | hex | filename | --------------------------------------------------------- | 798015 | 8448 | 1784 | 808247 | c5537 | sqlite-amalgamation-3310100-fixed.o | | 798015 | 8448 | 1784 | 808247 | c5537 | sqlite-amalgamation-3310100.o | | 802126 | 8512 | 1784 | 812422 | c6586 | sqlite-amalgamation-3320100-fixed.o | | 802126 | 8512 | 1784 | 812422 | c6586 | sqlite-amalgamation-3320100.o | It doesn't look any different with out without the workaround applied to the last pair of releases. Phew!