refactor placement-new to avoid gcc-9.4 __builtin_memset bug

src/ArrayOfArraysView.hpp

@@ -639,7 +639,9 @@ class ArrayOfArraysView
    * @param defaultArrayCapacity the default capacity for each new array.
    */
   void resize( INDEX_TYPE const newSize, INDEX_TYPE const defaultArrayCapacity=0 )
-  { return resizeImpl( newSize, defaultArrayCapacity ); }
+  {
+    return resizeImpl( newSize, defaultArrayCapacity ); 
+  }
 
   /**
    * @brief Reserve space for the given number of arrays.

src/Macros.hpp

@@ -145,7 +145,7 @@
                                                                         "***** Block: [%u, %u, %u]\n" \
                                                                         "***** Thread: [%u, %u, %u]\n" \
                                                                         "***** Controlling expression (should be false): " STRINGIZE( EXP ) "\n" \
-                                                                                                                                            "***** MSG: " STRINGIZE( MSG ) "\n\n"; \
+                                                                        "***** MSG: " STRINGIZE( MSG ) "\n\n"; \
       printf( formatString, blockIdx.x, blockIdx.y, blockIdx.z, threadIdx.x, threadIdx.y, threadIdx.z ); \
       asm ( "trap;" ); \
     } \

src/arrayManipulation.hpp

@@ -292,29 +292,20 @@ void resize( T * const LVARRAY_RESTRICT ptr,
   // Delete things between newSize and size.
   destroy( ptr + newSize, size - newSize );
 
-  // Initialize things between size and newSize.
-  if( sizeof ... ( ARGS ) == 0 && std::is_trivially_default_constructible< T >::value )
+  if( newSize - size > 0 )
   {
-    if( newSize - size > 0 )
+    // Initialize things between size and newSize.
+    if constexpr ( sizeof ... ( ARGS ) == 0 && std::is_trivially_default_constructible< T >::value )
     {
       std::size_t const sizeDiff = integerConversion< std::size_t >( newSize - size );
-#if !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Warray-bounds"
-#pragma GCC diagnostic ignored "-Wstringop-overflow="
-#endif
-      memset( reinterpret_cast< void * >( ptr + size ), 0, ( sizeDiff ) * sizeof( T ) );
-#if !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+      std::memset( reinterpret_cast< void * >( ptr + size ), 0, ( sizeDiff ) * sizeof( T ) );
     }
-  }
-  else
-  {
-    // Use std::size_t so that when GCC optimizes this it doesn't produce sign warnings.
-    for( std::size_t i = size; i < std::size_t( newSize ); ++i )
+    else
     {
-      new ( ptr + i ) T( std::forward< ARGS >( args )... );
+      for( T * iptr = ptr + size; iptr < ptr + newSize; ++iptr )
+      {
+        new ( iptr ) T( std::forward< ARGS >( args )... );
+      }
     }
   }
 }

src/umpireInterface.cpp

@@ -71,7 +71,6 @@ void memset( void * const dstPointer, int const val, std::size_t const size )
     return rm.memset( dstPointer, val, size );
   }
 #endif
-
   std::memset( dstPointer, val, size );
 }