GH-120507: Lower the BEFORE_WITH and BEFORE_ASYNC_WITH instructions.

[markshannon]

Removes the BEFORE_WITH and BEFORE_ASYNC_WITH instructions, adding the new LOAD_SPECIAL instruction.

BEFORE_WITH becomes

 COPY 1 LOAD_SPECIAL 1 SWAP 2 SWAP 3 LOAD_SPECIAL 0 CALL 0 

which may seem rather a lot, but it is much more amenable to optimization.

Negligible performance impact

• Issue: Lower BEFORE_WITH and BEFORE_ASYNC_WITH to attribute lookups and calls. #120507

[Fidget-Spinner]

Optimizer changes LGTM.

[markshannon]

The four JIT/aarach64 failures are a known issue.

[bedevere-bot]

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot wasm32-wasi 3.x has failed when building commit 9cefcc0.

What do you need to do:

1. Don't panic.
2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
3. Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/1046/builds/5457) and take a look at the build logs.
4. Check if the failure is related to this commit (9cefcc0) or if it is a false positive.
5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/1046/builds/5457

Failed tests:

• test_email

Summary of the results of the build (if available):

==

Click to see traceback logs

remote: Enumerating objects: 74, done. remote: Counting objects: 1% (1/74) remote: Counting objects: 2% (2/74) remote: Counting objects: 4% (3/74) remote: Counting objects: 5% (4/74) remote: Counting objects: 6% (5/74) remote: Counting objects: 8% (6/74) remote: Counting objects: 9% (7/74) remote: Counting objects: 10% (8/74) remote: Counting objects: 12% (9/74) remote: Counting objects: 13% (10/74) remote: Counting objects: 14% (11/74) remote: Counting objects: 16% (12/74) remote: Counting objects: 17% (13/74) remote: Counting objects: 18% (14/74) remote: Counting objects: 20% (15/74) remote: Counting objects: 21% (16/74) remote: Counting objects: 22% (17/74) remote: Counting objects: 24% (18/74) remote: Counting objects: 25% (19/74) remote: Counting objects: 27% (20/74) remote: Counting objects: 28% (21/74) remote: Counting objects: 29% (22/74) remote: Counting objects: 31% (23/74) remote: Counting objects: 32% (24/74) remote: Counting objects: 33% (25/74) remote: Counting objects: 35% (26/74) remote: Counting objects: 36% (27/74) remote: Counting objects: 37% (28/74) remote: Counting objects: 39% (29/74) remote: Counting objects: 40% (30/74) remote: Counting objects: 41% (31/74) remote: Counting objects: 43% (32/74) remote: Counting objects: 44% (33/74) remote: Counting objects: 45% (34/74) remote: Counting objects: 47% (35/74) remote: Counting objects: 48% (36/74) remote: Counting objects: 50% (37/74) remote: Counting objects: 51% (38/74) remote: Counting objects: 52% (39/74) remote: Counting objects: 54% (40/74) remote: Counting objects: 55% (41/74) remote: Counting objects: 56% (42/74) remote: Counting objects: 58% (43/74) remote: Counting objects: 59% (44/74) remote: Counting objects: 60% (45/74) remote: Counting objects: 62% (46/74) remote: Counting objects: 63% (47/74) remote: Counting objects: 64% (48/74) remote: Counting objects: 66% (49/74) remote: Counting objects: 67% (50/74) remote: Counting objects: 68% (51/74) remote: Counting objects: 70% (52/74) remote: Counting objects: 71% (53/74) remote: Counting objects: 72% (54/74) remote: Counting objects: 74% (55/74) remote: Counting objects: 75% (56/74) remote: Counting objects: 77% (57/74) remote: Counting objects: 78% (58/74) remote: Counting objects: 79% (59/74) remote: Counting objects: 81% (60/74) remote: Counting objects: 82% (61/74) remote: Counting objects: 83% (62/74) remote: Counting objects: 85% (63/74) remote: Counting objects: 86% (64/74) remote: Counting objects: 87% (65/74) remote: Counting objects: 89% (66/74) remote: Counting objects: 90% (67/74) remote: Counting objects: 91% (68/74) remote: Counting objects: 93% (69/74) remote: Counting objects: 94% (70/74) remote: Counting objects: 95% (71/74) remote: Counting objects: 97% (72/74) remote: Counting objects: 98% (73/74) remote: Counting objects: 100% (74/74) remote: Counting objects: 100% (74/74), done. remote: Compressing objects: 2% (1/37) remote: Compressing objects: 5% (2/37) remote: Compressing objects: 8% (3/37) remote: Compressing objects: 10% (4/37) remote: Compressing objects: 13% (5/37) remote: Compressing objects: 16% (6/37) remote: Compressing objects: 18% (7/37) remote: Compressing objects: 21% (8/37) remote: Compressing objects: 24% (9/37) remote: Compressing objects: 27% (10/37) remote: Compressing objects: 29% (11/37) remote: Compressing objects: 32% (12/37) remote: Compressing objects: 35% (13/37) remote: Compressing objects: 37% (14/37) remote: Compressing objects: 40% (15/37) remote: Compressing objects: 43% (16/37) remote: Compressing objects: 45% (17/37) remote: Compressing objects: 48% (18/37) remote: Compressing objects: 51% (19/37) remote: Compressing objects: 54% (20/37) remote: Compressing objects: 56% (21/37) remote: Compressing objects: 59% (22/37) remote: Compressing objects: 62% (23/37) remote: Compressing objects: 64% (24/37) remote: Compressing objects: 67% (25/37) remote: Compressing objects: 70% (26/37) remote: Compressing objects: 72% (27/37) remote: Compressing objects: 75% (28/37) remote: Compressing objects: 78% (29/37) remote: Compressing objects: 81% (30/37) remote: Compressing objects: 83% (31/37) remote: Compressing objects: 86% (32/37) remote: Compressing objects: 89% (33/37) remote: Compressing objects: 91% (34/37) remote: Compressing objects: 94% (35/37) remote: Compressing objects: 97% (36/37) remote: Compressing objects: 100% (37/37) remote: Compressing objects: 100% (37/37), done. remote: Total 38 (delta 36), reused 2 (delta 1), pack-reused 0  From https://github.com/python/cpython * branch main -> FETCH_HEAD Note: switching to '9cefcc0ee781a1bef9e0685c2271237005fb488b'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by switching back to a branch. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -c with the switch command. Example: git switch -c <new-branch-name> Or undo this operation with: git switch - Turn off this advice by setting config variable advice.detachedHead to false HEAD is now at 9cefcc0ee7 GH-120507: Lower the `BEFORE_WITH` and `BEFORE_ASYNC_WITH` instructions. (#120640) Switched to and reset branch 'main' configure: WARNING: no system libmpdecimal found; falling back to bundled libmpdecimal (deprecated and scheduled for removal in Python 3.15)configure: WARNING: using cross tools not prefixed with host tripletconfigure: WARNING: no system libmpdecimal found; falling back to bundled libmpdecimal (deprecated and scheduled for removal in Python 3.15) In file included from ../../Modules/md5module.c:46: In file included from ../../Modules/_hacl/Hacl_Hash_MD5.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:130:11: warning: 'htole32' macro redefined [-Wmacro-redefined] 130 | # define htole32(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:43:9: note: previous definition is here 43 | #define htole32(x) (uint32_t)(x) |^ In file included from ../../Modules/md5module.c:46: In file included from ../../Modules/_hacl/Hacl_Hash_MD5.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:131:11: warning: 'le32toh' macro redefined [-Wmacro-redefined] 131 | # define le32toh(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:44:9: note: previous definition is here 44 | #define le32toh(x) (uint32_t)(x) |^ In file included from ../../Modules/md5module.c:46: In file included from ../../Modules/_hacl/Hacl_Hash_MD5.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:132:11: warning: 'htobe32' macro redefined [-Wmacro-redefined] 132 | # define htobe32(x) \ |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:37:9: note: previous definition is here 37 | #define htobe32(x) __bswap32(x) |^ In file included from ../../Modules/md5module.c:46: In file included from ../../Modules/_hacl/Hacl_Hash_MD5.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:138:11: warning: 'be32toh' macro redefined [-Wmacro-redefined] 138 | # define be32toh(x) (htobe32((x))) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:38:9: note: previous definition is here 38 | #define be32toh(x) __bswap32(x) |^ In file included from ../../Modules/md5module.c:46: In file included from ../../Modules/_hacl/Hacl_Hash_MD5.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:140:11: warning: 'htole64' macro redefined [-Wmacro-redefined] 140 | # define htole64(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:45:9: note: previous definition is here 45 | #define htole64(x) (uint64_t)(x) |^ In file included from ../../Modules/md5module.c:46: In file included from ../../Modules/_hacl/Hacl_Hash_MD5.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:141:11: warning: 'le64toh' macro redefined [-Wmacro-redefined] 141 | # define le64toh(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:46:9: note: previous definition is here 46 | #define le64toh(x) (uint64_t)(x) |^ In file included from ../../Modules/md5module.c:46: In file included from ../../Modules/_hacl/Hacl_Hash_MD5.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:142:11: warning: 'htobe64' macro redefined [-Wmacro-redefined] 142 | # define htobe64(x) \ |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:39:9: note: previous definition is here 39 | #define htobe64(x) __bswap64(x) |^ In file included from ../../Modules/md5module.c:46: In file included from ../../Modules/_hacl/Hacl_Hash_MD5.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:149:11: warning: 'be64toh' macro redefined [-Wmacro-redefined] 149 | # define be64toh(x) (htobe64((x))) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:40:9: note: previous definition is here 40 | #define be64toh(x) __bswap64(x) |^ 8 warnings generated. In file included from ../../Modules/sha1module.c:47: In file included from ../../Modules/_hacl/Hacl_Hash_SHA1.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:130:11: warning: 'htole32' macro redefined [-Wmacro-redefined] 130 | # define htole32(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:43:9: note: previous definition is here 43 | #define htole32(x) (uint32_t)(x) |^ In file included from ../../Modules/sha1module.c:47: In file included from ../../Modules/_hacl/Hacl_Hash_SHA1.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:131:11: warning: 'le32toh' macro redefined [-Wmacro-redefined] 131 | # define le32toh(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:44:9: note: previous definition is here 44 | #define le32toh(x) (uint32_t)(x) |^ In file included from ../../Modules/sha1module.c:47: In file included from ../../Modules/_hacl/Hacl_Hash_SHA1.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:132:11: warning: 'htobe32' macro redefined [-Wmacro-redefined] 132 | # define htobe32(x) \ |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:37:9: note: previous definition is here 37 | #define htobe32(x) __bswap32(x) |^ In file included from ../../Modules/sha1module.c:47: In file included from ../../Modules/_hacl/Hacl_Hash_SHA1.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:138:11: warning: 'be32toh' macro redefined [-Wmacro-redefined] 138 | # define be32toh(x) (htobe32((x))) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:38:9: note: previous definition is here 38 | #define be32toh(x) __bswap32(x) |^ In file included from ../../Modules/sha1module.c:47: In file included from ../../Modules/_hacl/Hacl_Hash_SHA1.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:140:11: warning: 'htole64' macro redefined [-Wmacro-redefined] 140 | # define htole64(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:45:9: note: previous definition is here 45 | #define htole64(x) (uint64_t)(x) |^ In file included from ../../Modules/sha1module.c:47: In file included from ../../Modules/_hacl/Hacl_Hash_SHA1.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:141:11: warning: 'le64toh' macro redefined [-Wmacro-redefined] 141 | # define le64toh(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:46:9: note: previous definition is here 46 | #define le64toh(x) (uint64_t)(x) |^ In file included from ../../Modules/sha1module.c:47: In file included from ../../Modules/_hacl/Hacl_Hash_SHA1.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:142:11: warning: 'htobe64' macro redefined [-Wmacro-redefined] 142 | # define htobe64(x) \ |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:39:9: note: previous definition is here 39 | #define htobe64(x) __bswap64(x) |^ In file included from ../../Modules/sha1module.c:47: In file included from ../../Modules/_hacl/Hacl_Hash_SHA1.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:149:11: warning: 'be64toh' macro redefined [-Wmacro-redefined] 149 | # define be64toh(x) (htobe64((x))) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:40:9: note: previous definition is here 40 | #define be64toh(x) __bswap64(x) |^ 8 warnings generated. In file included from ../../Modules/sha3module.c:59: In file included from ../../Modules/_hacl/Hacl_Hash_SHA3.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:130:11: warning: 'htole32' macro redefined [-Wmacro-redefined] 130 | # define htole32(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:43:9: note: previous definition is here 43 | #define htole32(x) (uint32_t)(x) |^ In file included from ../../Modules/sha3module.c:59: In file included from ../../Modules/_hacl/Hacl_Hash_SHA3.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:131:11: warning: 'le32toh' macro redefined [-Wmacro-redefined] 131 | # define le32toh(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:44:9: note: previous definition is here 44 | #define le32toh(x) (uint32_t)(x) |^ In file included from ../../Modules/sha3module.c:59: In file included from ../../Modules/_hacl/Hacl_Hash_SHA3.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:132:11: warning: 'htobe32' macro redefined [-Wmacro-redefined] 132 | # define htobe32(x) \ |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:37:9: note: previous definition is here 37 | #define htobe32(x) __bswap32(x) |^ In file included from ../../Modules/sha3module.c:59: In file included from ../../Modules/_hacl/Hacl_Hash_SHA3.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:138:11: warning: 'be32toh' macro redefined [-Wmacro-redefined] 138 | # define be32toh(x) (htobe32((x))) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:38:9: note: previous definition is here 38 | #define be32toh(x) __bswap32(x) |^ In file included from ../../Modules/sha3module.c:59: In file included from ../../Modules/_hacl/Hacl_Hash_SHA3.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:140:11: warning: 'htole64' macro redefined [-Wmacro-redefined] 140 | # define htole64(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:45:9: note: previous definition is here 45 | #define htole64(x) (uint64_t)(x) |^ In file included from ../../Modules/sha3module.c:59: In file included from ../../Modules/_hacl/Hacl_Hash_SHA3.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:141:11: warning: 'le64toh' macro redefined [-Wmacro-redefined] 141 | # define le64toh(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:46:9: note: previous definition is here 46 | #define le64toh(x) (uint64_t)(x) |^ In file included from ../../Modules/sha3module.c:59: In file included from ../../Modules/_hacl/Hacl_Hash_SHA3.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:142:11: warning: 'htobe64' macro redefined [-Wmacro-redefined] 142 | # define htobe64(x) \ |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:39:9: note: previous definition is here 39 | #define htobe64(x) __bswap64(x) |^ In file included from ../../Modules/sha3module.c:59: In file included from ../../Modules/_hacl/Hacl_Hash_SHA3.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:149:11: warning: 'be64toh' macro redefined [-Wmacro-redefined] 149 | # define be64toh(x) (htobe64((x))) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:40:9: note: previous definition is here 40 | #define be64toh(x) __bswap64(x) |^ 8 warnings generated. ../../Modules/expat/xmlparse.c:7839:11: warning: format specifies type 'int' but the argument has type 'ptrdiff_t' (aka 'long') [-Wformat] 7838 | " (+" EXPAT_FMT_PTRDIFF_T("6") " bytes %s|%d, xmlparse.c:%d) %*s\"", |~~~~~~~~~~~~~~~~~~~~~~~~ 7839 | bytesMore, (account == XML_ACCOUNT_DIRECT) ? "DIR" : "EXP", |^~~~~~~~~ 1 warning generated. ../../Modules/_sre/sre.c:2221:14: warning: comparison of integers of different signs: 'Py_ssize_t' (aka 'long') and 'Py_UCS4' (aka 'unsigned int') [-Wsign-compare] 2221 | assert(i <= SRE_MAXGROUPS); |~~~~~~~~~^~~~~~~~~~~~~~~~~ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/assert.h:8:28: note: expanded from macro 'assert' 8|#define assert(x) ((void)((x) || (__assert_fail(#x, __FILE__, __LINE__, __func__),0)))|^ In file included from ../../Modules/sha2module.c:48: In file included from ../../Modules/_hacl/Hacl_Hash_SHA2.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:130:11: warning: 'htole32' macro redefined [-Wmacro-redefined] 130 | # define htole32(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:43:9: note: previous definition is here 43 | #define htole32(x) (uint32_t)(x) |^ In file included from ../../Modules/sha2module.c:48: In file included from ../../Modules/_hacl/Hacl_Hash_SHA2.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:131:11: warning: 'le32toh' macro redefined [-Wmacro-redefined] 131 | # define le32toh(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:44:9: note: previous definition is here 44 | #define le32toh(x) (uint32_t)(x) |^ In file included from ../../Modules/sha2module.c:48: In file included from ../../Modules/_hacl/Hacl_Hash_SHA2.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:132:11: warning: 'htobe32' macro redefined [-Wmacro-redefined] 132 | # define htobe32(x) \ |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:37:9: note: previous definition is here 37 | #define htobe32(x) __bswap32(x) |^ In file included from ../../Modules/sha2module.c:48: In file included from ../../Modules/_hacl/Hacl_Hash_SHA2.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:138:11: warning: 'be32toh' macro redefined [-Wmacro-redefined] 138 | # define be32toh(x) (htobe32((x))) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:38:9: note: previous definition is here 38 | #define be32toh(x) __bswap32(x) |^ In file included from ../../Modules/sha2module.c:48: In file included from ../../Modules/_hacl/Hacl_Hash_SHA2.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:140:11: warning: 'htole64' macro redefined [-Wmacro-redefined] 140 | # define htole64(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:45:9: note: previous definition is here 45 | #define htole64(x) (uint64_t)(x) |^ In file included from ../../Modules/sha2module.c:48: In file included from ../../Modules/_hacl/Hacl_Hash_SHA2.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:141:11: warning: 'le64toh' macro redefined [-Wmacro-redefined] 141 | # define le64toh(x) (x) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:46:9: note: previous definition is here 46 | #define le64toh(x) (uint64_t)(x) |^ In file included from ../../Modules/sha2module.c:48: In file included from ../../Modules/_hacl/Hacl_Hash_SHA2.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:142:11: warning: 'htobe64' macro redefined [-Wmacro-redefined] 142 | # define htobe64(x) \ |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:39:9: note: previous definition is here 39 | #define htobe64(x) __bswap64(x) |^ In file included from ../../Modules/sha2module.c:48: In file included from ../../Modules/_hacl/Hacl_Hash_SHA2.h:35: In file included from ../../Modules/_hacl/include/krml/types.h:12: ../../Modules/_hacl/include/krml/lowstar_endianness.h:149:11: warning: 'be64toh' macro redefined [-Wmacro-redefined] 149 | # define be64toh(x) (htobe64((x))) |^ /opt/wasi-sdk-21.0/bin/../share/wasi-sysroot/include/endian.h:40:9: note: previous definition is here 40 | #define be64toh(x) __bswap64(x) |^ 1 warning generated. 8 warnings generated. make: *** [Makefile:2212: buildbottest] Error 2 Cannot open file '/home/buildbot/buildarea/3.x.bcannon-wasi.wasi.debug/build/build/cross-build/wasm32-wasi/test-results.xml' for upload

[encukou]

This added a bunch macros without a Py/_Py prefix to public headers.
I filed #135922 to move them.