From 728192b2ae7052c8f1ee2bbedf3346af46127e49 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 7 Jan 2019 16:50:40 +0100 Subject: [PATCH] Fix build with ASan (s/from/this/). --- src/kernel/context/ContextBoost.cpp | 8 ++++---- src/kernel/context/ContextRaw.cpp | 6 +++--- src/kernel/context/ContextUnix.cpp | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/kernel/context/ContextBoost.cpp b/src/kernel/context/ContextBoost.cpp index 0e3fe1c480..1e65b4806b 100644 --- a/src/kernel/context/ContextBoost.cpp +++ b/src/kernel/context/ContextBoost.cpp @@ -93,11 +93,11 @@ void BoostContext::swap_into(SwappedContext* to_) #else BoostContext* ctx[2] = {this, to}; ASAN_ONLY(void* fake_stack = nullptr); - ASAN_ONLY(to->asan_ctx_ = from); - ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_); + ASAN_ONLY(to->asan_ctx_ = this); + ASAN_START_SWITCH(this->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_ONLY(xbt_assert(from->asan_ctx_ == static_cast(arg.data)[0])); - ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_); + ASAN_ONLY(xbt_assert(this->asan_ctx_ == static_cast(arg.data)[0])); + ASAN_FINISH_SWITCH(fake_stack, &this->asan_ctx_->asan_stack_, &this->asan_ctx_->asan_stack_size_); static_cast(arg.data)[0]->fc_ = arg.fctx; #endif } diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp index da01b41b6a..f6eaf314b2 100644 --- a/src/kernel/context/ContextRaw.cpp +++ b/src/kernel/context/ContextRaw.cpp @@ -234,10 +234,10 @@ void RawContext::swap_into(SwappedContext* to_) { RawContext* to = static_cast(to_); ASAN_ONLY(void* fake_stack = nullptr); - ASAN_ONLY(to->asan_ctx_ = from); - ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_); + ASAN_ONLY(to->asan_ctx_ = this); + ASAN_START_SWITCH(this->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_); raw_swapcontext(&this->stack_top_, to->stack_top_); - ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_); + ASAN_FINISH_SWITCH(fake_stack, &this->asan_ctx_->asan_stack_, &this->asan_ctx_->asan_stack_size_); } ContextFactory* raw_factory() diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp index e336386790..727ffb8a8c 100644 --- a/src/kernel/context/ContextUnix.cpp +++ b/src/kernel/context/ContextUnix.cpp @@ -104,10 +104,10 @@ void UContext::swap_into(SwappedContext* to_) { UContext* to = static_cast(to_); ASAN_ONLY(void* fake_stack = nullptr); - ASAN_ONLY(to->asan_ctx_ = from); - ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_); + ASAN_ONLY(to->asan_ctx_ = this); + ASAN_START_SWITCH(this->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_); swapcontext(&this->uc_, &to->uc_); - ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_); + ASAN_FINISH_SWITCH(fake_stack, &this->asan_ctx_->asan_stack_, &this->asan_ctx_->asan_stack_size_); } -- 2.20.1