diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
index 0b3da6582d90..98a541b3d735 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
@@ -163,6 +163,13 @@ public:
         AllowAutoPadding && TargetPrefixMax != 0 && X86PadForBranchAlign;
   }
 
+  void reset() override {
+    PrevInst = MCInst();
+    PrevInstOpcode = 0;
+    PendingBA = nullptr;
+    PrevInstPosition = {};
+  }
+
   void emitInstructionBegin(MCObjectStreamer &OS, const MCInst &Inst,
                             const MCSubtargetInfo &STI);
   void emitInstructionEnd(MCObjectStreamer &OS, const MCInst &Inst);