1 files changed, 4 insertions, 2 deletions
diff --git a/lib/StaticAnalyzer/Core/PathDiagnostic.cpp b/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
index 73694a6994..f51e16c084 100644
--- a/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
+++ b/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
@@ -263,13 +263,15 @@ static llvm::Optional<bool> comparePiece(const PathDiagnosticPiece &X,
   if (X.getRanges().size() != Y.getRanges().size())
     return X.getRanges().size() < Y.getRanges().size();
 
+  const SourceManager &SM = XL.getManager();
+  
   for (unsigned i = 0, n = X.getRanges().size(); i < n; ++i) {
     SourceRange XR = X.getRanges()[i];
     SourceRange YR = Y.getRanges()[i];
     if (XR != YR) {
       if (XR.getBegin() != YR.getBegin())
-        return XR.getBegin() < YR.getBegin();
-      return XR.getEnd() < YR.getEnd();
+        return SM.isBeforeInTranslationUnit(XR.getBegin(), YR.getBegin());
+      return SM.isBeforeInTranslationUnit(XR.getEnd(), YR.getEnd());
     }
   }