HDFFV-10398 Merge from develop

6 files changed, 120 insertions, 171 deletions

diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 77918a4..85e0492 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -173,7 +173,7 @@ endif ()
 # Macro to determine the various conversion capabilities
 #-----------------------------------------------------------------------------
 macro (H5ConversionTests TEST msg)
-  if ("${TEST}" MATCHES "^${TEST}$")
+  if (NOT DEFINED ${TEST})
    # message (STATUS "===> ${TEST}")
     TRY_RUN (${TEST}_RUN   ${TEST}_COMPILE
         ${CMAKE_BINARY_DIR}
@@ -204,21 +204,6 @@ macro (H5ConversionTests TEST msg)
 endmacro ()
 
 #-----------------------------------------------------------------------------
-# Macro to make some of the conversion tests easier to write/read
-#-----------------------------------------------------------------------------
-macro (H5MiscConversionTest VAR TEST msg)
-  if ("${TEST}" MATCHES "^${TEST}$")
-    if (${VAR})
-      set (${TEST} 1 CACHE INTERNAL ${msg})
-      message (STATUS "${msg}... yes")
-    else ()
-      set (${TEST} "" CACHE INTERNAL ${msg})
-      message (STATUS "${msg}... no")
-    endif ()
-  endif ()
-endmacro ()
-
-#-----------------------------------------------------------------------------
 # Check various conversion capabilities
 #-----------------------------------------------------------------------------
 
diff --git a/config/cmake/ConversionTests.c b/config/cmake/ConversionTests.c
index 082dbd4..002bc88 100644
--- a/config/cmake/ConversionTests.c
+++ b/config/cmake/ConversionTests.c
@@ -9,12 +9,23 @@
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
++
+#if defined(__has_attribute)
+#if __has_attribute(no_sanitize)
+#define HDF_NO_UBSAN __attribute__((no_sanitize("undefined")))
+#else
+#define HDF_NO_UBSAN
+#endif
+#else
+#define HDF_NO_UBSAN
+#endif
+
 #ifdef H5_LDOUBLE_TO_LONG_SPECIAL_TEST
 
 #include <string.h>
 #include <stdlib.h>
 
-int main(void)
+int main(void) HDF_NO_UBSAN
 {
     long double         ld = 20041683600089727.779961L;
     long                ll;
@@ -24,44 +35,44 @@ int main(void)
     int                 ret = 1;
 
     if(sizeof(long double) == 16 && sizeof(long) == 8) {
-	/*make sure the long double type has 16 bytes in size and
-	 * 11 bits of exponent.  If it is,
-	 *the bit sequence should be like below.  It's not
-	 *a decent way to check but this info isn't available. */
-	memcpy(s, &ld, 16);
-	if(s[0]==0x43 && s[1]==0x51 && s[2]==0xcc && s[3]==0xf3 &&
-		s[4]==0x85 && s[5]==0xeb && s[6]==0xc8 && s[7]==0xa0 &&
-		s[8]==0xbf && s[9]==0xcc && s[10]==0x2a && s[11]==0x3c) {
-
-	    /* Assign the hexadecimal value of long double type. */
-	    s[0]=0x43; s[1]=0x51; s[2]=0xcc; s[3]=0xf3;
-	    s[4]=0x85; s[5]=0xeb; s[6]=0xc8; s[7]=0xa0;
-	    s[8]=0xbf; s[9]=0xcc; s[10]=0x2a; s[11]=0x3c;
-	    s[12]=0x3d; s[13]=0x85; s[14]=0x56; s[15]=0x20;
-
-	    memcpy(&ld, s, 16);
-
-	    ll = (long)ld;
-	    memcpy(s2, &ll, 8);
-
-	    /* The library's algorithm converts it to 0x 00 47 33 ce 17 af 22 82
-	     * and gets wrong value 20041683600089730 on the IBM Power6 Linux.
-	     * But the IBM Power6 Linux converts it to 0x00 47 33 ce 17 af 22 7f
-	     * and gets the correct value 20041683600089727.  It uses some special
-	     * algorithm.  We're going to define the macro and skip the test until
-	     * we can figure out how they do it. */
-	    if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
-		    s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
-		ret = 0;
-
-	    ull = (unsigned long)ld;
-	    memcpy(s2, &ull, 8);
-
-	    /* The unsigned long is the same as signed long. */
-	    if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
-		    s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
-		ret = 0;
-	}
+    /*make sure the long double type has 16 bytes in size and
+    * 11 bits of exponent.  If it is,
+    *the bit sequence should be like below.  It's not
+    *a decent way to check but this info isn't available. */
+    memcpy(s, &ld, 16);
+    if(s[0]==0x43 && s[1]==0x51 && s[2]==0xcc && s[3]==0xf3 &&
+        s[4]==0x85 && s[5]==0xeb && s[6]==0xc8 && s[7]==0xa0 &&
+        s[8]==0xbf && s[9]==0xcc && s[10]==0x2a && s[11]==0x3c) {
+
+        /* Assign the hexadecimal value of long double type. */
+        s[0]=0x43; s[1]=0x51; s[2]=0xcc; s[3]=0xf3;
+        s[4]=0x85; s[5]=0xeb; s[6]=0xc8; s[7]=0xa0;
+        s[8]=0xbf; s[9]=0xcc; s[10]=0x2a; s[11]=0x3c;
+        s[12]=0x3d; s[13]=0x85; s[14]=0x56; s[15]=0x20;
+
+        memcpy(&ld, s, 16);
+
+        ll = (long)ld;
+        memcpy(s2, &ll, 8);
+
+        /* The library's algorithm converts it to 0x 00 47 33 ce 17 af 22 82
+        * and gets wrong value 20041683600089730 on the IBM Power6 Linux.
+        * But the IBM Power6 Linux converts it to 0x00 47 33 ce 17 af 22 7f
+        * and gets the correct value 20041683600089727.  It uses some special
+        * algorithm.  We're going to define the macro and skip the test until
+        * we can figure out how they do it. */
+        if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
+            s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
+        ret = 0;
+
+        ull = (unsigned long)ld;
+        memcpy(s2, &ull, 8);
+
+        /* The unsigned long is the same as signed long. */
+        if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
+            s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
+        ret = 0;
+    }
     }
 
 done:
@@ -75,7 +86,7 @@ done:
 #include <string.h>
 #include <stdlib.h>
 
-int main(void)
+int main(void) HDF_NO_UBSAN
 {
     long double         ld;
     long                ll;
@@ -86,46 +97,46 @@ int main(void)
     /*Determine if long double has 16 byte in size, 11 bit exponent, and
      *the bias is 0x3ff */
     if(sizeof(long double) == 16) {
-	ld = 1.0L;
-	memcpy(s, &ld, 16);
-	if(s[0]==0x3f && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
-		s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00)
-	    flag = 1;
+    ld = 1.0L;
+    memcpy(s, &ld, 16);
+    if(s[0]==0x3f && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
+        s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00)
+        flag = 1;
     }
 
     if(flag==1 && sizeof(long)==8) {
-	ll = 0x003fffffffffffffL;
-	ld = (long double)ll;
-	memcpy(s, &ld, 16);
-	/* The library converts the value to 0x434fffffffffffff8000000000000000.
-	 * In decimal it is 18014398509481982.000000, one value short of the original.
-	 * The IBM Power6 Linux converts it to 0x4350000000000000bff0000000000000.
-	 * The value is correct in decimal. It uses some special
-	 * algorithm.  We're going to define the macro and skip the test until
-	 * we can figure out how they do it. */
-	if(s[0]==0x43 && s[1]==0x50 && s[2]==0x00 && s[3]==0x00 &&
-		s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
-		s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
-		s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
-	    ret = 0;
+    ll = 0x003fffffffffffffL;
+    ld = (long double)ll;
+    memcpy(s, &ld, 16);
+    /* The library converts the value to 0x434fffffffffffff8000000000000000.
+    * In decimal it is 18014398509481982.000000, one value short of the original.
+    * The IBM Power6 Linux converts it to 0x4350000000000000bff0000000000000.
+    * The value is correct in decimal. It uses some special
+    * algorithm.  We're going to define the macro and skip the test until
+    * we can figure out how they do it. */
+    if(s[0]==0x43 && s[1]==0x50 && s[2]==0x00 && s[3]==0x00 &&
+        s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
+        s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
+        s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
+        ret = 0;
     }
     if(flag==1 && sizeof(unsigned long)==8) {
-	ull = 0xffffffffffffffffUL;
-	ld = (long double)ull;
-	memcpy(s, &ld, 16);
-	/* Use a different value from signed long to test. The problem is the same
-	 * for both long and unsigned long. The value is 18446744073709551615.
-	 * The library converts the value to 0x43effffffffffffffe000000000000000.
-	 * In decimal it's 18446744073709548544.000000, very different from the original.
-	 * The IBM Power6 Linux converts it to 0x43f0000000000000bff0000000000000.
-	 * The value is correct in decimal. It uses some special
-	 * algorithm.  We're going to define the macro and skip the test until
-	 * we can figure out how they do it. */
-	if(s[0]==0x43 && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
-		s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
-		s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
-		s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
-	    ret = 0;
+    ull = 0xffffffffffffffffUL;
+    ld = (long double)ull;
+    memcpy(s, &ld, 16);
+    /* Use a different value from signed long to test. The problem is the same
+    * for both long and unsigned long. The value is 18446744073709551615.
+    * The library converts the value to 0x43effffffffffffffe000000000000000.
+    * In decimal it's 18446744073709548544.000000, very different from the original.
+    * The IBM Power6 Linux converts it to 0x43f0000000000000bff0000000000000.
+    * The value is correct in decimal. It uses some special
+    * algorithm.  We're going to define the macro and skip the test until
+    * we can figure out how they do it. */
+    if(s[0]==0x43 && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
+        s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
+        s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
+        s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
+        ret = 0;
     }
 done:
     exit(ret);
@@ -138,7 +149,7 @@ done:
 #include <string.h>
 #include <stdlib.h>
 
-int main(void)
+int main(void) HDF_NO_UBSAN
 {
     long double         ld = 20041683600089727.779961L;
     long long           ll;
@@ -181,7 +192,7 @@ done:
 #include <string.h>
 #include <stdlib.h>
 
-int main(void)
+int main(void) HDF_NO_UBSAN
 {
     long double         ld;
     long long           ll;
@@ -243,7 +254,7 @@ int FC_DUMMY_MAIN()
 #endif
 #endif
 int
-main ()
+main () HDF_NO_UBSAN
 {
 
     char *chp = "beefs";
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index a414cea..56277fa 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -49,9 +49,9 @@ if (HDF5_DISABLE_COMPILER_WARNINGS)
   if (MSVC)
     set (HDF5_WARNINGS_BLOCKED 1)
     string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w")
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W0")
     string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W0")
   endif ()
   if (WIN32)
     add_definitions (-D_CRT_SECURE_NO_WARNINGS)
diff --git a/config/cmake_ext_mod/CheckTypeSize.cmake b/config/cmake_ext_mod/CheckTypeSize.cmake
deleted file mode 100644
index c14c2f2..0000000
--- a/config/cmake_ext_mod/CheckTypeSize.cmake
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright by The HDF Group.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
-# If you do not have access to either file, you may request a copy from
-# help@hdfgroup.org.
-#
-#
-# Check if the type exists and determine size of type.  if the type
-# exists, the size will be stored to the variable.
-#
-# CHECK_TYPE_SIZE - macro which checks the size of type
-# VARIABLE - variable to store size if the type exists.
-# HAVE_${VARIABLE} - does the variable exists or not
-#
-
-macro (HDF_CHECK_TYPE_SIZE TYPE VARIABLE)
-  set (CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)
-  if ("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
-    set (MACRO_CHECK_TYPE_SIZE_FLAGS
-        "-DCHECK_TYPE_SIZE_TYPE=\"${TYPE}\" ${CMAKE_REQUIRED_FLAGS}"
-    )
-    foreach (def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H HAVE_INTTYPES_H)
-      if ("${def}")
-        set (MACRO_CHECK_TYPE_SIZE_FLAGS "${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}")
-      endif ()
-    endforeach ()
-
-    message (STATUS "Check size of ${TYPE}")
-    if (CMAKE_REQUIRED_LIBRARIES)
-      set (CHECK_TYPE_SIZE_ADD_LIBRARIES
-          "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-      )
-    endif ()
-    try_run (${VARIABLE} HAVE_${VARIABLE}
-        ${CMAKE_BINARY_DIR}
-        ${HDF_RESOURCES_EXT_DIR}/CheckTypeSize.c
-        CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS}
-        "${CHECK_TYPE_SIZE_ADD_LIBRARIES}"
-        OUTPUT_VARIABLE OUTPUT
-    )
-    if (HAVE_${VARIABLE})
-      message (STATUS "Check size of ${TYPE} - done")
-      file (APPEND
-          ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
-          "Determining size of ${TYPE} passed with the following output:\n${OUTPUT}\n\n"
-      )
-    else ()
-      message (STATUS "Check size of ${TYPE} - failed")
-      file (APPEND
-          ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
-          "Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\n\n"
-      )
-    endif ()
-  endif ()
-  set (CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS)
-endmacro ()
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake
index 56d45f9..3797768 100644
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@@ -12,18 +12,18 @@
 #-----------------------------------------------------------------------------
 # Include all the necessary files for macros
 #-----------------------------------------------------------------------------
-include (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
-include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
-include (${CMAKE_ROOT}/Modules/CheckIncludeFileCXX.cmake)
-include (${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake)
-include (${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
-include (${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
-include (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
-include (${CMAKE_ROOT}/Modules/CheckVariableExists.cmake)
-include (${CMAKE_ROOT}/Modules/CheckFortranFunctionExists.cmake)
-include (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
+include (CheckFunctionExists)
+include (CheckIncludeFile)
+include (CheckIncludeFileCXX)
+include (CheckIncludeFiles)
+include (CheckLibraryExists)
+include (CheckSymbolExists)
+include (CheckTypeSize)
+include (CheckVariableExists)
+include (CheckFortranFunctionExists)
+include (TestBigEndian)
 if (CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER_LOADED)
-  include (${CMAKE_ROOT}/Modules/TestForSTDNamespace.cmake)
+  include (TestForSTDNamespace)
 endif ()
 
 #-----------------------------------------------------------------------------
@@ -145,7 +145,7 @@ endif ()
 
 # For other specific tests, use this MACRO.
 macro (HDF_FUNCTION_TEST OTHER_TEST)
-  if ("${HDF_PREFIX}_${OTHER_TEST}" MATCHES "^${HDF_PREFIX}_${OTHER_TEST}$")
+  if (NOT DEFINED ${HDF_PREFIX}_${OTHER_TEST})
     set (MACRO_CHECK_FUNCTION_DEFINITIONS "-D${OTHER_TEST} ${CMAKE_REQUIRED_FLAGS}")
     set (OTHER_TEST_ADD_LIBRARIES)
     if (CMAKE_REQUIRED_LIBRARIES)
@@ -587,7 +587,7 @@ endif ()
 
 # For other CXX specific tests, use this MACRO.
 macro (HDF_CXX_FUNCTION_TEST OTHER_TEST)
-  if ("${OTHER_TEST}" MATCHES "^${OTHER_TEST}$")
+  if (NOT DEFINED ${OTHER_TEST})
     set (MACRO_CHECK_FUNCTION_DEFINITIONS "-D${OTHER_TEST} ${CMAKE_REQUIRED_FLAGS}")
     set (OTHER_TEST_ADD_LIBRARIES)
     if (CMAKE_REQUIRED_LIBRARIES)
@@ -656,7 +656,7 @@ endif ()
 if (WINDOWS)
   if (NOT HDF_NO_IOEO_TEST)
   message (STATUS "Checking for InitOnceExecuteOnce:")
-  if ("${${HDF_PREFIX}_HAVE_IOEO}" MATCHES "^${${HDF_PREFIX}_HAVE_IOEO}$")
+  if (NOT DEFINED ${${HDF_PREFIX}_HAVE_IOEO})
     if (LARGEFILE)
       set (CMAKE_REQUIRED_DEFINITIONS
           "${CURRENT_TEST_DEFINITIONS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE"
diff --git a/config/cmake_ext_mod/HDFTests.c b/config/cmake_ext_mod/HDFTests.c
index 60ac744..320fd5b 100644
--- a/config/cmake_ext_mod/HDFTests.c
+++ b/config/cmake_ext_mod/HDFTests.c
@@ -222,12 +222,26 @@ SIMPLE_TEST(struct stat sb; sb.st_blocks=0);
 #include <stdlib.h>
 #include <string.h>
 
+#if defined(_MSC_VER) && defined(_DEBUG)
+# include <crtdbg.h>
+int DebugReport(int reportType, char* message, int* returnValue)
+{
+  (void)reportType;
+  (void)message;
+  (void)returnValue;
+  return 1; /* no further handling required */
+}
+#endif
+
 int main(void)
 {
   char *llwidthArgs[] = { "I64", "l64", "l", "L", "q", "ll", NULL };
   char *s = malloc(128);
   char **currentArg = NULL;
   LL_TYPE x = (LL_TYPE)1048576 * (LL_TYPE)1048576;
+  #if defined(_MSC_VER) && defined(_DEBUG)
+    _CrtSetReportHook(DebugReport);
+  #endif
   for (currentArg = llwidthArgs; *currentArg != NULL; currentArg++)
     {
     char formatString[64];