Import wiredtiger: 3de99431f6beb47147939e2b380a242bfaaa4c63 from branch mongodb-master

ref: c4d67162cd..3de99431f6
for: 6.1.0-rc0

WT-9209 Cannot build Release build with ENABLE_STRICT enabled (#8183)

8 files changed, 13 insertions, 19 deletions

diff --git a/src/third_party/wiredtiger/bench/wtperf/wtperf.c b/src/third_party/wiredtiger/bench/wtperf/wtperf.c
index ab04fa7fa58..2cb4a8a3f40 100644
--- a/src/third_party/wiredtiger/bench/wtperf/wtperf.c
+++ b/src/third_party/wiredtiger/bench/wtperf/wtperf.c
@@ -1052,7 +1052,7 @@ monitor(void *arg)
 
     wtperf = (WTPERF *)arg;
     opts = wtperf->opts;
-    assert(opts->sample_interval != 0);
+    testutil_assert(opts->sample_interval != 0);
 
     fp = jfp = NULL;
     first = true;
diff --git a/src/third_party/wiredtiger/bench/wtperf/wtperf.h b/src/third_party/wiredtiger/bench/wtperf/wtperf.h
index b7d679b8f49..ff3b937a651 100644
--- a/src/third_party/wiredtiger/bench/wtperf/wtperf.h
+++ b/src/third_party/wiredtiger/bench/wtperf/wtperf.h
@@ -31,7 +31,6 @@
 
 #include "test_util.h"
 
-#include <assert.h>
 #include <math.h>
 
 #include "config_opt.h"
diff --git a/src/third_party/wiredtiger/ext/test/fail_fs/fail_fs.c b/src/third_party/wiredtiger/ext/test/fail_fs/fail_fs.c
index f209a33dec9..efefea64c78 100644
--- a/src/third_party/wiredtiger/ext/test/fail_fs/fail_fs.c
+++ b/src/third_party/wiredtiger/ext/test/fail_fs/fail_fs.c
@@ -39,6 +39,7 @@
 
 #include <wiredtiger_ext.h>
 #include "queue.h"
+#include "test_util.h"
 
 #define FAIL_FS_GIGABYTE (1024 * 1024 * 1024)
 
@@ -115,25 +116,25 @@ static int fail_fs_terminate(WT_FILE_SYSTEM *, WT_SESSION *);
 static void
 fail_fs_allocate_lock(pthread_rwlock_t *lockp)
 {
-    assert(pthread_rwlock_init(lockp, NULL) == 0);
+    testutil_assert(pthread_rwlock_init(lockp, NULL) == 0);
 }
 
 static void
 fail_fs_destroy_lock(pthread_rwlock_t *lockp)
 {
-    assert(pthread_rwlock_destroy(lockp) == 0);
+    testutil_assert(pthread_rwlock_destroy(lockp) == 0);
 }
 
 static void
 fail_fs_lock(pthread_rwlock_t *lockp)
 {
-    assert(pthread_rwlock_wrlock(lockp) == 0);
+    testutil_assert(pthread_rwlock_wrlock(lockp) == 0);
 }
 
 static void
 fail_fs_unlock(pthread_rwlock_t *lockp)
 {
-    assert(pthread_rwlock_unlock(lockp) == 0);
+    testutil_assert(pthread_rwlock_unlock(lockp) == 0);
 }
 
 /*
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index fb34397a18d..885f52ecbca 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
     "vendor": "wiredtiger",
     "github": "wiredtiger/wiredtiger.git",
     "branch": "mongodb-master",
-    "commit": "c4d67162cd2f6a6c9876eaec4fb626c5867e0eaf"
+    "commit": "3de99431f6beb47147939e2b380a242bfaaa4c63"
 }
diff --git a/src/third_party/wiredtiger/src/utilities/util_dump.c b/src/third_party/wiredtiger/src/utilities/util_dump.c
index d1d5de1fcf6..7693730d526 100755
--- a/src/third_party/wiredtiger/src/utilities/util_dump.c
+++ b/src/third_party/wiredtiger/src/utilities/util_dump.c
@@ -6,7 +6,6 @@
  * See the file LICENSE for redistribution information.
  */
 
-#include <assert.h>
 #include "util.h"
 #include "util_dump.h"
 
@@ -422,8 +421,8 @@ dump_projection(WT_SESSION *session, const char *config, WT_CURSOR *cursor, char
 
             /* copy names of projected values */
             p = strchr(cursor->uri, '(');
-            assert(p != NULL);
-            assert(p[strlen(p) - 1] == ')');
+            WT_ASSERT((WT_SESSION_IMPL *)session, p != NULL);
+            WT_ASSERT((WT_SESSION_IMPL *)session, p[strlen(p) - 1] == ')');
             p++;
             if (*p != ')')
                 WT_RET(dump_add_config(session, &newconfig, &len, "%s", ","));
@@ -437,7 +436,7 @@ dump_projection(WT_SESSION *session, const char *config, WT_CURSOR *cursor, char
     if (ret != WT_NOTFOUND)
         return (util_err(session, ret, "WT_CONFIG_PARSER.next"));
 
-    assert(len > 0);
+    WT_ASSERT((WT_SESSION_IMPL *)session, len > 0);
     if ((ret = parser->close(parser)) != 0)
         return (util_err(session, ret, "WT_CONFIG_PARSER.close"));
 
diff --git a/src/third_party/wiredtiger/test/fuzz/config/fuzz_config.c b/src/third_party/wiredtiger/test/fuzz/config/fuzz_config.c
index 728ca36e849..d25e311ab61 100644
--- a/src/third_party/wiredtiger/test/fuzz/config/fuzz_config.c
+++ b/src/third_party/wiredtiger/test/fuzz/config/fuzz_config.c
@@ -27,8 +27,6 @@
  */
 #include "fuzz_util.h"
 
-#include <assert.h>
-
 int LLVMFuzzerTestOneInput(const uint8_t *, size_t);
 
 /*
@@ -50,7 +48,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
     if (!fuzzutil_sliced_input_init(&input, data, size, separator, sizeof(separator), 2))
         return (0);
 
-    assert(input.num_slices == 2);
+    testutil_assert(input.num_slices == 2);
     key = fuzzutil_slice_to_cstring(input.slices[0], input.sizes[0]);
     if (key == NULL)
         testutil_die(ENOMEM, "Failed to allocate key");
diff --git a/src/third_party/wiredtiger/test/fuzz/fuzz_util.c b/src/third_party/wiredtiger/test/fuzz/fuzz_util.c
index 039269e2584..d50d611032d 100644
--- a/src/third_party/wiredtiger/test/fuzz/fuzz_util.c
+++ b/src/third_party/wiredtiger/test/fuzz/fuzz_util.c
@@ -27,7 +27,6 @@
  */
 #include "fuzz_util.h"
 
-#include <assert.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -61,7 +60,7 @@ fuzzutil_setup(void)
     char home[100];
 
     if (fuzz_state.conn != NULL) {
-        assert(fuzz_state.session != NULL);
+        testutil_assert(fuzz_state.session != NULL);
         return;
     }
 
diff --git a/src/third_party/wiredtiger/test/salvage/salvage.c b/src/third_party/wiredtiger/test/salvage/salvage.c
index 8aa94a6ee96..0bf29bf810e 100644
--- a/src/third_party/wiredtiger/test/salvage/salvage.c
+++ b/src/third_party/wiredtiger/test/salvage/salvage.c
@@ -28,8 +28,6 @@
 
 #include "test_util.h"
 
-#include <assert.h>
-
 #define HOME "WT_TEST"
 #define DUMP "WT_TEST/__slvg.dump"   /* Dump file */
 #define LOAD "WT_TEST/__slvg.load"   /* Build file */
@@ -545,7 +543,7 @@ build(int ikey, int ivalue, int cnt)
           PSIZE, PSIZE, PSIZE, OSIZE, OSIZE));
         break;
     default:
-        assert(0);
+        testutil_assert(0);
     }
     testutil_check(session->create(session, LOAD_URI, config));
     testutil_check(session->open_cursor(session, LOAD_URI, NULL, "bulk,append", &cursor));