From 3765f057896718bfca3056728a485448bfb411cb Mon Sep 17 00:00:00 2001
From: Gaming4JC <g4jc@hyperbola.info>
Date: Sun, 7 Jul 2019 14:41:27 -0400
Subject: Make JSErrorNotes Single Threaded

---
 js/src/jsapi.cpp | 12 ++++++------
 js/src/jsapi.h   |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'js/src')

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 8cb3e5802..7cc7bd035 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -6350,14 +6350,14 @@ CreateErrorNoteVA(JSContext* cx,
 }
 
 bool
-JSErrorNotes::addNoteASCII(JSContext* cx,
+JSErrorNotes::addNoteASCII(ExclusiveContext* cx,
                            const char* filename, unsigned lineno, unsigned column,
                            JSErrorCallback errorCallback, void* userRef,
                            const unsigned errorNumber, ...)
 {
     va_list ap;
     va_start(ap, errorNumber);
-    auto note = CreateErrorNoteVA(cx, filename, lineno, column, errorCallback, userRef,
+    auto note = CreateErrorNoteVA(cx->asJSContext(), filename, lineno, column, errorCallback, userRef,
                                   errorNumber, ArgumentsAreASCII, ap);
     va_end(ap);
 
@@ -6369,14 +6369,14 @@ JSErrorNotes::addNoteASCII(JSContext* cx,
 }
 
 bool
-JSErrorNotes::addNoteLatin1(JSContext* cx,
+JSErrorNotes::addNoteLatin1(ExclusiveContext* cx,
                             const char* filename, unsigned lineno, unsigned column,
                             JSErrorCallback errorCallback, void* userRef,
                             const unsigned errorNumber, ...)
 {
     va_list ap;
     va_start(ap, errorNumber);
-    auto note = CreateErrorNoteVA(cx, filename, lineno, column, errorCallback, userRef,
+    auto note = CreateErrorNoteVA(cx->asJSContext(), filename, lineno, column, errorCallback, userRef,
                                   errorNumber, ArgumentsAreLatin1, ap);
     va_end(ap);
 
@@ -6388,14 +6388,14 @@ JSErrorNotes::addNoteLatin1(JSContext* cx,
 }
 
 bool
-JSErrorNotes::addNoteUTF8(JSContext* cx,
+JSErrorNotes::addNoteUTF8(ExclusiveContext* cx,
                           const char* filename, unsigned lineno, unsigned column,
                           JSErrorCallback errorCallback, void* userRef,
                           const unsigned errorNumber, ...)
 {
     va_list ap;
     va_start(ap, errorNumber);
-    auto note = CreateErrorNoteVA(cx, filename, lineno, column, errorCallback, userRef,
+    auto note = CreateErrorNoteVA(cx->asJSContext(), filename, lineno, column, errorCallback, userRef,
                                   errorNumber, ArgumentsAreUTF8, ap);
     va_end(ap);
 
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 99100620a..d00562588 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -5438,15 +5438,15 @@ class JSErrorNotes
     ~JSErrorNotes();
 
     // Add an note to the given position.
-    bool addNoteASCII(JSContext* cx,
+    bool addNoteASCII(js::ExclusiveContext* cx,
                       const char* filename, unsigned lineno, unsigned column,
                       JSErrorCallback errorCallback, void* userRef,
                       const unsigned errorNumber, ...);
-    bool addNoteLatin1(JSContext* cx,
+    bool addNoteLatin1(js::ExclusiveContext* cx,
                        const char* filename, unsigned lineno, unsigned column,
                        JSErrorCallback errorCallback, void* userRef,
                        const unsigned errorNumber, ...);
-    bool addNoteUTF8(JSContext* cx,
+    bool addNoteUTF8(js::ExclusiveContext* cx,
                      const char* filename, unsigned lineno, unsigned column,
                      JSErrorCallback errorCallback, void* userRef,
                      const unsigned errorNumber, ...);
-- 
cgit v1.2.3