Merge pull request #11502 from hppritcha/fix_issue_11407

sessions: plug hole in support for sessions erh

Author: hppritcha

ompi/errhandler/errhandler_invoke.c

@@ -16,6 +16,8 @@
  *                         reserved.
  * Copyright (c) 2016      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2023      Triad National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -40,6 +42,7 @@ int ompi_errhandler_invoke(ompi_errhandler_t *errhandler, void *mpi_object,
     ompi_communicator_t *comm;
     ompi_win_t *win;
     ompi_file_t *file;
+    ompi_instance_t *instance;
 
     /* If we got no errorhandler, then route the error to the appropriate
      * predefined error handler */
@@ -121,6 +124,22 @@ int ompi_errhandler_invoke(ompi_errhandler_t *errhandler, void *mpi_object,
             break;
         }
         break;
+
+    case OMPI_ERRHANDLER_TYPE_INSTANCE:
+        instance = (ompi_instance_t *) mpi_object;
+        switch (errhandler->eh_lang) {
+        case OMPI_ERRHANDLER_LANG_C:
+            errhandler->eh_instance_fn(&instance, &err_code, message, NULL);
+            break;
+
+        case OMPI_ERRHANDLER_LANG_FORTRAN:
+            fortran_handle = OMPI_INT_2_FINT(instance->i_f_to_c_index);
+            errhandler->eh_fort_fn(&fortran_handle, &fortran_err_code);
+            err_code = OMPI_FINT_2_INT(fortran_err_code);
+            break;
+        }
+        break;
+
     }
 
     /* All done */