Merge branch 'main' into timetests

Author: dschuff

ChangeLog.md

@@ -20,6 +20,10 @@ See docs/process.md for more on how version tagging works.
 
 3.1.71 (in development)
 -----------------------
+- LLVM's `-Wnontrivial-memaccess` warning has been updated to also warn about
+  passing non-trivially-copyable destrination parameter to `memcpy`,
+  `memset` and similar functions for which it is a documented undefined
+  behavior (#22798). See https://github.com/llvm/llvm-project/pull/111434
 
 3.1.70 - 10/25/24
 -----------------

test/other/test_strftime_zZ.c

@@ -4,8 +4,6 @@
 #include <time.h>
 
 int main() {
-  void tzset(void);
-
   // Buffer to hold the current hour of the day.  Format is HH + nul
   // character.
   char hour[3];
@@ -20,8 +18,9 @@ int main() {
 
   struct tm tm;
 
-  // Get the current timestamp.
-  const time_t now = time(NULL);
+  // Use a timestamp corresponding to July 2024, to avoid depending on the
+  // current time (which may fail e.g. when DST/summer-time changes).
+  const time_t now = 1719792000;
 
   // What time is that here?
   if (localtime_r(&now, &tm) == NULL) {

test/test_core.py

@@ -6748,6 +6748,7 @@ def test_bullet(self, use_cmake):
       '-Wno-format',
       '-Wno-bitfield-constant-conversion',
       '-Wno-int-to-void-pointer-cast',
+      '-Wno-nontrivial-memaccess',
     ]
 
     # extra testing for ASSERTIONS == 2
@@ -6771,7 +6772,7 @@ def test_bullet(self, use_cmake):
   @is_slow_test
   def test_poppler(self):
     # See https://github.com/emscripten-core/emscripten/issues/20757
-    self.emcc_args.append('-Wno-deprecated-declarations')
+    self.emcc_args.extend(['-Wno-deprecated-declarations', '-Wno-nontrivial-memaccess'])
     poppler = self.get_poppler_library()
     shutil.copy(test_file('poppler/paper.pdf'), '.')