Skip to content

GH-131033: Enable the optimizing macros UNLIKELY and LIKELY for clang-cl on Windows #131019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 25, 2025
Merged

GH-131033: Enable the optimizing macros UNLIKELY and LIKELY for clang-cl on Windows #131019

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01183d7
Enable XML_ATTR_MALLOC and XML_ATTR_ALLOC_SIZE for
chris-eibl Mar 9, 2025
16a7f46
Enable UNLIKELY and LIKELY for clang-cl on Windows
chris-eibl Mar 9, 2025
1c4a55d
Revert "Enable XML_ATTR_MALLOC and XML_ATTR_ALLOC_SIZE "
chris-eibl Mar 10, 2025
577bba7
update comment
chris-eibl Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Modules/expat/expat_external.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@
# define XMLIMPORT
#endif

#if defined(__GNUC__) \
#if defined(__clang__) || defined(__GNUC__) \
&& (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
# define XML_ATTR_MALLOC __attribute__((__malloc__))
#else
# define XML_ATTR_MALLOC
#endif

#if defined(__GNUC__) \
#if defined(__clang__) || defined(__GNUC__) \
&& ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
# define XML_ATTR_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
#else
Expand Down
2 changes: 1 addition & 1 deletion Objects/obmalloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,7 +1457,7 @@ PyObject_Free(void *ptr)

/* If we're using GCC, use __builtin_expect() to reduce overhead of
the valgrind checks */
#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
#if (defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 2))) && defined(__OPTIMIZE__)
# define UNLIKELY(value) __builtin_expect((value), 0)
# define LIKELY(value) __builtin_expect((value), 1)
#else
Expand Down
Loading