maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Avoid non-attributive uses of 'unsupported' in diagnostics 

We don't have a style guide for diagnostic messages, but convention strongly
favours the forms:

  'attribute is not supported', 'unsupported attribute'

We generally avoid:

  'attribute is unsupported', 'non-supported attribute'

llvm-svn: 212972
This commit is contained in:
Alp Toker 2014-07-14 19:16:22 +00:00
parent 199b39e063
commit cd3acb5604
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/DiagnosticDriverKinds.td
View File

@ -120,7 +120,7 @@ def err_drv_optimization_remark_pattern : Error<
"%0 in '%1'">;
def warn_O4_is_O3 : Warning<"-O4 is equivalent to -O3">, InGroup<Deprecated>;
def warn_drv_optimization_value : Warning<"optimization level '%0' is unsupported; using '%1%2' instead">,
def warn_drv_optimization_value : Warning<"optimization level '%0' is not supported; using '%1%2' instead">,
InGroup<InvalidCommandLineArgument>;
def warn_ignored_gcc_optimization : Warning<"optimization flag '%0' is not supported">,
InGroup<InvalidCommandLineArgument>;

6
clang/include/clang/Basic/DiagnosticSemaKinds.td
View File

@ -349,7 +349,7 @@ def err_invalid_thread : Error<
def err_thread_non_global : Error<
"'%0' variables must have global storage">;
def err_thread_unsupported : Error<
"thread-local storage is unsupported for the current target">;
"thread-local storage is not supported for the current target">;
def warn_maybe_falloff_nonvoid_function : Warning<
"control may reach end of non-void function">,
@ -2131,7 +2131,7 @@ def err_attribute_dll_member_of_dll_class : Error<
def warn_attribute_dll_instantiated_base_class : Warning<
"propagating dll attribute to %select{already instantiated|explicitly specialized}0 "
"base class template "
"%select{without dll attribute|with different dll attribute}1 is unsupported">,
"%select{without dll attribute|with different dll attribute}1 is not supported">,
InGroup<DiagGroup<"unsupported-dll-base-class-template">>;
def err_attribute_weakref_not_static : Error<
"weakref declaration must have internal linkage">;
@ -6914,7 +6914,7 @@ def err_uncasted_send_to_unknown_any_method : Error<
"no known method %select{%objcinstance1|%objcclass1}0; cast the "
"message send to the method's return type">;
def err_unsupported_unknown_any_decl : Error<
"%0 has unknown type, which is unsupported for this kind of declaration">;
"%0 has unknown type, which is not supported for this kind of declaration">;
def err_unsupported_unknown_any_expr : Error<
"unsupported expression with unknown type">;
def err_unsupported_unknown_any_call : Error<

2
clang/test/Driver/clang_f_opts.c
View File

@ -127,7 +127,7 @@
// CHECK-MAX-O: -O3
// RUN: %clang -S -O20 -o /dev/null %s 2>&1 | FileCheck -check-prefix=CHECK-INVALID-O %s
// CHECK-INVALID-O: warning: optimization level '-O20' is unsupported; using '-O3' instead
// CHECK-INVALID-O: warning: optimization level '-O20' is not supported; using '-O3' instead
// RUN: %clang -### -S -finput-charset=iso-8859-1 -o /dev/null %s 2>&1 | FileCheck -check-prefix=CHECK-INVALID-CHARSET %s
// CHECK-INVALID-CHARSET: error: invalid value 'iso-8859-1' in '-finput-charset=iso-8859-1'

2
clang/test/Frontend/invalid-o-level.c
View File

@ -1,4 +1,4 @@
// RUN: %clang_cc1 %s -O900 -o /dev/null 2> %t.log
// RUN: FileCheck %s -input-file=%t.log
// CHECK: warning: optimization level '-O900' is unsupported; using '-O3' instead
// CHECK: warning: optimization level '-O900' is not supported; using '-O3' instead

8
clang/test/SemaCXX/dllexport.cpp
View File

