--- a/js/src/jit/BaselineCompiler.cpp
+++ b/js/src/jit/BaselineCompiler.cpp
@@ -4052,26 +4052,28 @@ static const VMFunction PopLexicalEnvInf
 typedef bool (*DebugLeaveThenPopLexicalEnvFn)(JSContext*, BaselineFrame*,
                                               jsbytecode*);
 static const VMFunction DebugLeaveThenPopLexicalEnvInfo =
     FunctionInfo<DebugLeaveThenPopLexicalEnvFn>(
         jit::DebugLeaveThenPopLexicalEnv, "DebugLeaveThenPopLexicalEnv");
 
 template <typename Handler>
 bool BaselineCodeGen<Handler>::emit_JSOP_POPLEXICALENV() {
-  prepareVMCall();
+  frame.syncStack(0);
 
   masm.loadBaselineFramePtr(BaselineFrameReg, R0.scratchReg());
 
   auto ifDebuggee = [this]() {
+    prepareVMCall();
     pushBytecodePCArg();
     pushArg(R0.scratchReg());
     return callVM(DebugLeaveThenPopLexicalEnvInfo);
   };
   auto ifNotDebuggee = [this]() {
+    prepareVMCall();
     pushArg(R0.scratchReg());
     return callVM(PopLexicalEnvInfo);
   };
   return emitDebugInstrumentation(ifDebuggee, mozilla::Some(ifNotDebuggee));
 }
 
 typedef bool (*FreshenLexicalEnvFn)(JSContext*, BaselineFrame*);
 static const VMFunction FreshenLexicalEnvInfo =
@@ -4082,26 +4084,28 @@ typedef bool (*DebugLeaveThenFreshenLexi
                                                   jsbytecode*);
 static const VMFunction DebugLeaveThenFreshenLexicalEnvInfo =
     FunctionInfo<DebugLeaveThenFreshenLexicalEnvFn>(
         jit::DebugLeaveThenFreshenLexicalEnv,
         "DebugLeaveThenFreshenLexicalEnv");
 
 template <typename Handler>
 bool BaselineCodeGen<Handler>::emit_JSOP_FRESHENLEXICALENV() {
-  prepareVMCall();
+  frame.syncStack(0);
 
   masm.loadBaselineFramePtr(BaselineFrameReg, R0.scratchReg());
 
   auto ifDebuggee = [this]() {
+    prepareVMCall();
     pushBytecodePCArg();
     pushArg(R0.scratchReg());
     return callVM(DebugLeaveThenFreshenLexicalEnvInfo);
   };
   auto ifNotDebuggee = [this]() {
+    prepareVMCall();
     pushArg(R0.scratchReg());
     return callVM(FreshenLexicalEnvInfo);
   };
   return emitDebugInstrumentation(ifDebuggee, mozilla::Some(ifNotDebuggee));
 }
 
 typedef bool (*RecreateLexicalEnvFn)(JSContext*, BaselineFrame*);
 static const VMFunction RecreateLexicalEnvInfo =
@@ -4112,26 +4116,28 @@ typedef bool (*DebugLeaveThenRecreateLex
                                                    jsbytecode*);
 static const VMFunction DebugLeaveThenRecreateLexicalEnvInfo =
     FunctionInfo<DebugLeaveThenRecreateLexicalEnvFn>(
         jit::DebugLeaveThenRecreateLexicalEnv,
         "DebugLeaveThenRecreateLexicalEnv");
 
 template <typename Handler>
 bool BaselineCodeGen<Handler>::emit_JSOP_RECREATELEXICALENV() {
-  prepareVMCall();
+  frame.syncStack(0);
 
   masm.loadBaselineFramePtr(BaselineFrameReg, R0.scratchReg());
 
   auto ifDebuggee = [this]() {
+    prepareVMCall();
     pushBytecodePCArg();
     pushArg(R0.scratchReg());
     return callVM(DebugLeaveThenRecreateLexicalEnvInfo);
   };
   auto ifNotDebuggee = [this]() {
+    prepareVMCall();
     pushArg(R0.scratchReg());
     return callVM(RecreateLexicalEnvInfo);
   };
   return emitDebugInstrumentation(ifDebuggee, mozilla::Some(ifNotDebuggee));
 }
 
 typedef bool (*DebugLeaveLexicalEnvFn)(JSContext*, BaselineFrame*, jsbytecode*);
 static const VMFunction DebugLeaveLexicalEnvInfo =