diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
index ff184aa7f48def..6c1666162c813c 100644
--- a/clang/lib/Sema/Sema.cpp
+++ b/clang/lib/Sema/Sema.cpp
@@ -1555,7 +1555,7 @@ class DeferredDiagnosticsEmitter
       emitDeferredDiags(FD, Caller);
     // Do not revisit a function if the function body has been completely
     // visited before.
-    if (Done.count(FD))
+    if (!Done.insert(FD).second)
       return;
     InUsePath.insert(FD);
     UsePath.push_back(FD);
@@ -1564,7 +1564,6 @@ class DeferredDiagnosticsEmitter
     }
     UsePath.pop_back();
     InUsePath.erase(FD);
-    Done.insert(FD);
   }
 
   void checkRecordedDecl(Decl *D) {