r243444 - Rename -Wmsvc-include to -Wmicrosoft-include, now that -Wmicrosoft is split up.
Nico Weber
nicolasweber at gmx.de
Tue Jul 28 09:48:12 PDT 2015
Author: nico
Date: Tue Jul 28 11:48:12 2015
New Revision: 243444
URL: http://llvm.org/viewvc/llvm-project?rev=243444&view=rev
Log:
Rename -Wmsvc-include to -Wmicrosoft-include, now that -Wmicrosoft is split up.
(Keep -Wmsvc-include around as an alias.)
While here, also replace the one other mention of "MSVC" in diagnostics with
"Microsoft", for consistency.
Modified:
cfe/trunk/include/clang/Basic/DiagnosticGroups.td
cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
cfe/trunk/test/Preprocessor/Inputs/microsoft-header-search/a/findme.h
cfe/trunk/test/Preprocessor/Inputs/microsoft-header-search/findme.h
cfe/trunk/test/Preprocessor/microsoft-header-search.c
cfe/trunk/test/SemaCXX/ms_struct.cpp
Modified: cfe/trunk/include/clang/Basic/DiagnosticGroups.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticGroups.td?rev=243444&r1=243443&r2=243444&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticGroups.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticGroups.td Tue Jul 28 11:48:12 2015
@@ -717,6 +717,7 @@ def GccCompat : DiagGroup<"gcc-compat">;
// Warnings for Microsoft extensions.
def MicrosoftCharize : DiagGroup<"microsoft-charize">;
+def MicrosoftInclude : DiagGroup<"microsoft-include">;
def MicrosoftCppMacro : DiagGroup<"microsoft-cpp-macro">;
def MicrosoftFixedEnum : DiagGroup<"microsoft-fixed-enum">;
def MicrosoftSealed : DiagGroup<"microsoft-sealed">;
@@ -743,12 +744,15 @@ def MicrosoftCast : DiagGroup<"microsoft
def MicrosoftConstInit : DiagGroup<"microsoft-const-init">;
def MicrosoftVoidPseudoDtor : DiagGroup<"microsoft-void-pseudo-dtor">;
def MicrosoftAnonTag : DiagGroup<"microsoft-anon-tag">;
+// Aliases.
+def : DiagGroup<"msvc-include", [MicrosoftInclude]>;
+ // -Wmsvc-include = -Wmicrosoft-include
// Warnings group for warnings about Microsoft extensions.
def Microsoft : DiagGroup<"microsoft",
- [MicrosoftCharize, MicrosoftCppMacro, MicrosoftFixedEnum, MicrosoftSealed,
- MicrosoftUnqualifiedFriend, MicrosoftExceptionSpec, MicrosoftUsingDecl,
- MicrosoftMutableReference, MicrosoftPureDefinition,
+ [MicrosoftCharize, MicrosoftInclude, MicrosoftCppMacro, MicrosoftFixedEnum,
+ MicrosoftSealed, MicrosoftUnqualifiedFriend, MicrosoftExceptionSpec,
+ MicrosoftUsingDecl, MicrosoftMutableReference, MicrosoftPureDefinition,
MicrosoftUnionMemberReference, MicrosoftExplicitConstructorCall,
MicrosoftEnumValue, MicrosoftDefaultArgRedefinition, MicrosoftTemplate,
MicrosoftRedeclareStatic, MicrosoftEnumForwardReference, MicrosoftGoto,
Modified: cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td?rev=243444&r1=243443&r2=243444&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td Tue Jul 28 11:48:12 2015
@@ -311,8 +311,8 @@ def ext_pp_import_directive : Extension<
def err_pp_import_directive_ms : Error<
"#import of type library is an unsupported Microsoft feature">;
def ext_pp_include_search_ms : ExtWarn<
- "#include resolved using non-portable MSVC search rules as: %0">,
- InGroup<DiagGroup<"msvc-include">>;
+ "#include resolved using non-portable Microsoft search rules as: %0">,
+ InGroup<MicrosoftInclude>;
def ext_pp_ident_directive : Extension<"#ident is a language extension">;
def ext_pp_include_next_directive : Extension<
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=243444&r1=243443&r2=243444&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Tue Jul 28 11:48:12 2015
@@ -548,14 +548,14 @@ def err_pragma_options_align_mac68k_targ
def warn_pragma_pack_invalid_alignment : Warning<
"expected #pragma pack parameter to be '1', '2', '4', '8', or '16'">,
InGroup<IgnoredPragmas>;
-// Follow the MSVC implementation.
+// Follow the Microsoft implementation.
def warn_pragma_pack_show : Warning<"value of #pragma pack(show) == %0">;
def warn_pragma_pack_pop_identifer_and_alignment : Warning<
"specifying both a name and alignment to 'pop' is undefined">;
def warn_pragma_pop_failed : Warning<"#pragma %0(pop, ...) failed: %1">,
InGroup<IgnoredPragmas>;
def warn_cxx_ms_struct :
- Warning<"ms_struct may not produce MSVC-compatible layouts for classes "
+ Warning<"ms_struct may not produce Microsoft-compatible layouts for classes "
"with base classes or virtual functions">,
DefaultError, InGroup<IncompatibleMSStruct>;
def err_section_conflict : Error<"%0 causes a section type conflict with %1">;
Modified: cfe/trunk/test/Preprocessor/Inputs/microsoft-header-search/a/findme.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/Inputs/microsoft-header-search/a/findme.h?rev=243444&r1=243443&r2=243444&view=diff
==============================================================================
--- cfe/trunk/test/Preprocessor/Inputs/microsoft-header-search/a/findme.h (original)
+++ cfe/trunk/test/Preprocessor/Inputs/microsoft-header-search/a/findme.h Tue Jul 28 11:48:12 2015
@@ -1,3 +1,3 @@
#pragma once
-#warning findme.h successfully included using MS search rules
\ No newline at end of file
+#warning findme.h successfully included using Microsoft header search rules
Modified: cfe/trunk/test/Preprocessor/Inputs/microsoft-header-search/findme.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/Inputs/microsoft-header-search/findme.h?rev=243444&r1=243443&r2=243444&view=diff
==============================================================================
--- cfe/trunk/test/Preprocessor/Inputs/microsoft-header-search/findme.h (original)
+++ cfe/trunk/test/Preprocessor/Inputs/microsoft-header-search/findme.h Tue Jul 28 11:48:12 2015
@@ -1,3 +1,3 @@
#pragma once
-#error Wrong findme.h included, MSVC header search incorrect
\ No newline at end of file
+#error Wrong findme.h included, Microsoft header search incorrect
Modified: cfe/trunk/test/Preprocessor/microsoft-header-search.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/microsoft-header-search.c?rev=243444&r1=243443&r2=243444&view=diff
==============================================================================
--- cfe/trunk/test/Preprocessor/microsoft-header-search.c (original)
+++ cfe/trunk/test/Preprocessor/microsoft-header-search.c Tue Jul 28 11:48:12 2015
@@ -1,7 +1,7 @@
// RUN: %clang_cc1 -I%S/Inputs/microsoft-header-search %s -fms-compatibility -verify
-// expected-warning at Inputs/microsoft-header-search/a/findme.h:3 {{findme.h successfully included using MS search rules}}
-// expected-warning at Inputs/microsoft-header-search/a/b/include3.h:3 {{#include resolved using non-portable MSVC search rules as}}
+// expected-warning at Inputs/microsoft-header-search/a/findme.h:3 {{findme.h successfully included using Microsoft header search rules}}
+// expected-warning at Inputs/microsoft-header-search/a/b/include3.h:3 {{#include resolved using non-portable Microsoft search rules as}}
// expected-warning at Inputs/microsoft-header-search/falsepos.h:3 {{successfully resolved the falsepos.h header}}
Modified: cfe/trunk/test/SemaCXX/ms_struct.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/ms_struct.cpp?rev=243444&r1=243443&r2=243444&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/ms_struct.cpp (original)
+++ cfe/trunk/test/SemaCXX/ms_struct.cpp Tue Jul 28 11:48:12 2015
@@ -11,9 +11,9 @@ struct A {
struct B : public A {
#ifdef TEST_FOR_ERROR
- // expected-error at -2 {{ms_struct may not produce MSVC-compatible layouts for classes with base classes or virtual functions}}
+ // expected-error at -2 {{ms_struct may not produce Microsoft-compatible layouts for classes with base classes or virtual functions}}
#else
- // expected-warning at -4 {{ms_struct may not produce MSVC-compatible layouts for classes with base classes or virtual functions}}
+ // expected-warning at -4 {{ms_struct may not produce Microsoft-compatible layouts for classes with base classes or virtual functions}}
#endif
unsigned long c:16;
int d;
@@ -26,9 +26,9 @@ static_assert(__builtin_offsetof(B, d) =
// rdar://16178895
struct C {
#ifdef TEST_FOR_ERROR
- // expected-error at -2 {{ms_struct may not produce MSVC-compatible layouts for classes with base classes or virtual functions}}
+ // expected-error at -2 {{ms_struct may not produce Microsoft-compatible layouts for classes with base classes or virtual functions}}
#else
- // expected-warning at -4 {{ms_struct may not produce MSVC-compatible layouts for classes with base classes or virtual functions}}
+ // expected-warning at -4 {{ms_struct may not produce Microsoft-compatible layouts for classes with base classes or virtual functions}}
#endif
virtual void foo();
long long n;
More information about the cfe-commits
mailing list