From: Igor Kudrin <ikudrin@accesssoftek.com>
Date: Sun, 19 Feb 2017 14:26:52 +0000 (+0000)
Subject: [llvm-cov] Respect Windows line endings when parsing demangled symbols.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3a9558370a1caf41c0f206ecbb26dbd22a39a8f;p=llvm

[llvm-cov] Respect Windows line endings when parsing demangled symbols.

Differential Revision: https://reviews.llvm.org/D30096

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@295605 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/llvm-cov/CodeCoverage.cpp b/tools/llvm-cov/CodeCoverage.cpp
index f3f6f9f7fed..781d1948ccd 100644
--- a/tools/llvm-cov/CodeCoverage.cpp
+++ b/tools/llvm-cov/CodeCoverage.cpp
@@ -451,7 +451,9 @@ void CodeCoverageTool::demangleSymbols(const CoverageMapping &Coverage) {
   // Cache the demangled names.
   unsigned I = 0;
   for (const auto &Function : Coverage.getCoveredFunctions())
-    DC.DemangledNames[Function.Name] = Symbols[I++];
+    // On Windows, lines in the demangler's output file end with "\r\n".
+    // Splitting by '\n' keeps '\r's, so cut them now.
+    DC.DemangledNames[Function.Name] = Symbols[I++].rtrim();
 }
 
 void CodeCoverageTool::writeSourceFileView(StringRef SourceFile,