From 5c2e5e28602b8c18916c224f04bb26ad23610cf2 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Wed, 9 Jan 2019 10:17:52 +0100
Subject: [PATCH 1/1] Field SwappedContext::stack_ became private, use
 get_stack().

---
 src/kernel/context/ContextBoost.cpp | 2 +-
 src/kernel/context/ContextUnix.cpp  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp
index 56208f719c..3fb97680d7 100644
--- a/src/kernel/context/ContextBoost.cpp
+++ b/src/kernel/context/ContextBoost.cpp
@@ -55,7 +55,7 @@ BoostContext::BoostContext(std::function<void()> code, void_pfn_smxprocess_t cle
 BoostContext::~BoostContext()
 {
 #if BOOST_VERSION < 105600
-  if (not this->stack_)
+  if (not get_stack())
     delete this->fc_;
 #endif
 }
diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp
index 86191d29f8..e2906a5d55 100644
--- a/src/kernel/context/ContextUnix.cpp
+++ b/src/kernel/context/ContextUnix.cpp
@@ -49,9 +49,9 @@ UContext::UContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_fun
     this->uc_.uc_stack.ss_sp   = sg_makecontext_stack_addr(get_stack());
     this->uc_.uc_stack.ss_size = sg_makecontext_stack_size(smx_context_usable_stack_size);
 #if PTH_STACKGROWTH == -1
-    ASAN_ONLY(this->asan_stack_ = static_cast<char*>(this->stack_) + smx_context_usable_stack_size);
+    ASAN_ONLY(this->asan_stack_ = static_cast<char*>(get_stack()) + smx_context_usable_stack_size);
 #else
-    ASAN_ONLY(this->asan_stack_ = this->stack_);
+    ASAN_ONLY(this->asan_stack_ = get_stack());
 #endif
     UContext::make_ctx(&this->uc_, UContext::smx_ctx_sysv_wrapper, this);
   } else {
-- 
2.20.1