Merge pull request #1196 from g4jc/feed_spidermonkey

Issue #1195 - Fix errant use of JSContext in ErrorNotes

1 files changed, 4 insertions, 4 deletions

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 7cc7bd035..84a315587 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -6326,7 +6326,7 @@ JSErrorNotes::~JSErrorNotes()
 }
 
 static UniquePtr<JSErrorNotes::Note>
-CreateErrorNoteVA(JSContext* cx,
+CreateErrorNoteVA(ExclusiveContext* cx,
                   const char* filename, unsigned lineno, unsigned column,
                   JSErrorCallback errorCallback, void* userRef,
                   const unsigned errorNumber,
@@ -6357,7 +6357,7 @@ JSErrorNotes::addNoteASCII(ExclusiveContext* cx,
 {
     va_list ap;
     va_start(ap, errorNumber);
-    auto note = CreateErrorNoteVA(cx->asJSContext(), filename, lineno, column, errorCallback, userRef,
+    auto note = CreateErrorNoteVA(cx, filename, lineno, column, errorCallback, userRef,
                                   errorNumber, ArgumentsAreASCII, ap);
     va_end(ap);
 
@@ -6376,7 +6376,7 @@ JSErrorNotes::addNoteLatin1(ExclusiveContext* cx,
 {
     va_list ap;
     va_start(ap, errorNumber);
-    auto note = CreateErrorNoteVA(cx->asJSContext(), filename, lineno, column, errorCallback, userRef,
+    auto note = CreateErrorNoteVA(cx, filename, lineno, column, errorCallback, userRef,
                                   errorNumber, ArgumentsAreLatin1, ap);
     va_end(ap);
 
@@ -6395,7 +6395,7 @@ JSErrorNotes::addNoteUTF8(ExclusiveContext* cx,
 {
     va_list ap;
     va_start(ap, errorNumber);
-    auto note = CreateErrorNoteVA(cx->asJSContext(), filename, lineno, column, errorCallback, userRef,
+    auto note = CreateErrorNoteVA(cx, filename, lineno, column, errorCallback, userRef,
                                   errorNumber, ArgumentsAreUTF8, ap);
     va_end(ap);