Boost contexts: add an assert checking that we don't mix up originating context.

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

diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp
index 87b490e..e508c56 100644 (file)
--- a/src/kernel/context/ContextBoost.cpp
+++ b/src/kernel/context/ContextBoost.cpp
@@ -106,10 +106,10 @@ void BoostContext::wrapper(BoostContext::arg_type arg)
 #if BOOST_VERSION < 106100
   BoostContext* context = reinterpret_cast<BoostContext*>(arg);
 #else
 #if BOOST_VERSION < 106100
   BoostContext* context = reinterpret_cast<BoostContext*>(arg);
 #else

-  ASAN_FINISH_SWITCH(nullptr, &static_cast<BoostContext**>(arg.data)[0]->asan_stack_,
-                     &static_cast<BoostContext**>(arg.data)[0]->asan_stack_size_);
+  BoostContext* context = static_cast<BoostContext**>(arg.data)[1];
+  ASAN_ASSERT(context->asan_ctx_ == static_cast<BoostContext**>(arg.data)[0]);
+  ASAN_FINISH_SWITCH(nullptr, &context->asan_ctx_->asan_stack_, &context->asan_ctx_->asan_stack_size_);

   static_cast<BoostContext**>(arg.data)[0]->fc_ = arg.fctx;
   static_cast<BoostContext**>(arg.data)[0]->fc_ = arg.fctx;

-  BoostContext* context                         = static_cast<BoostContext**>(arg.data)[1];

 #endif
   try {
     (*context)();
 #endif
   try {
     (*context)();


@@ -130,10 +130,11 @@ inline void BoostContext::swap(BoostContext* from, BoostContext* to)
 #else
   BoostContext* ctx[2] = {from, to};
   void* fake_stack     = nullptr;
 #else
   BoostContext* ctx[2] = {from, to};
   void* fake_stack     = nullptr;

+  ASAN_EVAL(to->asan_ctx_ = from);

   ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_);
   boost::context::detail::transfer_t arg = boost::context::detail::jump_fcontext(to->fc_, ctx);
   ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_);
   boost::context::detail::transfer_t arg = boost::context::detail::jump_fcontext(to->fc_, ctx);

-  ASAN_FINISH_SWITCH(fake_stack, &static_cast<BoostContext**>(arg.data)[0]->asan_stack_,
-                     &static_cast<BoostContext**>(arg.data)[0]->asan_stack_size_);
+  ASAN_ASSERT(from->asan_ctx_ == static_cast<BoostContext**>(arg.data)[0]);
+  ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_);

   static_cast<BoostContext**>(arg.data)[0]->fc_ = arg.fctx;
 #endif
 }
   static_cast<BoostContext**>(arg.data)[0]->fc_ = arg.fctx;
 #endif
 }