Don't set field twice.

[simgrid.git] / src / kernel / context / ContextSwapped.cpp

diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp
index 100dcba..2682e62 100644 (file)
--- a/src/kernel/context/ContextSwapped.cpp
+++ b/src/kernel/context/ContextSwapped.cpp
@@ -52,7 +52,7 @@ SwappedContext::SwappedContext(std::function<void()> code, void_pfn_smxprocess_t
     : Context(std::move(code), cleanup_func, process), factory_(factory)
 {
   // Save maestro (=context created first) in preparation for run_all
-  if (factory_->workers_context_[0] == nullptr)
+  if (not factory->parallel_ && factory_->workers_context_[0] == nullptr)
     factory_->workers_context_[0] = this;
 
   if (has_code()) {
@@ -98,6 +98,11 @@ SwappedContext::SwappedContext(std::function<void()> code, void_pfn_smxprocess_t
       this->stack_ = xbt_malloc0(smx_context_stack_size);
     }
 
+#if PTH_STACKGROWTH == -1
+    ASAN_ONLY(this->asan_stack_ = static_cast<char*>(this->stack_) + smx_context_usable_stack_size);
+#else
+    ASAN_ONLY(this->asan_stack_ = this->stack_);
+#endif
 #if HAVE_VALGRIND_H
     unsigned int valgrind_stack_id =
         VALGRIND_STACK_REGISTER(this->stack_, (char*)this->stack_ + smx_context_stack_size);