Merge pull request #11608 from bosilca/fix/issue_11607

awlauria · web-flow · commit 321000c5c583 · 2023-04-19T11:28:18.000-04:00
Correctly compute the length of contiguous blocks during optimization
diff --git a/ompi/datatype/ompi_datatype_create_struct.c b/ompi/datatype/ompi_datatype_create_struct.c
@@ -33,8 +33,8 @@ int32_t ompi_datatype_create_struct( int count, const int* pBlockLength, const p
 {
     ptrdiff_t disp = 0, endto, lastExtent, lastDisp;
     ompi_datatype_t *pdt, *lastType;
-    int lastBlock;
     int i, start_from;
+    size_t lastBlock;
 
     /* Find first non-zero length element */
     for( i = 0; (i < count) && (0 == pBlockLength[i]); i++ );
diff --git a/test/datatype/opal_ddt_lib.c b/test/datatype/opal_ddt_lib.c
@@ -365,8 +365,7 @@ static int32_t opal_datatype_create_struct(int count, const int *pBlockLength,
                                            opal_datatype_t **newType)
 {
     int i;
-    ptrdiff_t disp = 0, endto, lastExtent, lastDisp;
-    int lastBlock;
+    ptrdiff_t disp = 0, endto, lastExtent, lastDisp, lastBlock;
     opal_datatype_t *pdt, *lastType;
 
     if (0 == count) {

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ int32_t ompi_datatype_create_struct( int count, const int* pBlockLength, const p`
`33`	`33`	`{`
`34`	`34`	`ptrdiff_t disp = 0, endto, lastExtent, lastDisp;`
`35`	`35`	`ompi_datatype_t pdt, lastType;`
`36`		`- int lastBlock;`
`37`	`36`	`int i, start_from;`
	`37`	`+ size_t lastBlock;`
`38`	`38`
`39`	`39`	`/* Find first non-zero length element */`
`40`	`40`	`for( i = 0; (i < count) && (0 == pBlockLength[i]); i++ );`
Original file line number	Diff line number	Diff line change
`@@ -365,8 +365,7 @@ static int32_t opal_datatype_create_struct(int count, const int *pBlockLength,`
`365`	`365`	`opal_datatype_t **newType)`
`366`	`366`	`{`
`367`	`367`	`int i;`
`368`		`- ptrdiff_t disp = 0, endto, lastExtent, lastDisp;`
`369`		`- int lastBlock;`
	`368`	`+ ptrdiff_t disp = 0, endto, lastExtent, lastDisp, lastBlock;`
`370`	`369`	`opal_datatype_t pdt, lastType;`
`371`	`370`
`372`	`371`	`if (0 == count) {`