Merge pull request #9305 from awlauria/fix_hcoll_segv_v4.1.x

v4.1.x: coll/hcoll: fixes dtypes mapping

Author: jsquyres

ompi/mca/coll/hcoll/coll_hcoll_dtypes.h

@@ -33,7 +33,7 @@ extern mca_coll_hcoll_dtype_t zero_dte_mapping;
 total 15 types
 */
 
-static dte_data_representation_t* ompi_datatype_2_dte_data_rep[OMPI_DATATYPE_MAX_PREDEFINED] = {
+static dte_data_representation_t* ompi_datatype_2_dte_data_rep[OPAL_DATATYPE_MAX_PREDEFINED] = {
     &DTE_ZERO,                  /*OPAL_DATATYPE_LOOP           0 */
     &DTE_ZERO,                  /*OPAL_DATATYPE_END_LOOP       1 */
 #if defined(DTE_LB)
@@ -86,7 +86,17 @@ static dte_data_representation_t* ompi_datatype_2_dte_data_rep[OMPI_DATATYPE_MAX
 #else
     &DTE_ZERO,
 #endif
-    &DTE_ZERO                   /*OPAL_DATATYPE_UNAVAILABLE    24 */
+#if SIZEOF_LONG == 4
+    &DTE_UINT32,
+#else
+    &DTE_UINT64,                /*OPAL_DATATYPE_LONG           24 */
+#endif
+#if SIZEOF_UNSIGNED_LONG == 4
+    &DTE_UINT32,
+#else
+    &DTE_UINT64,                /*OPAL_DATATYPE_UNSIGNED_LONG  25 */
+#endif
+    &DTE_ZERO                   /*OPAL_DATATYPE_UNAVAILABLE    26 */
 };
 
 enum {