1 files changed, 6 insertions, 1 deletions
diff --git a/lib/StaticAnalyzer/Core/PathDiagnostic.cpp b/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
index 5496df0f8f..3306eaa7f8 100644
--- a/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
+++ b/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
@@ -532,7 +532,12 @@ getLocationForCaller(const StackFrameContext *SFC,
                                              SM, CallerCtx);
   }
   case CFGElement::BaseDtor:
-  case CFGElement::MemberDtor:
+  case CFGElement::MemberDtor: {
+    const AnalysisDeclContext *CallerInfo = CallerCtx->getAnalysisDeclContext();
+    if (const Stmt *CallerBody = CallerInfo->getBody())
+      return PathDiagnosticLocation::createEnd(CallerBody, SM, CallerCtx);
+    return PathDiagnosticLocation::create(CallerInfo->getDecl(), SM);
+  }
   case CFGElement::TemporaryDtor:
     llvm_unreachable("not yet implemented!");
   }