From f264a2e81ef9ce80c302757c5900b55d9140af2b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 20 Oct 2023 09:43:20 +0200
Subject: WIP: drag options up the stack

---
 libbuild2/scheduler.hxx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'libbuild2/scheduler.hxx')

diff --git a/libbuild2/scheduler.hxx b/libbuild2/scheduler.hxx
index dcddfcc..d3b8ceb 100644
--- a/libbuild2/scheduler.hxx
+++ b/libbuild2/scheduler.hxx
@@ -555,8 +555,8 @@ namespace build2
 
       atomic_count* task_count;
       size_t start_count;
-      func_type func;
       args_type args;
+      func_type func;
 
       template <size_t... i>
       void
@@ -685,7 +685,11 @@ namespace build2
     //
     struct task_data
     {
-      alignas (std::max_align_t) unsigned char data[sizeof (void*) * 8];
+      static const size_t data_size = (sizeof (void*) == 4
+                                       ? sizeof (void*) * 16
+                                       : sizeof (void*) * 8);
+
+      alignas (std::max_align_t) unsigned char data[data_size];
       void (*thunk) (scheduler&, lock&, void*);
     };
 
-- 
cgit v1.1