commit 22f24f681517b9b1f101f782357cb4cec06c324b
author Benjamin Kramer <benny.kra@googlemail.com> Fri Apr 01 10:04:07 2016 +0000
committer Benjamin Kramer <benny.kra@googlemail.com> Fri Apr 01 10:04:07 2016 +0000
tree 260f79be2fd612b0837a4f8b582e18804cf49e3d
parent e550bbdf9d7c4e5eb0b23a50203039808c7a2be4

[Lexer] Let the compiler infer string lengths. No functionality change intended.

llvm-svn: 265126

clang/lib/Lex/Lexer.cpp

diff --git a/clang/lib/Lex/Lexer.cpp b/clang/lib/Lex/Lexer.cpp
index 946f36f..9c2a016 100644
--- a/clang/lib/Lex/Lexer.cpp
+++ b/clang/lib/Lex/Lexer.cpp
@@ -2636,8 +2636,8 @@
     return false;
   
   // Check to see if we have <<<<<<< or >>>>.
-  if ((BufferEnd-CurPtr < 8 || StringRef(CurPtr, 7) != "<<<<<<<") &&
-      (BufferEnd-CurPtr < 6 || StringRef(CurPtr, 5) != ">>>> "))
+  if (!StringRef(CurPtr, BufferEnd - CurPtr).startswith("<<<<<<<") &&
+      !StringRef(CurPtr, BufferEnd - CurPtr).startswith(">>>> "))
     return false;
 
   // If we have a situation where we don't care about conflict markers, ignore