From 739a81958035410ddd9b230354a56c909cc5c816 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sat, 8 Jun 2019 18:54:17 -0400 Subject: 1320408 - Part 2: Change JSFunction::getOrCreateScript to static method. --- js/src/jsscriptinlines.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/src/jsscriptinlines.h') diff --git a/js/src/jsscriptinlines.h b/js/src/jsscriptinlines.h index da23804ac..65abb5cb7 100644 --- a/js/src/jsscriptinlines.h +++ b/js/src/jsscriptinlines.h @@ -78,7 +78,8 @@ inline JSFunction* LazyScript::functionDelazifying(JSContext* cx) const { Rooted self(cx, this); - if (self->function_ && !self->function_->getOrCreateScript(cx)) + RootedFunction fun(cx, self->function_); + if (self->function_ && !JSFunction::getOrCreateScript(cx, fun)) return nullptr; return self->function_; } -- cgit v1.2.3 From 4d88f48fdb51a29fd66001e87a74e2d6a130fe1f Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sat, 8 Jun 2019 19:52:00 -0400 Subject: 1320408 - Part 10: Change LazyScript::functionDelazifying to static method. --- js/src/jsscriptinlines.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'js/src/jsscriptinlines.h') diff --git a/js/src/jsscriptinlines.h b/js/src/jsscriptinlines.h index 65abb5cb7..205a37f24 100644 --- a/js/src/jsscriptinlines.h +++ b/js/src/jsscriptinlines.h @@ -74,14 +74,13 @@ void SetFrameArgumentsObject(JSContext* cx, AbstractFramePtr frame, HandleScript script, JSObject* argsobj); -inline JSFunction* -LazyScript::functionDelazifying(JSContext* cx) const +/* static */ inline JSFunction* +LazyScript::functionDelazifying(JSContext* cx, Handle script) { - Rooted self(cx, this); - RootedFunction fun(cx, self->function_); - if (self->function_ && !JSFunction::getOrCreateScript(cx, fun)) + RootedFunction fun(cx, script->function_); + if (script->function_ && !JSFunction::getOrCreateScript(cx, fun)) return nullptr; - return self->function_; + return script->function_; } } // namespace js -- cgit v1.2.3 From 93335c3120968fac165a95978ef0dbdffe7900b4 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sat, 8 Jun 2019 21:10:15 -0400 Subject: 1320408 - Part 12: Change JSScript::sourceData to static method. --- js/src/jsscriptinlines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src/jsscriptinlines.h') diff --git a/js/src/jsscriptinlines.h b/js/src/jsscriptinlines.h index 205a37f24..e1052111b 100644 --- a/js/src/jsscriptinlines.h +++ b/js/src/jsscriptinlines.h @@ -100,7 +100,7 @@ JSScript::functionDelazifying() const } inline void -JSScript::ensureNonLazyCanonicalFunction(JSContext* cx) +JSScript::ensureNonLazyCanonicalFunction() { // Infallibly delazify the canonical script. JSFunction* fun = function(); -- cgit v1.2.3