Fix MC builds with gcc12 (and make the serialization more robust)

diff --git a/src/mc/api/Transition.hpp b/src/mc/api/Transition.hpp
index 3ee9110..ed4dd75 100644 (file)
--- a/src/mc/api/Transition.hpp
+++ b/src/mc/api/Transition.hpp
@@ -32,7 +32,8 @@ class Transition {
   friend State; // FIXME remove this once we have a proper class to handle the statistics
 
 public:
-  XBT_DECLARE_ENUM_CLASS(Type, UNKNOWN, RANDOM, COMM_RECV, COMM_SEND, COMM_TEST, COMM_WAIT, TESTANY);
+  XBT_DECLARE_ENUM_CLASS(Type, RANDOM, COMM_RECV, COMM_SEND, COMM_TEST, COMM_WAIT, TESTANY,
+                         /* UNKNOWN must be last */ UNKNOWN);
   Type type_ = Type::UNKNOWN;
 
   aid_t aid_ = 0;

diff --git a/src/mc/api/TransitionComm.cpp b/src/mc/api/TransitionComm.cpp
index 259accc..21a827c 100644 (file)
--- a/src/mc/api/TransitionComm.cpp
+++ b/src/mc/api/TransitionComm.cpp
@@ -239,6 +239,9 @@ Transition* recv_transition(aid_t issuer, int times_considered, std::stringstrea
 {
   short type;
   stream >> type;
+  xbt_assert(type >= 0 && type <= static_cast<short>(Transition::Type::UNKNOWN), "Invalid transition type %d received",
+             type);
+
   Transition::Type simcall = static_cast<Transition::Type>(type);
 
   switch (simcall) {
@@ -259,9 +262,8 @@ Transition* recv_transition(aid_t issuer, int times_considered, std::stringstrea
 
     case Transition::Type::UNKNOWN:
       return new Transition(Transition::Type::UNKNOWN, issuer, times_considered);
-    default:
-      xbt_die("recv_transition of type %s unimplemented", Transition::to_c_str(simcall));
   }
+  THROW_IMPOSSIBLE; // Some compilers don't detect that each branch of the above switch has a return
 }
 
 } // namespace mc