diff options
| author | Gaming4JC <g4jc@hyperbola.info> | 2019-06-08 19:28:18 -0400 |
|---|---|---|
| committer | Gaming4JC <g4jc@hyperbola.info> | 2019-07-18 22:38:23 -0400 |
| commit | 549bab83d1d7fa7bb0a15f7852ccffc708d70ab0 (patch) | |
| tree | eb0867176e167abf8dcf2efdad91fa52522f556f | |
| parent | 6bbc8d66646f49a1aa8a02765c1111bb3a92ee80 (diff) | |
| download | UXP-549bab83d1d7fa7bb0a15f7852ccffc708d70ab0.tar UXP-549bab83d1d7fa7bb0a15f7852ccffc708d70ab0.tar.gz UXP-549bab83d1d7fa7bb0a15f7852ccffc708d70ab0.tar.lz UXP-549bab83d1d7fa7bb0a15f7852ccffc708d70ab0.tar.xz UXP-549bab83d1d7fa7bb0a15f7852ccffc708d70ab0.zip | |
1320408 - Part 7: Remove JSContext* parameter from JSObject::shouldSplicePrototype.
| -rw-r--r-- | js/src/builtin/Object.cpp | 2 | ||||
| -rw-r--r-- | js/src/jsobj.h | 2 | ||||
| -rw-r--r-- | js/src/vm/ObjectGroup.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
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 |