summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2010-11-14 03:28:22 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2010-11-14 03:28:22 +0000
commitfd781bf0432d24a657fd33684b61b7f25147e24e (patch)
tree4776fd73ac3377180488059a06318c0751154125
parent0e3decfcf7d366f85b1bd48b2b0131a27fa05945 (diff)
downloadbcm5719-llvm-fd781bf0432d24a657fd33684b61b7f25147e24e.tar.gz
bcm5719-llvm-fd781bf0432d24a657fd33684b61b7f25147e24e.zip
FileCheck: Eliminate DOSish \r from input file.
It can pass two tests below on Win32. - Clang :: CodeGenCXX/dyncast.cpp - LLVM :: CodeGen/ARM/globals.ll llvm-svn: 119023
-rw-r--r--llvm/utils/FileCheck/FileCheck.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/llvm/utils/FileCheck/FileCheck.cpp b/llvm/utils/FileCheck/FileCheck.cpp
index c6b2ff7c60e..5e30c22db35 100644
--- a/llvm/utils/FileCheck/FileCheck.cpp
+++ b/llvm/utils/FileCheck/FileCheck.cpp
@@ -456,6 +456,11 @@ static MemoryBuffer *CanonicalizeInputFile(MemoryBuffer *MB) {
for (const char *Ptr = MB->getBufferStart(), *End = MB->getBufferEnd();
Ptr != End; ++Ptr) {
+ // Eliminate trailing dosish \r.
+ if (Ptr <= End - 2 && Ptr[0] == '\r' && Ptr[1] == '\n') {
+ continue;
+ }
+
// If C is not a horizontal whitespace, skip it.
if (*Ptr != ' ' && *Ptr != '\t') {
NewFile.push_back(*Ptr);
OpenPOWER on IntegriCloud