From 549bab83d1d7fa7bb0a15f7852ccffc708d70ab0 Mon Sep 17 00:00:00 2001
From: Gaming4JC <g4jc@hyperbola.info>
Date: Sat, 8 Jun 2019 19:28:18 -0400
Subject: 1320408 - Part 7: Remove JSContext* parameter from
 JSObject::shouldSplicePrototype.

---
 js/src/builtin/Object.cpp | 2 +-
 js/src/jsobj.h            | 2 +-
 js/src/vm/ObjectGroup.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/src')

diff --git a/js/src/builtin/Object.cpp b/js/src/builtin/Object.cpp
index a6dcab099..56c77f304 100644
--- a/js/src/builtin/Object.cpp
+++ b/js/src/builtin/Object.cpp
@@ -1408,7 +1408,7 @@ FinishObjectClassInit(JSContext* cx, JS::HandleObject ctor, JS::HandleObject pro
      * only set the [[Prototype]] if it hasn't already been set.
      */
     Rooted<TaggedProto> tagged(cx, TaggedProto(proto));
-    if (global->shouldSplicePrototype(cx)) {
+    if (global->shouldSplicePrototype()) {
         if (!JSObject::splicePrototype(cx, global, global->getClass(), tagged))
             return false;
     }
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index bdfe75b92..bdd08cf96 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -446,7 +446,7 @@ class JSObject : public js::gc::Cell
      * For bootstrapping, whether to splice a prototype for Function.prototype
      * or the global object.
      */
-    bool shouldSplicePrototype(JSContext* cx);
+    bool shouldSplicePrototype();
 
     /*
      * Environment chains.
diff --git a/js/src/vm/ObjectGroup.cpp b/js/src/vm/ObjectGroup.cpp
index fbad85e57..bbbac743d 100644
--- a/js/src/vm/ObjectGroup.cpp
+++ b/js/src/vm/ObjectGroup.cpp
@@ -249,7 +249,7 @@ ObjectGroup::useSingletonForAllocationSite(JSScript* script, jsbytecode* pc, con
 /////////////////////////////////////////////////////////////////////
 
 bool
-JSObject::shouldSplicePrototype(JSContext* cx)
+JSObject::shouldSplicePrototype()
 {
     /*
      * During bootstrapping, if inference is enabled we need to make sure not
-- 
cgit v1.2.3