Skip to content

Commit 117d9bb

Browse files
committed
Stackless issue python#154: fix STACKLESS_PROMOTE_WRAPPER/METHOD
Fix the macros STACKLESS_PROMOTE_WRAPPER and STACKLESS_PROMOTE_METHOD to use "&&" instead of "&" for logical values. By chance the bug was harmless. (cherry picked from commit b940f65)
1 parent 3a4ff36 commit 117d9bb

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Stackless/changelog.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ What's New in Stackless 3.X.X?
99

1010
*Release date: 20XX-XX-XX*
1111

12+
- https://github.com/stackless-dev/stackless/issues/154
13+
Fix a minor bug in STACKLESS_PROMOTE_WRAPPER and STACKLESS_PROMOTE_METHOD.
14+
1215
- https://github.com/stackless-dev/stackless/issues/150
1316
The prototype of PyStackless_GetCurrentId(void) was missing from
1417
stackless_api.h. It is now defined.

Stackless/core/stackless_impl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,11 +474,11 @@ PyTaskletObject * slp_get_watchdog(PyThreadState *ts, int interrupt);
474474
#define STACKLESS_PROMOTE_METHOD(obj, meth) do { \
475475
if ((Py_TYPE(obj)->tp_flags & Py_TPFLAGS_HAVE_STACKLESS_EXTENSION) && \
476476
Py_TYPE(obj)->tp_as_mapping) \
477-
slp_try_stackless = stackless & Py_TYPE(obj)->tp_as_mapping->slpflags.meth; \
477+
slp_try_stackless = stackless && Py_TYPE(obj)->tp_as_mapping->slpflags.meth; \
478478
} while (0)
479479

480480
#define STACKLESS_PROMOTE_WRAPPER(wp) \
481-
(slp_try_stackless = stackless & wp->descr->d_slpmask)
481+
(slp_try_stackless = stackless && wp->descr->d_slpmask)
482482

483483
#define STACKLESS_PROMOTE_ALL() ((void)(slp_try_stackless = stackless, NULL))
484484

0 commit comments

Comments
 (0)