RE: [PATCH] D39737: [MC] Fix regression tests on Windows when git “core.autocrlf” is set to true

[Zhen Cao via llvm-commits]

Thank you for your comment, Zachary.

From: Zachary Turner [mailto:zturner at google.com]
Sent: Tuesday, November 7, 2017 11:58 AM
To: reviews+D39737+public+a17c03644213de66 at reviews.llvm.org
Cc: Zhen Cao <zhen.cao at autodesk.com>; rnk at google.com; grosbach at apple.com; bigcheesegs at gmail.com; javed.absar at arm.com
Subject: Re: [PATCH] D39737: [MC] Fix regression tests on Windows when git “core.autocrlf” is set to true

I’m not very crazy about this, as I generally think core.autocrlf=false should be mandatory. But if other people think this is ok, I guess I’m fine
On Tue, Nov 7, 2017 at 8:45 AM Zhen Cao via Phabricator <reviews at reviews.llvm.org<mailto:reviews at reviews.llvm.org>> wrote:
caoz created this revision.
Herald added a subscriber: javed.absar.

Fix regression tests on Windows when git “core.autocrlf” is set to true.

See: https://bugs.llvm.org/show_bug.cgi?id=35095<https://urldefense.proofpoint.com/v2/url?u=https-3A__bugs.llvm.org_show-5Fbug.cgi-3Fid-3D35095&d=DwMFaQ&c=76Q6Tcqc-t2x0ciWn7KFdCiqt6IQ7a_IF9uzNzd_2pA&r=5bO7zfHLitDTGEV53jsIoKY9YZM-dEXQXjvwmt4K1Xs&m=VVNS0g2YHbK-w6I6rcS2Q4eHXb1kA0qGhu4gh9wWHW0&s=KKngOrrDte4O1dFqzI4sDndJ-uhKD2CwusDUSKfs55I&e=>


https://reviews.llvm.org/D39737<https://urldefense.proofpoint.com/v2/url?u=https-3A__reviews.llvm.org_D39737&d=DwMFaQ&c=76Q6Tcqc-t2x0ciWn7KFdCiqt6IQ7a_IF9uzNzd_2pA&r=5bO7zfHLitDTGEV53jsIoKY9YZM-dEXQXjvwmt4K1Xs&m=VVNS0g2YHbK-w6I6rcS2Q4eHXb1kA0qGhu4gh9wWHW0&s=zI_VRwP7vH9gWXzF5ZRdemhP7mzQMnuGarBpJVXWvT8&e=>

Files:
  .gitattributes
  lib/MC/MCParser/AsmLexer.cpp


Index: lib/MC/MCParser/AsmLexer.cpp
===================================================================
--- lib/MC/MCParser/AsmLexer.cpp
+++ lib/MC/MCParser/AsmLexer.cpp
@@ -210,6 +210,8 @@
   int CurChar = getNextChar();
   while (CurChar != '\n' && CurChar != '\r' && CurChar != EOF)
     CurChar = getNextChar();
+  if (CurChar == '\r')
+      CurPtr++;

   // If we have a CommentConsumer, notify it about the comment.
   if (CommentConsumer) {
@@ -610,6 +612,8 @@
   case '\r':
     IsAtStartOfLine = true;
     IsAtStartOfStatement = true;
+    if (CurChar == '\r')
+        CurPtr++;
     return AsmToken(AsmToken::EndOfStatement, StringRef(TokStart, 1));
   case ':': return AsmToken(AsmToken::Colon, StringRef(TokStart, 1));
   case '+': return AsmToken(AsmToken::Plus, StringRef(TokStart, 1));
Index: .gitattributes
===================================================================
--- /dev/null
+++ .gitattributes
@@ -0,0 +1,8 @@
+test/Object/Inputs/*.a-* binary
+test/tools/dsymutil/Inputs/* binary
+test/tools/llvm-ar/Inputs/*.lib binary
+test/tools/llvm-objdump/Inputs/*.a binary
+test/tools/llvm-rc/Inputs/* binary
+test/tools/llvm-strings/Inputs/numbers binary
+test/MC/AsmParser/incbin_abcd binary
+test/YAMLParser/spec-09-02.test binary

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171107/cb9211cc/attachment.html>