Bug 1913445 - Use AutoForbidPoolsAndNops in tails calls trampoline. r…

…=jseward, a=dsmith

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

js/src/jit/MacroAssembler.cpp

@@ -5374,22 +5374,29 @@ struct ReturnCallTrampolineData {
 static ReturnCallTrampolineData MakeReturnCallTrampoline(MacroAssembler& masm) {
   uint32_t savedPushed = masm.framePushed();
 
-  // Build simple trampoline code: load the instance slot from the frame,
-  // restore FP, and return to prevous caller.
   ReturnCallTrampolineData data;
+
+  {
+#  if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_ARM64)
+    AutoForbidPoolsAndNops afp(&masm, 1);
+#  elif defined(JS_CODEGEN_RISCV64)
+    BlockTrampolinePoolScope block_trampoline_pool(&masm, 1);
+#  endif
+
+    // Build simple trampoline code: load the instance slot from the frame,
+    // restore FP, and return to prevous caller.
 #  ifdef JS_CODEGEN_ARM
-  data.trampolineOffset = masm.currentOffset();
+    data.trampolineOffset = masm.currentOffset();
 #  else
-  masm.bind(&data.trampoline);
+    masm.bind(&data.trampoline);
 #  endif
 
-  masm.setFramePushed(
-      AlignBytes(wasm::FrameWithInstances::sizeOfInstanceFieldsAndShadowStack(),
-                 WasmStackAlignment));
+    masm.setFramePushed(AlignBytes(
+        wasm::FrameWithInstances::sizeOfInstanceFieldsAndShadowStack(),
+        WasmStackAlignment));
 
-#  ifdef ENABLE_WASM_TAIL_CALLS
-  masm.wasmMarkSlowCall();
-#  endif
+    masm.wasmMarkSlowCall();
+  }
 
   masm.loadPtr(
       Address(masm.getStackPointer(), WasmCallerInstanceOffsetBeforeCall),