Merge pull request #6261 from jsquyres/pr/v3.0.x/minor-fortran-valgrind-fix

bwbarrett · web-flow · commit 87b7e566885a · 2019-01-10T07:36:02.000-08:00
v3.0.x: mpi/fortran: Fix valgrind warnings for type create
diff --git a/ompi/mpi/fortran/mpif-h/type_create_f90_complex_f.c b/ompi/mpi/fortran/mpif-h/type_create_f90_complex_f.c
@@ -70,7 +70,7 @@ void ompi_type_create_f90_complex_f(MPI_Fint *p, MPI_Fint *r,
 				   MPI_Fint *newtype, MPI_Fint *ierr)
 {
     int c_ierr;
-    MPI_Datatype c_newtype = PMPI_Type_f2c(*newtype);
+    MPI_Datatype c_newtype;
 
     c_ierr = PMPI_Type_create_f90_complex(OMPI_FINT_2_INT(*p),
                                          OMPI_FINT_2_INT(*r),
diff --git a/ompi/mpi/fortran/mpif-h/type_create_f90_integer_f.c b/ompi/mpi/fortran/mpif-h/type_create_f90_integer_f.c
@@ -70,7 +70,7 @@ void ompi_type_create_f90_integer_f(MPI_Fint *r, MPI_Fint *newtype,
 				   MPI_Fint *ierr)
 {
     int c_ierr;
-    MPI_Datatype c_new = PMPI_Type_f2c(*newtype);
+    MPI_Datatype c_new;
 
     c_ierr = PMPI_Type_create_f90_integer(OMPI_FINT_2_INT(*r), &c_new);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
diff --git a/ompi/mpi/fortran/mpif-h/type_create_f90_real_f.c b/ompi/mpi/fortran/mpif-h/type_create_f90_real_f.c
@@ -70,7 +70,7 @@ void ompi_type_create_f90_real_f(MPI_Fint *p, MPI_Fint *r,
 				MPI_Fint *newtype, MPI_Fint *ierr)
 {
     int c_ierr;
-    MPI_Datatype c_new = PMPI_Type_f2c(*newtype);
+    MPI_Datatype c_new;
 
     c_ierr = PMPI_Type_create_f90_real(OMPI_FINT_2_INT(*p),
                                       OMPI_FINT_2_INT(*r),
diff --git a/ompi/mpi/fortran/mpif-h/type_create_hindexed_f.c b/ompi/mpi/fortran/mpif-h/type_create_hindexed_f.c
@@ -75,7 +75,7 @@ void ompi_type_create_hindexed_f(MPI_Fint *count,
 {
     int c_ierr;
     MPI_Datatype c_old = PMPI_Type_f2c(*oldtype);
-    MPI_Datatype c_new = PMPI_Type_f2c(*newtype);
+    MPI_Datatype c_new;
     OMPI_ARRAY_NAME_DECL(array_of_blocklengths);
 
     OMPI_ARRAY_FINT_2_INT(array_of_blocklengths, *count);

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ void ompi_type_create_f90_complex_f(MPI_Fint p, MPI_Fint r,`
`70`	`70`	`MPI_Fint newtype, MPI_Fint ierr)`
`71`	`71`	`{`
`72`	`72`	`int c_ierr;`
`73`		`- MPI_Datatype c_newtype = PMPI_Type_f2c(*newtype);`
	`73`	`+ MPI_Datatype c_newtype;`
`74`	`74`
`75`	`75`	`c_ierr = PMPI_Type_create_f90_complex(OMPI_FINT_2_INT(*p),`
`76`	`76`	`OMPI_FINT_2_INT(*r),`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ void ompi_type_create_hindexed_f(MPI_Fint *count,`
`75`	`75`	`{`
`76`	`76`	`int c_ierr;`
`77`	`77`	`MPI_Datatype c_old = PMPI_Type_f2c(*oldtype);`
`78`		`- MPI_Datatype c_new = PMPI_Type_f2c(*newtype);`
	`78`	`+ MPI_Datatype c_new;`
`79`	`79`	`OMPI_ARRAY_NAME_DECL(array_of_blocklengths);`
`80`	`80`
`81`	`81`	`OMPI_ARRAY_FINT_2_INT(array_of_blocklengths, *count);`