Rename ASAN_EVAL to ASAN_ONLY, and kill ASAN_ASSERT.

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

diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp
index 1a80e46..7f006bc 100644 (file)
--- a/src/kernel/context/ContextRaw.cpp
+++ b/src/kernel/context/ContextRaw.cpp
@@ -237,9 +237,9 @@ RawContext::RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup
    if (has_code()) {
      this->stack_ = SIMIX_context_stack_new();
 #if PTH_STACKGROWTH == -1
    if (has_code()) {
      this->stack_ = SIMIX_context_stack_new();
 #if PTH_STACKGROWTH == -1

-     ASAN_EVAL(this->asan_stack_ = static_cast<char*>(this->stack_) + smx_context_usable_stack_size);
+     ASAN_ONLY(this->asan_stack_ = static_cast<char*>(this->stack_) + smx_context_usable_stack_size);

 #else
 #else

-     ASAN_EVAL(this->asan_stack_ = this->stack_);
+     ASAN_ONLY(this->asan_stack_ = this->stack_);

 #endif
      this->stack_top_ = raw_makecontext(this->stack_, smx_context_usable_stack_size, RawContext::wrapper, this);
    } else {
 #endif
      this->stack_top_ = raw_makecontext(this->stack_, smx_context_usable_stack_size, RawContext::wrapper, this);
    } else {


@@ -265,14 +265,14 @@ void RawContext::wrapper(void* arg)
   } catch (StopRequest const&) {
     XBT_DEBUG("Caught a StopRequest");
   }
   } catch (StopRequest const&) {
     XBT_DEBUG("Caught a StopRequest");
   }

-  ASAN_EVAL(context->asan_stop_ = true);
+  ASAN_ONLY(context->asan_stop_ = true);

   context->suspend();
 }
 
 inline void RawContext::swap(RawContext* from, RawContext* to)
 {
   void* fake_stack = nullptr;
   context->suspend();
 }
 
 inline void RawContext::swap(RawContext* from, RawContext* to)
 {
   void* fake_stack = nullptr;

-  ASAN_EVAL(to->asan_ctx_ = from);
+  ASAN_ONLY(to->asan_ctx_ = from);

   ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_);
   raw_swapcontext(&from->stack_top_, to->stack_top_);
   ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_);
   ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_);
   raw_swapcontext(&from->stack_top_, to->stack_top_);
   ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_);