Index: llvm/trunk/include/llvm/CodeGen/FaultMaps.h
===================================================================
--- llvm/trunk/include/llvm/CodeGen/FaultMaps.h
+++ llvm/trunk/include/llvm/CodeGen/FaultMaps.h
@@ -39,6 +39,9 @@
 
   void recordFaultingOp(FaultKind FaultTy, const MCSymbol *HandlerLabel);
   void serializeToFaultMapSection();
+  void reset() {
+    FunctionInfos.clear();
+  }
 
 private:
   static const char *WFMP;
Index: llvm/trunk/lib/Target/X86/X86AsmPrinter.h
===================================================================
--- llvm/trunk/lib/Target/X86/X86AsmPrinter.h
+++ llvm/trunk/lib/Target/X86/X86AsmPrinter.h
@@ -135,6 +135,7 @@
   bool doInitialization(Module &M) override {
     SMShadowTracker.reset(0);
     SM.reset();
+    FM.reset();
     return AsmPrinter::doInitialization(M);
   }