Skip to content

Commit b940f65

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.
1 parent 0695bb0 commit b940f65

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
@@ -10,6 +10,9 @@ What's New in Stackless 2.7.XX?
1010

1111
*Release date: XXXX-XX-XX*
1212

13+
- https://github.com/stackless-dev/stackless/issues/154
14+
Fix a minor bug in STACKLESS_PROMOTE_WRAPPER and STACKLESS_PROMOTE_METHOD.
15+
1316
- https://github.com/stackless-dev/stackless/issues/141
1417
Call Py_DECREF(frame) with the right recursion_depth.
1518

Stackless/core/stackless_impl.h

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

477477
#define STACKLESS_PROMOTE_WRAPPER(wp) \
478-
(slp_try_stackless = stackless & wp->descr->d_slpmask)
478+
(slp_try_stackless = stackless && wp->descr->d_slpmask)
479479

480480
#define STACKLESS_PROMOTE_ALL() ((void)(slp_try_stackless = stackless, NULL))
481481

0 commit comments

Comments
 (0)