Merged to release_80 in r354459.
On Tue, Feb 19, 2019 at 5:57 PM Hans Wennborg via cfe-commits <cfe-commits@lists.llvm.org> wrote: > > Author: hans > Date: Tue Feb 19 08:58:25 2019 > New Revision: 354351 > > URL: http://llvm.org/viewvc/llvm-project?rev=354351&view=rev > Log: > Remove extraneous space in MSVC-style diagnostic output > > There was an extra space between the file location and the diagnostic > message: > > /tmp/a.c(1,12): warning: unused parameter 'unused' > > the tests didn't catch this due to FileCheck not running in > --strict-whitespace mode. > > Reported by Marco: > http://lists.llvm.org/pipermail/cfe-dev/2019-February/061326.html > > Differential revision: https://reviews.llvm.org/D58377 > > Modified: > cfe/trunk/lib/Frontend/TextDiagnostic.cpp > cfe/trunk/test/Misc/diag-format.c > > Modified: cfe/trunk/lib/Frontend/TextDiagnostic.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/TextDiagnostic.cpp?rev=354351&r1=354350&r2=354351&view=diff > ============================================================================== > --- cfe/trunk/lib/Frontend/TextDiagnostic.cpp (original) > +++ cfe/trunk/lib/Frontend/TextDiagnostic.cpp Tue Feb 19 08:58:25 2019 > @@ -837,7 +837,7 @@ void TextDiagnostic::emitDiagnosticLoc(F > if (LangOpts.MSCompatibilityVersion && > !LangOpts.isCompatibleWithMSVC(LangOptions::MSVC2015)) > OS << ' '; > - OS << ": "; > + OS << ':'; > break; > } > > > Modified: cfe/trunk/test/Misc/diag-format.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Misc/diag-format.c?rev=354351&r1=354350&r2=354351&view=diff > ============================================================================== > --- cfe/trunk/test/Misc/diag-format.c (original) > +++ cfe/trunk/test/Misc/diag-format.c Tue Feb 19 08:58:25 2019 > @@ -1,30 +1,30 @@ > -// RUN: %clang -fsyntax-only %s 2>&1 | FileCheck %s -check-prefix=DEFAULT > -// RUN: %clang -fsyntax-only -fdiagnostics-format=clang %s 2>&1 | FileCheck > %s -check-prefix=DEFAULT > -// RUN: %clang -fsyntax-only -fdiagnostics-format=clang -target > x86_64-pc-win32 %s 2>&1 | FileCheck %s -check-prefix=DEFAULT > +// RUN: %clang -fsyntax-only %s 2>&1 | FileCheck %s --strict-whitespace > -check-prefix=DEFAULT > +// RUN: %clang -fsyntax-only -fdiagnostics-format=clang %s 2>&1 | FileCheck > %s --strict-whitespace -check-prefix=DEFAULT > +// RUN: %clang -fsyntax-only -fdiagnostics-format=clang -target > x86_64-pc-win32 %s 2>&1 | FileCheck %s --strict-whitespace > -check-prefix=DEFAULT > // > -// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1300 > %s 2>&1 | FileCheck %s -check-prefix=MSVC2010 > -// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc > -fms-compatibility-version=13.00 %s 2>&1 | FileCheck %s > -check-prefix=MSVC2010 > -// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1300 > -target x86_64-pc-win32 %s 2>&1 | FileCheck %s -check-prefix=MSVC2010 > -// 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 > -// 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 > -// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1800 > -target x86_64-pc-win32 %s 2>&1 | FileCheck %s -check-prefix=MSVC2013 > -// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -target > x86_64-pc-win32 %s 2>&1 | FileCheck %s -check-prefix=MSVC > -// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1900 > -target x86_64-pc-win32 %s 2>&1 | FileCheck %s -check-prefix=MSVC2015 > -// 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 > -// 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 > -// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -target > x86_64-pc-win32 -fshow-column %s 2>&1 | FileCheck %s -check-prefix=MSVC > -// 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 > +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1300 > %s 2>&1 | FileCheck %s --strict-whitespace -check-prefix=MSVC2010 > +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc > -fms-compatibility-version=13.00 %s 2>&1 | FileCheck %s --strict-whitespace > -check-prefix=MSVC2010 > +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1300 > -target x86_64-pc-win32 %s 2>&1 | FileCheck %s --strict-whitespace > -check-prefix=MSVC2010 > +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc > -fms-compatibility-version=13.00 -target x86_64-pc-win32 %s 2>&1 | FileCheck > %s --strict-whitespace -check-prefix=MSVC2010 > +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1300 > -target x86_64-pc-win32 -fshow-column %s 2>&1 | FileCheck %s > --strict-whitespace -check-prefix=MSVC2010 > +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1800 > -target x86_64-pc-win32 %s 2>&1 | FileCheck %s --strict-whitespace > -check-prefix=MSVC2013 > +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -target > x86_64-pc-win32 %s 2>&1 | FileCheck %s --strict-whitespace -check-prefix=MSVC > +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1900 > -target x86_64-pc-win32 %s 2>&1 | FileCheck %s --strict-whitespace > -check-prefix=MSVC2015 > +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc > -fms-compatibility-version=13.00 -target x86_64-pc-win32 -fshow-column %s > 2>&1 | FileCheck %s --strict-whitespace -check-prefix=MSVC2010 > +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1800 > -target x86_64-pc-win32 -fshow-column %s 2>&1 | FileCheck %s > --strict-whitespace -check-prefix=MSVC2013 > +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -target > x86_64-pc-win32 -fshow-column %s 2>&1 | FileCheck %s --strict-whitespace > -check-prefix=MSVC > +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fmsc-version=1900 > -target x86_64-pc-win32 -fshow-column %s 2>&1 | FileCheck %s > --strict-whitespace -check-prefix=MSVC2015 > // > -// RUN: %clang -fsyntax-only -fdiagnostics-format=vi %s 2>&1 | FileCheck > %s -check-prefix=VI > +// RUN: %clang -fsyntax-only -fdiagnostics-format=vi %s 2>&1 | FileCheck > %s --strict-whitespace -check-prefix=VI > // > -// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fno-show-column > -fmsc-version=1900 %s 2>&1 | FileCheck %s -check-prefix=MSVC2015_ORIG > +// RUN: %clang -fsyntax-only -fdiagnostics-format=msvc -fno-show-column > -fmsc-version=1900 %s 2>&1 | FileCheck %s --strict-whitespace > -check-prefix=MSVC2015_ORIG > // > -// RUN: %clang -fsyntax-only -fno-show-column %s 2>&1 | FileCheck %s > -check-prefix=NO_COLUMN > +// RUN: %clang -fsyntax-only -fno-show-column %s 2>&1 | FileCheck %s > --strict-whitespace -check-prefix=NO_COLUMN > // > -// RUN: not %clang -fsyntax-only -Werror -fdiagnostics-format=msvc-fallback > -fmsc-version=1300 %s 2>&1 | FileCheck %s -check-prefix=MSVC2010-FALLBACK > -// RUN: not %clang -fsyntax-only -Werror -fdiagnostics-format=msvc-fallback > -fms-compatibility-version=13.00 %s 2>&1 | FileCheck %s > -check-prefix=MSVC2010-FALLBACK > -// RUN: not %clang -fsyntax-only -Werror -fdiagnostics-format=msvc-fallback > -fmsc-version=1800 %s 2>&1 | FileCheck %s -check-prefix=MSVC2013-FALLBACK > -// RUN: not %clang -fsyntax-only -Werror -fdiagnostics-format=msvc-fallback > -fmsc-version=1900 %s 2>&1 | FileCheck %s -check-prefix=MSVC2015-FALLBACK > +// RUN: not %clang -fsyntax-only -Werror -fdiagnostics-format=msvc-fallback > -fmsc-version=1300 %s 2>&1 | FileCheck %s --strict-whitespace > -check-prefix=MSVC2010-FALLBACK > +// RUN: not %clang -fsyntax-only -Werror -fdiagnostics-format=msvc-fallback > -fms-compatibility-version=13.00 %s 2>&1 | FileCheck %s --strict-whitespace > -check-prefix=MSVC2010-FALLBACK > +// RUN: not %clang -fsyntax-only -Werror -fdiagnostics-format=msvc-fallback > -fmsc-version=1800 %s 2>&1 | FileCheck %s --strict-whitespace > -check-prefix=MSVC2013-FALLBACK > +// RUN: not %clang -fsyntax-only -Werror -fdiagnostics-format=msvc-fallback > -fmsc-version=1900 %s 2>&1 | FileCheck %s --strict-whitespace > -check-prefix=MSVC2015-FALLBACK > > > > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
