diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 7c1c62c..b7c2308 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -6290,10 +6290,8 @@
     return;
   }
 
-  // We want to insert before the start of the expression...
   SourceLocation Open = E->getSourceRange().getBegin();
-  // ...and one character after the end.
-  SourceLocation Close = E->getSourceRange().getEnd().getFileLocWithOffset(1);
+  SourceLocation Close = PP.getLocForEndOfToken(E->getSourceRange().getEnd());
   
   Diag(Loc, diag::warn_condition_is_assignment)
     << E->getSourceRange()