Bug 1703469: Remove redundant function arg r=jandem

We're always using the canonical function here anyway.

Differential Revision: https://phabricator.services.mozilla.com/D251757

Author: iainireland

js/src/jit/CompileInfo.h

@@ -66,11 +66,11 @@ inline unsigned CountArgSlots(JSScript* script, bool hasFun,
 // Contains information about the compilation source for IR being generated.
 class CompileInfo {
  public:
-  CompileInfo(CompileRuntime* runtime, JSScript* script, JSFunction* fun,
+  CompileInfo(CompileRuntime* runtime, JSScript* script,
               jsbytecode* osrPc, bool scriptNeedsArgsObj,
               InlineScriptTree* inlineScriptTree)
       : script_(script),
-        fun_(fun),
+        fun_(script->function()),
         osrPc_(osrPc),
         scriptNeedsArgsObj_(scriptNeedsArgsObj),
         hadEagerTruncationBailout_(script->hadEagerTruncationBailout()),
@@ -89,18 +89,9 @@ class CompileInfo {
             runtime->hasSeenArrayExceedsInt32LengthFuseIntact()) {
     MOZ_ASSERT_IF(osrPc, JSOp(*osrPc) == JSOp::LoopHead);
 
-    // The function here can flow in from anywhere so look up the canonical
-    // function to ensure that we do not try to embed a nursery pointer in
-    // jit-code. Precisely because it can flow in from anywhere, it's not
-    // guaranteed to be non-lazy. Hence, don't access its script!
-    if (fun_) {
-      fun_ = fun_->baseScript()->function();
-      MOZ_ASSERT(fun_->isTenured());
-    }
-
     nimplicit_ = StartArgSlot(script) /* env chain and argument obj */
-                 + (fun ? 1 : 0);     /* this */
-    nargs_ = fun ? fun->nargs() : 0;
+                 + (fun_ ? 1 : 0);    /* this */
+    nargs_ = fun_ ? fun_->nargs() : 0;
     nlocals_ = script->nfixed();
 
     // An extra slot is needed for global scopes because InitGLexical (stack
@@ -134,7 +125,7 @@ class CompileInfo {
     // will need to be observable.
     needsBodyEnvironmentObject_ = script->needsBodyEnvironment();
     funNeedsSomeEnvironmentObject_ =
-        fun ? fun->needsSomeEnvironmentObject() : false;
+        fun_ ? fun_->needsSomeEnvironmentObject() : false;
   }
 
   explicit CompileInfo(unsigned nlocals)

js/src/jit/Ion.cpp

@@ -1779,7 +1779,7 @@ static AbortReason IonCompile(JSContext* cx, HandleScript script,
   }
 
   CompileInfo* info = alloc->new_<CompileInfo>(
-      CompileRuntime::get(cx->runtime()), script, script->function(), osrPc,
+      CompileRuntime::get(cx->runtime()), script, osrPc,
       script->needsArgsObj(), inlineScriptTree);
   if (!info) {
     return AbortReason::Alloc;

js/src/jit/WarpOracle.cpp

@@ -1069,8 +1069,7 @@ AbortReasonOr<bool> WarpScriptOracle::maybeInlineCall(
   jsbytecode* osrPc = nullptr;
   bool needsArgsObj = targetScript->needsArgsObj();
   CompileInfo* info = lifoAlloc->new_<CompileInfo>(
-      mirGen_.runtime, targetScript, targetFunction, osrPc, needsArgsObj,
-      inlineScriptTree);
+      mirGen_.runtime, targetScript, osrPc, needsArgsObj, inlineScriptTree);
   if (!info) {
     return abort(AbortReason::Alloc);
   }