Revert "Small refactor on VectorizerHint for deduplication"

[oota-llvm.git] / lib / Support / LineIterator.cpp

diff --git a/lib/Support/LineIterator.cpp b/lib/Support/LineIterator.cpp
index c14f96bf714a82209745fc3b1e71f01c584b066a..947a8fb6062d04c997b81945b1f573df858bbcd0 100644 (file)
--- a/lib/Support/LineIterator.cpp
+++ b/lib/Support/LineIterator.cpp
@@ -13,9 +13,10 @@
 using namespace llvm;
 
 line_iterator::line_iterator(const MemoryBuffer &Buffer, char CommentMarker)
-    : Buffer(Buffer.getBufferSize() ? &Buffer : 0),
+    : Buffer(Buffer.getBufferSize() ? &Buffer : nullptr),
       CommentMarker(CommentMarker), LineNumber(1),
-      CurrentLine(Buffer.getBufferSize() ? Buffer.getBufferStart() : 0, 0) {
+      CurrentLine(Buffer.getBufferSize() ? Buffer.getBufferStart() : nullptr,
+                  0) {
   // Ensure that if we are constructed on a non-empty memory buffer that it is
   // a null terminated buffer.
   if (Buffer.getBufferSize()) {
@@ -29,15 +30,14 @@ void line_iterator::advance() {
 
   const char *Pos = CurrentLine.end();
   assert(Pos == Buffer->getBufferStart() || *Pos == '\n' || *Pos == '\0');
-  size_t Length = 0;
 
   if (CommentMarker == '\0') {
     // If we're not stripping comments, this is simpler.
-    while (Pos[Length] == '\n')
-      ++Length;
-    Pos += Length;
-    LineNumber += Length;
-    Length = 0;
+    size_t Blanks = 0;
+    while (Pos[Blanks] == '\n')
+      ++Blanks;
+    Pos += Blanks;
+    LineNumber += Blanks;
   } else {
     // Skip comments and count line numbers, which is a bit more complex.
     for (;;) {
@@ -54,12 +54,13 @@ void line_iterator::advance() {
 
   if (*Pos == '\0') {
     // We've hit the end of the buffer, reset ourselves to the end state.
-    Buffer = 0;
+    Buffer = nullptr;
     CurrentLine = StringRef();
     return;
   }
 
   // Measure the line.
+  size_t Length = 0;
   do {
     ++Length;
   } while (Pos[Length] != '\0' && Pos[Length] != '\n');