SERVER-33659 add fassertNoTrace overload that accepts StatusWith

1 files changed, 16 insertions, 0 deletions

diff --git a/src/mongo/util/assert_util.h b/src/mongo/util/assert_util.h
index ae00f8e4053..29406946151 100644
--- a/src/mongo/util/assert_util.h
+++ b/src/mongo/util/assert_util.h
@@ -269,6 +269,14 @@ inline void fassertWithLocation(int msgid, bool testOK, const char* file, unsign
     }
 }
 
+template <typename T>
+inline T fassertWithLocation(int msgid, StatusWith<T> sw, const char* file, unsigned line) {
+    if (MONGO_unlikely(!sw.isOK())) {
+        fassertFailedWithStatusWithLocation(msgid, sw.getStatus(), file, line);
+    }
+    return std::move(sw.getValue());
+}
+
 inline void fassertWithLocation(int msgid, const Status& status, const char* file, unsigned line) {
     if (MONGO_unlikely(!status.isOK())) {
         fassertFailedWithStatusWithLocation(msgid, status, file, line);
@@ -284,6 +292,14 @@ inline void fassertNoTraceWithLocation(int msgid, bool testOK, const char* file,
     }
 }
 
+template <typename T>
+inline T fassertNoTraceWithLocation(int msgid, StatusWith<T> sw, const char* file, unsigned line) {
+    if (MONGO_unlikely(!sw.isOK())) {
+        fassertFailedWithStatusNoTraceWithLocation(msgid, sw.getStatus(), file, line);
+    }
+    return std::move(sw.getValue());
+}
+
 inline void fassertNoTraceWithLocation(int msgid,
                                        const Status& status,
                                        const char* file,