1 files changed, 7 insertions, 0 deletions
diff --git a/src/systemc/core/sc_join.cc b/src/systemc/core/sc_join.cc
index 3e4c6eec4..3c27eaa42 100644
--- a/src/systemc/core/sc_join.cc
+++ b/src/systemc/core/sc_join.cc
@@ -32,6 +32,7 @@
 #include "systemc/ext/core/sc_event.hh"
 #include "systemc/ext/core/sc_join.hh"
 #include "systemc/ext/core/sc_module.hh"
+#include "systemc/ext/utils/sc_report_handler.hh"
 
 namespace sc_core
 {
@@ -44,6 +45,12 @@ sc_join::add_process(sc_process_handle h)
     auto p = (::sc_gem5::Process *)h;
     assert(p);
 
+    if (p->procKind() == SC_METHOD_PROC_) {
+        SC_REPORT_ERROR("(E561) Attempt to register method process "
+                "with sc_join object", "");
+        return;
+    }
+
     remaining++;
     p->joinWait(this);
 }