Skip to content

SERVER-118939 Add support for mozJS build compatibility for 8.0 backport #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aditya8061 merged 3 commits into from
Feb 5, 2026
Merged

SERVER-118939 Add support for mozJS build compatibility for 8.0 backport #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbb2635
SERVER-118939 Add support for mozJS build compatibility for 8.0 backport
aditya8061 Feb 4, 2026
dd7573c
Merge spidermonkey-esr140.7-cpp-only to resolve conflicts
aditya8061 Feb 5, 2026
e68276c
Address review comments and remove .github dir
aditya8061 Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .github/workflows/README
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/close-pr.yml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions js/public/experimental/LoggingInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

// MONGODB MODIFICATION: fmt version compatibility macro for Mongo v8.0 and below.
#if defined(FMT_VERSION) && FMT_VERSION >= 80000
# define JS_FORMAT_STRING(...) fmt::format_string<__VA_ARGS__>
# define FMT_FORMAT_STRING(...) fmt::format_string<__VA_ARGS__>
#else
# define JS_FORMAT_STRING(...) fmt::string_view
# define FMT_FORMAT_STRING(...) fmt::string_view
#endif

struct JSContext;
Expand Down Expand Up @@ -84,7 +84,7 @@ struct LoggingInterface {

template <typename... T>
void logPrintFmt(const OpaqueLogger aModule, mozilla::LogLevel aLevel,
JS_FORMAT_STRING(T...) aFmt, T&&... aArgs) {
FMT_FORMAT_STRING(T...) aFmt, T&&... aArgs) {
JS::AutoSuppressGCAnalysis suppress;
this->logPrintFMT(aModule, aLevel, aFmt, fmt::make_format_args(aArgs...));
}
Expand Down
1 change: 1 addition & 0 deletions mfbt/StringBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "mozilla/RefCounted.h"
#include "mozmemory.h"
// MONGODB MODIFICATION: Explicitly include Utility.h for arena allocation functions.
// Needed for backports to 8.0 and earlier due to clang-format header ordering changes (SERVER-105050).
#include "js/Utility.h"

namespace mozilla {
Expand Down