@ -370,7 +370,7 @@ class __declspec(dllexport) DerivedFromImportedTemplate : public ImportedClassTe
#ifdef MS
// expected-note@+4{{class template 'ClassTemplate<double>' was instantiated here}}
// expected-warning@+4{{propagating dll attribute to already instantiated base class template without dll attribute is unsupported}}
// expected-warning@+4{{propagating dll attribute to already instantiated base class template without dll attribute is not supported}}
// expected-note@+3{{attribute is here}}
#endif
class DerivedFromTemplateD : public ClassTemplate<double> {};
@ -378,14 +378,14 @@ class __declspec(dllexport) DerivedFromTemplateD2 : public ClassTemplate<double>
#ifdef MS
// expected-note@+4{{class template 'ClassTemplate<bool>' was instantiated here}}
// expected-warning@+4{{propagating dll attribute to already instantiated base class template with different dll attribute is unsupported}}
// expected-warning@+4{{propagating dll attribute to already instantiated base class template with different dll attribute is not supported}}
// expected-note@+3{{attribute is here}}
#endif
class __declspec(dllimport) DerivedFromTemplateB : public ClassTemplate<bool> {};
class __declspec(dllexport) DerivedFromTemplateB2 : public ClassTemplate<bool> {};
#ifdef MS
// expected-warning@+3{{propagating dll attribute to explicitly specialized base class template without dll attribute is unsupported}}
// expected-warning@+3{{propagating dll attribute to explicitly specialized base class template without dll attribute is not supported}}
// expected-note@+2{{attribute is here}}
#endif
struct __declspec(dllexport) DerivedFromExplicitlySpecializedTemplate : public ExplicitlySpecializedTemplate<int> {};
@ -397,7 +397,7 @@ struct __declspec(dllexport) DerivedFromExplicitlyExportSpecializedTemplate : pu
struct __declspec(dllexport) DerivedFromExplicitlyImportSpecializedTemplate : public ExplicitlyImportSpecializedTemplate<int> {};
#ifdef MS
// expected-warning@+3{{propagating dll attribute to already instantiated base class template without dll attribute is unsupported}}
// expected-warning@+3{{propagating dll attribute to already instantiated base class template without dll attribute is not supported}}
// expected-note@+2{{attribute is here}}
#endif
struct __declspec(dllexport) DerivedFromExplicitlyInstantiatedTemplate : public ExplicitlyInstantiatedTemplate<int> {};

8
clang/test/SemaCXX/dllimport.cpp
View File

@ -1026,7 +1026,7 @@ class __declspec(dllimport) DerivedFromExportedTemplate : public ExportedClassTe
#ifdef MS
// expected-note@+4{{class template 'ClassTemplate<double>' was instantiated here}}
// expected-warning@+4{{propagating dll attribute to already instantiated base class template without dll attribute is unsupported}}
// expected-warning@+4{{propagating dll attribute to already instantiated base class template without dll attribute is not supported}}
// expected-note@+3{{attribute is here}}
#endif
class DerivedFromTemplateD : public ClassTemplate<double> {};
@ -1034,7 +1034,7 @@ class __declspec(dllimport) DerivedFromTemplateD2 : public ClassTemplate<double>
#ifdef MS
// expected-note@+4{{class template 'ClassTemplate<bool>' was instantiated here}}
// expected-warning@+4{{propagating dll attribute to already instantiated base class template with different dll attribute is unsupported}}
// expected-warning@+4{{propagating dll attribute to already instantiated base class template with different dll attribute is not supported}}
// expected-note@+3{{attribute is here}}
#endif
class __declspec(dllexport) DerivedFromTemplateB : public ClassTemplate<bool> {};
@ -1061,7 +1061,7 @@ template <typename T> struct ExplicitlyImportInstantiatedTemplate { void func()
template struct __declspec(dllimport) ExplicitlyImportInstantiatedTemplate<int>;
#ifdef MS
// expected-warning@+3{{propagating dll attribute to explicitly specialized base class template without dll attribute is unsupported}}
// expected-warning@+3{{propagating dll attribute to explicitly specialized base class template without dll attribute is not supported}}
// expected-note@+2{{attribute is here}}
#endif
struct __declspec(dllimport) DerivedFromExplicitlySpecializedTemplate : public ExplicitlySpecializedTemplate<int> {};
@ -1073,7 +1073,7 @@ struct __declspec(dllimport) DerivedFromExplicitlyExportSpecializedTemplate : pu
struct __declspec(dllimport) DerivedFromExplicitlyImportSpecializedTemplate : public ExplicitlyImportSpecializedTemplate<int> {};
#ifdef MS
// expected-warning@+3{{propagating dll attribute to already instantiated base class template without dll attribute is unsupported}}
// expected-warning@+3{{propagating dll attribute to already instantiated base class template without dll attribute is not supported}}
// expected-note@+2{{attribute is here}}
#endif
struct __declspec(dllimport) DerivedFromExplicitlyInstantiatedTemplate : public ExplicitlyInstantiatedTemplate<int> {};