<div dir="ltr">Thanks, attempting to fix.<div class="gmail_extra"><br><div class="gmail_quote">On Mon, Mar 21, 2016 at 7:43 PM, Richard Smith via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Seems to have caused a bot failure:<br>
<br>
<a href="http://lab.llvm.org:8011/builders/clang-x86-win2008-selfhost/builds/7039" rel="noreferrer" target="_blank">http://lab.llvm.org:8011/builders/clang-x86-win2008-selfhost/builds/7039</a><br>
<br>
The NOTRIPLE test appears to be picking up the version of MSVC from<br>
that installed on the system, so this passes or fails depending on<br>
which version of MSVC we find.<br></blockquote><div><br></div><div>I think it's a bit simpler: If the triple is set, we try to parse the MSVC version off it if it's a MS target. If we fail to parse it, we default to 18 (VC2013). If the triple isn't a MS triple, we set the option to 0. I tested this on Linux, where the default triple is a linux triple, and hence the flag is 0 (and we don't print the space). On the Windows bot, the default triple is some MS triple, which we fail to parse, and then we default to the 2013 behavior.</div><div><br></div><div>...bleh, I was just running `svn commit` with a fix, but got a conflict. Seems like somewhat reverted the change at the same time I was fixing. Will try again some other time.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div><div class="h5"><br>
On Mon, Mar 21, 2016 at 12:44 PM, Nico Weber via cfe-commits<br>
<<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br>
> Author: nico<br>
> Date: Mon Mar 21 14:44:18 2016<br>
> New Revision: 263974<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=263974&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=263974&view=rev</a><br>
> Log:<br>
> clang-cl: With -fmsc-version=1900, use MSVS2015 diag formatting.<br>
><br>
> Modified:<br>
> cfe/trunk/lib/Driver/Tools.cpp<br>
> cfe/trunk/lib/Frontend/TextDiagnostic.cpp<br>
> cfe/trunk/test/Misc/diag-format.c<br>
><br>
> Modified: cfe/trunk/lib/Driver/Tools.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=263974&r1=263973&r2=263974&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=263974&r1=263973&r2=263974&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Driver/Tools.cpp (original)<br>
> +++ cfe/trunk/lib/Driver/Tools.cpp Mon Mar 21 14:44:18 2016<br>
> @@ -3257,6 +3257,7 @@ VersionTuple visualstudio::getMSVCVersio<br>
> if (Major || Minor || Micro)<br>
> return VersionTuple(Major, Minor, Micro);<br>
><br>
> + // FIXME: Consider bumping this to 19 (MSVC2015) soon.<br>
> return VersionTuple(18);<br>
> }<br>
> return VersionTuple();<br>
><br>
> Modified: cfe/trunk/lib/Frontend/TextDiagnostic.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/TextDiagnostic.cpp?rev=263974&r1=263973&r2=263974&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/TextDiagnostic.cpp?rev=263974&r1=263973&r2=263974&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Frontend/TextDiagnostic.cpp (original)<br>
> +++ cfe/trunk/lib/Frontend/TextDiagnostic.cpp Mon Mar 21 14:44:18 2016<br>
> @@ -819,7 +819,15 @@ void TextDiagnostic::emitDiagnosticLoc(S<br>
> switch (DiagOpts->getFormat()) {<br>
> case DiagnosticOptions::Clang:<br>
> case DiagnosticOptions::Vi: OS << ':'; break;<br>
> - case DiagnosticOptions::MSVC: OS << ") : "; break;<br>
> + case DiagnosticOptions::MSVC:<br>
> + // MSVC2013 and before print 'file(4) : error'. MSVC2015 gets rid of the<br>
> + // space and prints 'file(4): error'.<br>
> + OS << ')';<br>
> + if (LangOpts.MSCompatibilityVersion &&<br>
> + !LangOpts.isCompatibleWithMSVC(LangOptions::MSVC2015))<br>
> + OS << ' ';<br>
> + OS << ": ";<br>
> + break;<br>
> }<br>
><br>
> if (DiagOpts->ShowSourceRanges && !Ranges.empty()) {<br>
><br>
> Modified: cfe/trunk/test/Misc/diag-format.c<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Misc/diag-format.c?rev=263974&r1=263973&r2=263974&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Misc/diag-format.c?rev=263974&r1=263973&r2=263974&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/test/Misc/diag-format.c (original)<br>
> +++ cfe/trunk/test/Misc/diag-format.c Mon Mar 21 14:44:18 2016<br>
> @@ -4,13 +4,15 @@<br>
> //<br>
> // RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1300 %s 2>&1 | FileCheck %s -check-prefix=MSVC2010<br>
> // RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fms-compatibility-version=13.00 %s 2>&1 | FileCheck %s -check-prefix=MSVC2010<br>
> -// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc %s 2>&1 | FileCheck %s -check-prefix=MSVC<br>
> +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc %s 2>&1 | FileCheck %s -check-prefix=MSVCNOTRIPLE<br>
> // RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1300 -target x86_64-pc-win32 %s 2>&1 | FileCheck %s -check-prefix=MSVC2010<br>
> // RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fms-compatibility-version=13.00 -target x86_64-pc-win32 %s 2>&1 | FileCheck %s -check-prefix=MSVC2010<br>
> // RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -target x86_64-pc-win32 %s 2>&1 | FileCheck %s -check-prefix=MSVC<br>
> // RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1300 -target x86_64-pc-win32 -fshow-column %s 2>&1 | FileCheck %s -check-prefix=MSVC2010<br>
> // RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fms-compatibility-version=13.00 -target x86_64-pc-win32 -fshow-column %s 2>&1 | FileCheck %s -check-prefix=MSVC2010<br>
> -// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -target x86_64-pc-win32 -fshow-column %s 2>&1 | FileCheck %s -check-prefix=MSVC<br>
> +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1800 -target x86_64-pc-win32 -fshow-column %s 2>&1 | FileCheck %s -check-prefix=MSVC2013<br>
> +// RN: %clang -fsyntax-only -fdiagnostics-format=msvc -target x86_64-pc-win32 -fshow-column %s 2>&1 | FileCheck %s -check-prefix=MSVC<br>
<br>
</div></div>Did you mean to leave this test disabled?<br>
<span class=""><br>
> +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1900 -target x86_64-pc-win32 -fshow-column %s 2>&1 | FileCheck %s -check-prefix=MSVC2015<br>
> //<br>
> // RUN: %clang -fsyntax-only -fdiagnostics-format=vi %s 2>&1 | FileCheck %s -check-prefix=VI<br>
> //<br>
> @@ -20,11 +22,9 @@<br>
> //<br>
> // RUN: not %clang -fsyntax-only -Werror -fdiagnostics-format=msvc-fallback -fmsc-version=1300 %s 2>&1 | FileCheck %s -check-prefix=MSVC2010-FALLBACK<br>
> // RUN: not %clang -fsyntax-only -Werror -fdiagnostics-format=msvc-fallback -fms-compatibility-version=13.00 %s 2>&1 | FileCheck %s -check-prefix=MSVC2010-FALLBACK<br>
> -// RUN: not %clang -fsyntax-only -Werror -fdiagnostics-format=msvc-fallback %s 2>&1 | FileCheck %s -check-prefix=MSVC-FALLBACK<br>
> -<br>
> -<br>
> -<br>
> -<br>
> +// RUN: not %clang -fsyntax-only -Werror -fdiagnostics-format=msvc-fallback %s -fmsc-version=1800 2>&1 | FileCheck %s -check-prefix=MSVC2013-FALLBACK<br>
> +// RN: not %clang -fsyntax-only -Werror -fdiagnostics-format=msvc-fallback %s 2>&1 | FileCheck %s -check-prefix=MSVC-FALLBACK<br>
<br>
</span>... and this one?<br>
<div class="HOEnZb"><div class="h5"><br>
> +// RUN: not %clang -fsyntax-only -Werror -fdiagnostics-format=msvc-fallback %s -fmsc-version=1900 2>&1 | FileCheck %s -check-prefix=MSVC2015-FALLBACK<br>
><br>
><br>
><br>
> @@ -36,10 +36,15 @@<br>
> #endif bad // extension!<br>
> // DEFAULT: {{.*}}:36:8: warning: extra tokens at end of #endif directive [-Wextra-tokens]<br>
> // MSVC2010: {{.*}}(36,7) : warning: extra tokens at end of #endif directive [-Wextra-tokens]<br>
> +// MSVC2013: {{.*}}(36,8) : warning: extra tokens at end of #endif directive [-Wextra-tokens]<br>
> // MSVC: {{.*}}(36,8) : warning: extra tokens at end of #endif directive [-Wextra-tokens]<br>
> +// MSVCNOTRIPLE: {{.*}}(36,8): warning: extra tokens at end of #endif directive [-Wextra-tokens]<br>
> +// MSVC2015: {{.*}}(36,8): warning: extra tokens at end of #endif directive [-Wextra-tokens]<br>
> // VI: {{.*}} +36:8: warning: extra tokens at end of #endif directive [-Wextra-tokens]<br>
> -// MSVC_ORIG: {{.*}}(36) : warning: extra tokens at end of #endif directive [-Wextra-tokens]<br>
> +// MSVC_ORIG: {{.*}}(36): warning: extra tokens at end of #endif directive [-Wextra-tokens]<br>
> // NO_COLUMN: {{.*}}:36: warning: extra tokens at end of #endif directive [-Wextra-tokens]<br>
> // MSVC2010-FALLBACK: {{.*}}(36,7) : error(clang): extra tokens at end of #endif directive<br>
> +// MSVC2013-FALLBACK: {{.*}}(36,8) : error(clang): extra tokens at end of #endif directive<br>
> // MSVC-FALLBACK: {{.*}}(36,8) : error(clang): extra tokens at end of #endif directive<br>
> +// MSVC2015-FALLBACK: {{.*}}(36,8): error(clang): extra tokens at end of #endif directive<br>
> int x;<br>
><br>
><br>
> _______________________________________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</div></div></blockquote></div><br></div></div>