Bug 1832558 part 6 - Remove LRegExpExecMatch temp register. r=iain

Similar to the previous change, the RegExpExecMatch stub also just uses this register internally. Depends on D178086 Differential Revision: https://phabricator.services.mozilla.com/D178087
iaxat · May 16, 2023 · 990d668 · 990d668
1 parent 9f99d3e
commit 990d668
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
@@ -2926,20 +2926,16 @@ void CodeGenerator::visitOutOfLineRegExpExecMatch(
 void CodeGenerator::visitRegExpExecMatch(LRegExpExecMatch* lir) {
   MOZ_ASSERT(ToRegister(lir->regexp()) == RegExpMatcherRegExpReg);
   MOZ_ASSERT(ToRegister(lir->string()) == RegExpMatcherStringReg);
-  MOZ_ASSERT(ToRegister(lir->temp0()) == RegExpMatcherLastIndexReg);
   MOZ_ASSERT(ToOutValue(lir) == JSReturnOperand);
 
 #if defined(JS_NUNBOX32)
   static_assert(RegExpMatcherRegExpReg != JSReturnReg_Type);
   static_assert(RegExpMatcherRegExpReg != JSReturnReg_Data);
   static_assert(RegExpMatcherStringReg != JSReturnReg_Type);
   static_assert(RegExpMatcherStringReg != JSReturnReg_Data);
-  static_assert(RegExpMatcherLastIndexReg != JSReturnReg_Type);
-  static_assert(RegExpMatcherLastIndexReg != JSReturnReg_Data);
 #elif defined(JS_PUNBOX64)
   static_assert(RegExpMatcherRegExpReg != JSReturnReg);
   static_assert(RegExpMatcherStringReg != JSReturnReg);
-  static_assert(RegExpMatcherLastIndexReg != JSReturnReg);
 #endif
 
   masm.reserveStack(RegExpReservedStack);

diff --git a/js/src/jit/LIROps.yaml b/js/src/jit/LIROps.yaml
@@ -1497,7 +1497,7 @@
     regexp: WordSized
     string: WordSized
   call_instruction: true
-  num_temps: 1
+  num_temps: 0
   mir_op: true
 
 - name: RegExpExecTest

diff --git a/js/src/jit/Lowering.cpp b/js/src/jit/Lowering.cpp
@@ -3139,8 +3139,7 @@ void LIRGenerator::visitRegExpExecMatch(MRegExpExecMatch* ins) {
 
   auto* lir = new (alloc())
       LRegExpExecMatch(useFixedAtStart(ins->regexp(), RegExpMatcherRegExpReg),
-                       useFixedAtStart(ins->string(), RegExpMatcherStringReg),
-                       tempFixed(RegExpMatcherLastIndexReg));
+                       useFixedAtStart(ins->string(), RegExpMatcherStringReg));
   defineReturn(lir, ins);
   assignSafepoint(lir, ins);
 }