Index: tools/llvm-symbolizer/llvm-symbolizer.cpp
===================================================================
--- tools/llvm-symbolizer/llvm-symbolizer.cpp
+++ tools/llvm-symbolizer/llvm-symbolizer.cpp
@@ -90,14 +90,10 @@
 }
 
 static bool parseCommand(bool &IsData, std::string &ModuleName,
-                         uint64_t &ModuleOffset) {
+                         uint64_t &ModuleOffset, char *InputString) {
   const char *kDataCmd = "DATA ";
   const char *kCodeCmd = "CODE ";
-  const int kMaxInputStringLength = 1024;
-  const char kDelimiters[] = " \n";
-  char InputString[kMaxInputStringLength];
-  if (!fgets(InputString, sizeof(InputString), stdin))
-    return false;
+  const char kDelimiters[] = " \n\r";
   IsData = false;
   ModuleName = "";
   char *pos = InputString;
@@ -118,8 +114,9 @@
       char quote = *pos;
       pos++;
       char *end = strchr(pos, quote);
-      if (!end)
+      if (!end) {
         return false;
+      }
       ModuleName = std::string(pos, end - pos);
       pos = end + 1;
     } else {
@@ -133,7 +130,9 @@
   // Skip delimiters and parse module offset.
   pos += strspn(pos, kDelimiters);
   int offset_length = strcspn(pos, kDelimiters);
-  return !StringRef(pos, offset_length).getAsInteger(0, ModuleOffset);
+  StringRef StrRef(pos, offset_length);
+  bool Err = StrRef.getAsInteger(0, ModuleOffset);
+  return !Err;
 }
 
 int main(int argc, char **argv) {
@@ -158,31 +157,42 @@
   }
   LLVMSymbolizer Symbolizer(Opts);
 
-  bool IsData = false;
-  std::string ModuleName;
-  uint64_t ModuleOffset;
   DIPrinter Printer(outs(), ClPrintFunctions != FunctionNameKind::None,
                     ClPrettyPrint);
 
-  while (parseCommand(IsData, ModuleName, ModuleOffset)) {
-    if (ClPrintAddress) {
-      outs() << "0x";
-      outs().write_hex(ModuleOffset);
-      StringRef Delimiter = (ClPrettyPrint == true) ? ": " : "\n";
-      outs() << Delimiter;
-    }
-    if (IsData) {
-      auto ResOrErr = Symbolizer.symbolizeData(ModuleName, ModuleOffset);
-      Printer << (error(ResOrErr.getError()) ? DIGlobal() : ResOrErr.get());
-    } else if (ClPrintInlining) {
-      auto ResOrErr = Symbolizer.symbolizeInlinedCode(ModuleName, ModuleOffset);
-      Printer << (error(ResOrErr.getError()) ? DIInliningInfo()
-                                             : ResOrErr.get());
+  const int kMaxInputStringLength = 1024;
+  char InputString[kMaxInputStringLength];
+
+  while (true) {
+    if (!fgets(InputString, sizeof(InputString), stdin))
+      break;
+
+    bool IsData = false;
+    std::string ModuleName;
+    uint64_t ModuleOffset = 0;
+    if (parseCommand(IsData, ModuleName, ModuleOffset, InputString)) {
+      if (ClPrintAddress) {
+        outs() << "0x";
+        outs().write_hex(ModuleOffset);
+        StringRef Delimiter = (ClPrettyPrint == true) ? ": " : "\n";
+        outs() << Delimiter;
+      }
+      if (IsData) {
+        auto ResOrErr = Symbolizer.symbolizeData(ModuleName, ModuleOffset);
+        Printer << (error(ResOrErr.getError()) ? DIGlobal() : ResOrErr.get());
+      } else if (ClPrintInlining) {
+        auto ResOrErr = Symbolizer.symbolizeInlinedCode(ModuleName, ModuleOffset);
+        Printer << (error(ResOrErr.getError()) ? DIInliningInfo()
+            : ResOrErr.get());
+      } else {
+        auto ResOrErr = Symbolizer.symbolizeCode(ModuleName, ModuleOffset);
+        Printer << (error(ResOrErr.getError()) ? DILineInfo() : ResOrErr.get());
+      }
+      outs() << "\n";
     } else {
-      auto ResOrErr = Symbolizer.symbolizeCode(ModuleName, ModuleOffset);
-      Printer << (error(ResOrErr.getError()) ? DILineInfo() : ResOrErr.get());
+      outs() << InputString;
     }
-    outs() << "\n";
+
     outs().flush();
   }