@@ -22,11 +22,14 @@ struct NSTATE {
   constexpr static underlying_type JOINED_SUBFLOW      = 0x80000000;
 
   // priority encoding (2 bits): 00=UNSET, 01=HIGH, 10=NORMAL, 11=LOW
-  constexpr static underlying_type PRIORITY_SHIFT           = 26;
-  constexpr static underlying_type PRIORITY_MASK            = 0x0C000000;
+  constexpr static underlying_type PRIORITY_SHIFT      = 26;
+  constexpr static underlying_type PRIORITY_MASK       = 0x0C000000;
 
   // mask to isolate state bits - non-state bits store # strong dependents
   constexpr static underlying_type STRONG_DEPENDENCIES_MASK = 0x03FFFFFF;
+
+  // mask to clear the state while preserving important bits
+  constexpr static underlying_type CLEAR_MASK          = PRIORITY_MASK; 
 };
 
 using nstate_t = NSTATE::underlying_type;
 
@@ -2442,7 +2442,7 @@ inline size_t Executor::_set_up_graph(Graph& graph, Topology* tpg, NodeBase* par
     auto node = *first;
     node->_topology = tpg;
     node->_parent = parent;
-    node->_nstate &= NSTATE::PRIORITY_MASK;
+    node->_nstate &= NSTATE::CLEAR_MASK;
     node->_estate.store(ESTATE::NONE, std::memory_order_relaxed);
     node->_set_up_join_counter();
     node->_exception_ptr = nullptr;
 
@@ -287,10 +287,8 @@ class NodeBase {
     _join_counter {join_counter} {
   }
 
-  // encode TaskPriority (HIGH=0,NORMAL=1,LOW=2) as +1 into bits 26-27 of _nstate,
-  // reserving 00 for UNSET (no priority explicitly assigned)
   void _set_priority(TaskPriority p) {
-    nstate_t encoded = (static_cast<nstate_t>(p) + 1) << NSTATE::PRIORITY_SHIFT;
+    nstate_t encoded = (static_cast<nstate_t>(p)) << NSTATE::PRIORITY_SHIFT;
     _nstate = (_nstate & ~NSTATE::PRIORITY_MASK) | encoded;
   }
 
 
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <array>
 #include <bit>
 
 #include "../utility/macros.hpp"
@@ -929,7 +928,7 @@ concept BoundedWSQLike = requires(Q& q, typename Q::value_type v) {
 /**
 @brief default priority function for BoundedPriorityWSQ
 
-Calls @c item->_priority_queue() on the element and returns the result as
+Calls `T::priority()` on the element and returns the result as
 a @c size_t. Users may supply a custom priority function in place of this
 default to decouple the queue from any particular element interface.
 */
Original file line number	Diff line number	Diff line change
@@ -287,10 +287,8 @@ class NodeBase {
287	287	_join_counter {join_counter} {
288	288	}
289	289
290		- // encode TaskPriority (HIGH=0,NORMAL=1,LOW=2) as +1 into bits 26-27 of _nstate,
291		- // reserving 00 for UNSET (no priority explicitly assigned)
292	290	void _set_priority(TaskPriority p) {
293		- nstate_t encoded = (static_cast<nstate_t>(p) + 1) << NSTATE::PRIORITY_SHIFT;
	291	+ nstate_t encoded = (static_cast<nstate_t>(p)) << NSTATE::PRIORITY_SHIFT;
294	292	_nstate = (_nstate & ~NSTATE::PRIORITY_MASK) \| encoded;
295	293	}
296	294