Bug 1598548 part 9 - Simplify IonBuilder::analyzeNewLoopTypes signature a bit. r=tcampbell

It's now always called from IonBuilder::jsop_loophead.

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

--HG--
extra : moz-landing-system : lando

js/src/jit/IonBuilder.cpp

@@ -545,11 +545,9 @@ IonBuilder::InliningDecision IonBuilder::canInlineTarget(JSFunction* target,
 }
 
 AbortReasonOr<Ok> IonBuilder::analyzeNewLoopTypes(MBasicBlock* entry,
-                                                  jsbytecode* loopHeadPc,
-                                                  jsbytecode* loopStartPc,
                                                   jsbytecode* loopStopPc) {
   MOZ_ASSERT(!entry->isDead());
-  MOZ_ASSERT(JSOp(*loopHeadPc) == JSOP_LOOPHEAD);
+  MOZ_ASSERT(JSOp(*pc) == JSOP_LOOPHEAD);
 
   // The phi inputs at the loop head only reflect types for variables that
   // were present at the start of the loop. If the variable changes to a new
@@ -571,7 +569,7 @@ AbortReasonOr<Ok> IonBuilder::analyzeNewLoopTypes(MBasicBlock* entry,
   // also pick up types discovered while previously building the loop body.
   bool foundEntry = false;
   for (size_t i = 0; i < loopHeaders_.length(); i++) {
-    if (loopHeaders_[i].pc == loopHeadPc) {
+    if (loopHeaders_[i].pc == pc) {
       MBasicBlock* oldEntry = loopHeaders_[i].header;
 
       // If this block has been discarded, its resume points will have
@@ -607,14 +605,13 @@ AbortReasonOr<Ok> IonBuilder::analyzeNewLoopTypes(MBasicBlock* entry,
     }
   }
   if (!foundEntry) {
-    if (!loopHeaders_.append(LoopHeader(loopHeadPc, entry))) {
+    if (!loopHeaders_.append(LoopHeader(pc, entry))) {
       return abort(AbortReason::Alloc);
     }
   }
 
   // Get the start and end bytecode locations of this loop.
-  BytecodeLocation start(script_, loopStartPc);
-  start = start.next();
+  BytecodeLocation start(script_, pc);
   BytecodeLocation end(script_, loopStopPc);
 
   // Iterate the bytecode quickly to seed possible types in the loopheader.
@@ -1845,7 +1842,7 @@ AbortReasonOr<Ok> IonBuilder::jsop_loophead() {
     return abort(AbortReason::Alloc);
   }
 
-  MOZ_TRY(analyzeNewLoopTypes(header, pc, pc, backjump));
+  MOZ_TRY(analyzeNewLoopTypes(header, backjump));
 
   MOZ_TRY(startTraversingBlock(header));
   return emitLoopHeadInstructions(pc);

js/src/jit/IonBuilder.h

@@ -220,8 +220,6 @@ class IonBuilder : public MIRGenerator,
                                        uint32_t maxTargets);
 
   AbortReasonOr<Ok> analyzeNewLoopTypes(MBasicBlock* entry,
-                                        jsbytecode* loopHeadPc,
-                                        jsbytecode* loopStartPc,
                                         jsbytecode* loopStopPc);
   AbortReasonOr<Ok> analyzeNewLoopTypesForLocation(
       MBasicBlock* entry, const BytecodeLocation loc,