diff --git a/lib/StaticAnalyzer/Core/BugReporter.cpp b/lib/StaticAnalyzer/Core/BugReporter.cpp
index 3365d79a38..7cc75b6756 100644
--- a/lib/StaticAnalyzer/Core/BugReporter.cpp
+++ b/lib/StaticAnalyzer/Core/BugReporter.cpp
@@ -1838,7 +1838,9 @@ const Stmt *getStmtParent(const Stmt *S, ParentMap &PM) {
     if (!S)
       break;
 
-    if (isa<ExprWithCleanups>(S))
+    if (isa<ExprWithCleanups>(S) ||
+        isa<CXXBindTemporaryExpr>(S) ||
+        isa<SubstNonTypeTemplateParmExpr>(S))
       continue;
 
     break;