From bc89242da840768e3bcdeb1b64441091d77e4e08 Mon Sep 17 00:00:00 2001
From: Augustin Degomme <adegomme@users.noreply.github.com>
Date: Mon, 7 Jun 2021 17:12:45 +0200
Subject: [PATCH] check that we are not using RMA-reserved MPI_Op in non-RMA
 calls.

---
 src/smpi/include/private.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp
index e663ba557f..d80b3045b3 100644
--- a/src/smpi/include/private.hpp
+++ b/src/smpi/include/private.hpp
@@ -632,6 +632,8 @@ XBT_PRIVATE void private_execute_flops(double flops);
 #define CHECK_OP(num, op, type)\
   {\
   CHECK_MPI_NULL((num), MPI_OP_NULL, MPI_ERR_OP, (op))\
+  CHECK_ARGS((op == MPI_REPLACE || op == MPI_NO_OP), MPI_ERR_OP,\
+             "%s: param %d op %s cannot be used in non RMA calls", __func__, (num), _XBT_STRINGIFY(op));\
   CHECK_DELETED((num), MPI_ERR_OP, op)\
   if (not op->is_predefined())\
     simgrid::smpi::utils::set_current_handle(op);\
-- 
2.20.1