CI updates

src/check/dt_check.cpp

@@ -1104,11 +1104,11 @@ void upx_compiler_sanity_check(void) noexcept {
         alignas(16) static constexpr const byte dd[32] = {
             0, 0, 0, 0,    0,    0,    0,    0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9, 0xf8, 0,
             0, 0, 0, 0x7f, 0x7e, 0x7d, 0x7c, 0x7b, 0x7a, 0x79, 0x78, 0,    0,    0,    0,    0};
-        constexpr const byte *d = dd + 7;
 #if !defined(upx_fake_alignas_16)
         assert_noexcept(ptr_is_aligned<16>(dd));
         assert_noexcept(ptr_is_aligned(dd, 16));
 #endif
+        constexpr const byte *d = dd + 7;
         static_assert(upx::compile_time::get_be16(d) == 0xfffe);
         static_assert(upx::compile_time::get_be24(d) == 0xfffefd);
         static_assert(upx::compile_time::get_be32(d) == 0xfffefdfc);

src/pefile.cpp

@@ -1497,7 +1497,7 @@ void PeFile::processTls2(Reloc *const rel, const Interval *const iv, unsigned ne
                    otls + (iv->ivarr[ic].start - (tlsp->datastart - imagebase) + sizeof(tls)));
         LEXX *const p = (LEXX *) raw_bytes(pp, sizeof(LEXX));
         cb_value_t kc = *p;
-        if (kc < tlsp->dataend && kc >= tlsp->datastart) {
+        if (kc >= tlsp->datastart && kc < tlsp->dataend) {
             // add a relocation entry referring to an address inside of the original tls data area
             // - as the new tls area is moved, the referred address have to be also adjusted
             kc += newaddr + sizeof(tls) - tlsp->datastart;
@@ -1507,7 +1507,7 @@ void PeFile::processTls2(Reloc *const rel, const Interval *const iv, unsigned ne
             // add a relocation entry referring to an address outside of the original tls data area
             // by adding the difference of the new tlsdatastart and the old tlsdatastart to
             // the address of the original relocation record
-            unsigned const a =
+            const unsigned a =
                 iv->ivarr[ic].start + (newaddr + sizeof(tls)) - (tlsp->datastart - imagebase);
             // Must not overwrite compressed data
             if (a < newaddr && !opt->win32_pe.strip_relocs)