Changeset 2282

Timestamp:

01/07/22 16:09:50 (3 years ago)

Author:

jderouillat

Message:

Add missing return statements detected using -fsanitize=return. Return errors at runtime if reached.

Location:

XIOS/dev/dev_ym/XIOS_COUPLING

Files:

• extern/remap/src/polyg.cpp (modified) (1 diff)
• src/cxios.cpp (modified) (1 diff)
• src/distribution/server_distribution_description.cpp (modified) (1 diff)
• src/exception.hpp (modified) (1 diff)
• src/node/axis.hpp (modified) (1 diff)
• src/node/domain.hpp (modified) (1 diff)
• src/node/grid.cpp (modified) (3 diffs)
• src/node/scalar.hpp (modified) (1 diff)
• src/transformation/axis_algorithm/axis_algorithm_interpolate_coordinate.cpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/polyg.cpp

@@ -98 +98 @@
   else if (n == 2) return midpoint(x[0], x[1]);
   else if (n == 1) return x[0];
+
+  error_exit( "Missing return in : Coord exact_barycentre(const Coord *x, int n)" );
+  return ORIGIN;
 }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/cxios.cpp

@@ -310 +310 @@
     if (isClient) return CClient::getPoolRessource() ;
     else if (isServer) return CServer::getServersRessource()->getPoolRessource() ;
+    
+    MISSING_RETURN( "CPoolRessource* CXios::getPoolRessource()" );
+    return nullptr;
   }
 }

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/server_distribution_description.cpp

@@ -39 +39 @@
     default:
       break;
-  } 
+  }
+
+  MISSING_RETURN( "int CServerDistributionDescription::defaultDistributedDimension(int gridDimension, ServerDistributionType serType)" );
+  return -1;
 }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/exception.hpp

@@ -75 +75 @@
        xios::CException exc(id);                \
        exc.getStream() << INFO(x);              \
+       error << exc.getMessage() << std::endl;  \
+       throw exc;                               \
+}
+
+#define MISSING_RETURN(id)  \
+{                     \
+       xios::CException exc(id);                \
+       exc.getStream() << INFO("Missing return");              \
        error << exc.getMessage() << std::endl;  \
        throw exc;                               \

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.hpp

@@ -209 +209 @@
            if (hasDirectAxisReference()) if (!getDirectAxisReference()->isCompleted()) return false;
            else return isCompleted_ ;
+
+           MISSING_RETURN( "bool CAxis::isCompleted() " );
+           return true;
          }
          void setCompleted(void) { isCompleted_=true ; }

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.hpp

@@ -175 +175 @@
            if (hasDirectDomainReference()) if (!getDirectDomainReference()->isCompleted()) return false;
            else return isCompleted_ ;
+
+           MISSING_RETURN( "bool CDomain::isCompleted() " );
+           return true;
          }
          void setCompleted(void) { isCompleted_=true ; }

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

@@ -461 +461 @@
       }  
     }
+
+    MISSING_RETURN( "CDomain* CGrid::getAssociatedDomain(const string& domainId, bool noError)" );
+    return nullptr;
   } 
 
@@ -525 +528 @@
       }  
     }
+
+    MISSING_RETURN( "CAxis* CGrid::getAssociatedAxis(const string& axisId, bool noError)" );
+    return nullptr;
   } 
 
@@ -589 +595 @@
       }  
     }
+
+    MISSING_RETURN( "CScalar* CGrid::getAssociatedScalar(const string& scalarId, bool noError)" );
+    return nullptr;
   } 
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/scalar.hpp

@@ -167 +167 @@
         if (hasDirectScalarReference()) if (!getDirectScalarReference()->isCompleted()) return false;
         else return isCompleted_ ;
+
+        MISSING_RETURN( "bool CAxis::isCompleted() " );
+        return true;
       }
       void setCompleted(void) { isCompleted_=true ; }

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_interpolate_coordinate.cpp

@@ -69 +69 @@
     }
     if (pos==1) return false ;
+
+    MISSING_RETURN( "bool CAxisAlgorithmInterpolateCoordinate::transformAuxField(int pos)" );
+    return false;
   }