Commit 4fedbf07 authored by Philip Chimento's avatar Philip Chimento 🚮

Merge branch 'june-maintenance' into 'master'

June maintenance

See merge request GNOME/gjs!459
parents d82c7ae4 0d10efac
Pipeline #194099 passed with stages
in 4 minutes and 28 seconds
......@@ -32,6 +32,7 @@
#include "gjs/macros.h"
class JSTracer;
namespace JS {
class HandleValueArray;
}
......
......@@ -38,6 +38,7 @@
#include <js/CallArgs.h>
#include <js/Conversions.h>
#include <js/TypeDecls.h>
#include <jsapi.h> // for JS_ClearPendingException
#include "gjs/jsapi-util.h"
#include "gjs/macros.h"
......
......@@ -6,7 +6,7 @@ ARG BUILD_OPTS=
ENV SHELL=/bin/bash
RUN dnf -y install 'dnf-command(builddep)' git make which
RUN dnf -y install 'dnf-command(builddep)' git make which llvm-devel
RUN dnf -y builddep mozjs68
WORKDIR /root
......
......@@ -24,6 +24,12 @@ namespace mozilla {
union Utf8Unit;
}
// COMPAT: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1553
#ifdef __clang_analyzer__
void g_assertion_message(const char*, const char*, int, const char*,
const char*) __attribute__((analyzer_noreturn));
#endif
#define assert_match(str, pattern) \
G_STMT_START { \
const char *__s1 = (str), *__s2 = (pattern); \
......
......@@ -33,6 +33,12 @@
#include "test/gjs-test-common.h"
// COMPAT: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1553
#ifdef __clang_analyzer__
void g_assertion_message(const char*, const char*, int, const char*,
const char*) __attribute__((analyzer_noreturn));
#endif
char* gjs_test_get_exception_message(JSContext* cx) {
if (!JS_IsExceptionPending(cx))
return nullptr;
......
......@@ -36,6 +36,12 @@
#include "gjs/coverage.h"
#include "gjs/jsapi-util.h"
// COMPAT: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1553
#ifdef __clang_analyzer__
void g_assertion_message(const char*, const char*, int, const char*,
const char*) __attribute__((analyzer_noreturn));
#endif
typedef struct _GjsCoverageFixture {
GjsContext *context;
GjsCoverage *coverage;
......
......@@ -12,6 +12,12 @@
#include "gjs/jsapi-util-root.h"
#include "test/gjs-test-utils.h"
// COMPAT: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1553
#ifdef __clang_analyzer__
void g_assertion_message(const char*, const char*, int, const char*,
const char*) __attribute__((analyzer_noreturn));
#endif
static GMutex gc_lock;
static GCond gc_finished;
static volatile int gc_counter;
......
......@@ -46,6 +46,12 @@
#include "test/gjs-test-utils.h"
#include "util/misc.h"
// COMPAT: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1553
#ifdef __clang_analyzer__
void g_assertion_message(const char*, const char*, int, const char*,
const char*) __attribute__((analyzer_noreturn));
#endif
#define VALID_UTF8_STRING "\303\211\303\226 foobar \343\203\237"
static void
......
......@@ -41,7 +41,6 @@ FWD_DECLS_IN_HEADER = (
'struct JSRuntime;',
'class JSScript;',
'class JSString;',
'class JSTracer;',
'struct JSFreeOp;',
'namespace js { class TempAllocPolicy; }'
'namespace JS { struct PropertyKey; }',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment