diff --git a/llvm/lib/CodeGen/WinEHPrepare.cpp b/llvm/lib/CodeGen/WinEHPrepare.cpp
index eefb278f0a79..3304aeb3e449 100644
--- a/llvm/lib/CodeGen/WinEHPrepare.cpp
+++ b/llvm/lib/CodeGen/WinEHPrepare.cpp
@@ -90,7 +90,9 @@ public:
                            FrameVarInfoMap &VarInfo)
       : LPI(LPI), Materializer(HandlerFn, VarInfo),
         SelectorIDType(Type::getInt32Ty(LPI->getContext())),
-        Int8PtrType(Type::getInt8PtrTy(LPI->getContext())) {}
+        Int8PtrType(Type::getInt8PtrTy(LPI->getContext())),
+        ExtractedEHPtr(nullptr), ExtractedSelector(nullptr),
+        EHPtrStoreAddr(nullptr), SelectorStoreAddr(nullptr) {}
 
   CloningAction handleInstruction(ValueToValueMapTy &VMap,
                                   const Instruction *Inst,