src - FreeBSD source tree

diff options


context:
space:
mode:

author	Dimitry Andric <dim@FreeBSD.org>	2017-06-10 13:44:22 +0000
committer	Dimitry Andric <dim@FreeBSD.org>	2017-06-10 13:44:22 +0000
commit	1b08b196ac845675036ac78f3ac927d0a37f707c (patch)
tree	1fbd923674e903831dc097fdb4fdfd64dd6e47b1 /include/clang/Basic
parent	551c698530debaae81139c7c76a29fb762793362 (diff)

Vendor import of clang trunk r305145:vendor/clang/clang-trunk-r305145

https://llvm.org/svn/llvm-project/cfe/trunk@305145

Notes

Notes: svn path=/vendor/clang/dist/; revision=319782 svn path=/vendor/clang/clang-trunk-r305145/; revision=319783; tag=vendor/clang/clang-trunk-r305145

Diffstat (limited to 'include/clang/Basic')

-rw-r--r--

include/clang/Basic/Attr.td

-rw-r--r--

include/clang/Basic/DiagnosticFrontendKinds.td

-rw-r--r--

include/clang/Basic/DiagnosticLexKinds.td

-rw-r--r--

include/clang/Basic/DiagnosticParseKinds.td

-rw-r--r--

include/clang/Basic/DiagnosticSemaKinds.td

-rw-r--r--

include/clang/Basic/DiagnosticSerializationKinds.td

-rw-r--r--

include/clang/Basic/LangOptions.h

-rw-r--r--

include/clang/Basic/SourceManager.h

8 files changed, 69 insertions, 0 deletions

diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
index 9da2cc376d54..bc36fd8c8297 100644
--- a/include/clang/Basic/Attr.td
+++ b/include/clang/Basic/Attr.td

@@ -1683,6 +1683,42 @@ def Section : InheritableAttr {

let Documentation = [SectionDocs];

}

+def PragmaClangBSSSection : InheritableAttr {

+ // This attribute has no spellings as it is only ever created implicitly.

+ let Spellings = [];

+ let Args = [StringArgument<"Name">];

+ let Subjects = SubjectList<[GlobalVar], ErrorDiag,

+ "ExpectedFunctionMethodOrGlobalVar">;

+ let Documentation = [Undocumented];

+def PragmaClangDataSection : InheritableAttr {

+ // This attribute has no spellings as it is only ever created implicitly.

+ let Spellings = [];

+ let Args = [StringArgument<"Name">];

+ let Subjects = SubjectList<[GlobalVar], ErrorDiag,

+ "ExpectedFunctionMethodOrGlobalVar">;

+ let Documentation = [Undocumented];

+def PragmaClangRodataSection : InheritableAttr {

+ // This attribute has no spellings as it is only ever created implicitly.

+ let Spellings = [];

+ let Args = [StringArgument<"Name">];

+ let Subjects = SubjectList<[GlobalVar], ErrorDiag,

+ "ExpectedFunctionMethodOrGlobalVar">;

+ let Documentation = [Undocumented];

+def PragmaClangTextSection : InheritableAttr {

+ // This attribute has no spellings as it is only ever created implicitly.

+ let Spellings = [];

+ let Args = [StringArgument<"Name">];

+ let Subjects = SubjectList<[Function], ErrorDiag,

+ "ExpectedFunctionMethodOrGlobalVar">;

+ let Documentation = [Undocumented];

def Sentinel : InheritableAttr {

let Spellings = [GCC<"sentinel">];

let Args = [DefaultIntArgument<"Sentinel", 0>,

diff --git a/include/clang/Basic/DiagnosticFrontendKinds.td b/include/clang/Basic/DiagnosticFrontendKinds.td
index 1267f8d09f58..8b4cb47e545d 100644
--- a/include/clang/Basic/DiagnosticFrontendKinds.td
+++ b/include/clang/Basic/DiagnosticFrontendKinds.td

@@ -196,6 +196,7 @@ def err_no_submodule_suggest : Error<

"no submodule named %0 in module '%1'; did you mean '%2'?">;

def warn_missing_submodule : Warning<"missing submodule '%0'">,

InGroup<IncompleteUmbrella>;

+def note_module_import_here : Note<"module imported here">;

def err_module_cannot_create_includes : Error<

"cannot create includes file for module %0: %1">;

def warn_module_config_macro_undef : Warning<

diff --git a/include/clang/Basic/DiagnosticLexKinds.td b/include/clang/Basic/DiagnosticLexKinds.td
index 447f06945660..d6de5c04a74d 100644
--- a/include/clang/Basic/DiagnosticLexKinds.td
+++ b/include/clang/Basic/DiagnosticLexKinds.td

@@ -527,6 +527,10 @@ def err_pp_module_end_without_module_begin : Error<

"'#pragma clang module end'">;

def note_pp_module_begin_here : Note<

"entering module '%0' due to this pragma">;

+def err_pp_module_build_pth : Error<

+ "'#pragma clang module build' not supported in pretokenized header">;

+def err_pp_module_build_missing_end : Error<

+ "no matching '#pragma clang module endbuild' for this '#pragma clang module build'">;

def err_defined_macro_name : Error<"'defined' cannot be used as a macro name">;

def err_paste_at_start : Error<

diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td
index f04ed8ed4ce6..f39ffeae61f4 100644
--- a/include/clang/Basic/DiagnosticParseKinds.td
+++ b/include/clang/Basic/DiagnosticParseKinds.td

@@ -887,9 +887,18 @@ def warn_pragma_expected_rparen : Warning<

"missing ')' after '#pragma %0' - ignoring">, InGroup<IgnoredPragmas>;

def warn_pragma_expected_identifier : Warning<

"expected identifier in '#pragma %0' - ignored">, InGroup<IgnoredPragmas>;

+// '#pragma clang section' related errors

+def err_pragma_expected_clang_section_name : Error<

+ "expected one of [bss|data|rodata|text] section kind in '#pragma %0'">;

+def err_pragma_clang_section_expected_equal : Error<

+ "expected '=' following '#pragma clang section %select{invalid|bss|data|rodata|text}0'">;

+def err_pragma_clang_section_expected_name_or_clear : Error<

+ "expected section name or '\"\"' following '#pragma clang section %select{invalid|bss|data|rodata|text}0'">;

def warn_pragma_expected_section_name : Warning<

"expected a string literal for the section name in '#pragma %0' - ignored">,

InGroup<IgnoredPragmas>;

def warn_pragma_expected_section_push_pop_or_name : Warning<

"expected push, pop or a string literal for the section name in '#pragma %0' - ignored">,

InGroup<IgnoredPragmas>;

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index a5a5c74afe69..aa73a6934518 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td

@@ -5613,6 +5613,11 @@ def err_enumerator_does_not_exist : Error<

def note_enum_specialized_here : Note<

"enum %0 was explicitly specialized here">;

+def err_specialization_not_primary_template : Error<

+ "cannot reference member of primary template because deduced class "

+ "template specialization %0 is %select{instantiated from a partial|"

+ "an explicit}1 specialization">;

def err_member_redeclared : Error<"class member cannot be redeclared">;

def ext_member_redeclared : ExtWarn<"class member cannot be redeclared">,

InGroup<RedeclaredClassMember>;

diff --git a/include/clang/Basic/DiagnosticSerializationKinds.td b/include/clang/Basic/DiagnosticSerializationKinds.td
index f9e7b8fa9b56..7c9e8c8980aa 100644
--- a/include/clang/Basic/DiagnosticSerializationKinds.td
+++ b/include/clang/Basic/DiagnosticSerializationKinds.td

@@ -174,6 +174,15 @@ def note_module_odr_violation_mismatch_decl_diff : Note<"but in '%0' found "

"method %2 with %ordinal3 parameter of type %4%select{| decayed from %6}5|"

"method %2 with %ordinal3 parameter named %4}1">;

+def err_module_odr_violation_mismatch_decl_unknown : Error<

+ "%q0 %select{with definition in module '%2'|defined here}1 has different "

+ "definitions in different modules; first difference is this "

+ "%select{||||static assert|field|method|unexpected decl}3">;

+def note_module_odr_violation_mismatch_decl_unknown : Note<

+ "but in '%0' found "

+ "%select{||||different static assert|different field|different method|"

+ "another unexpected decl}1">;

def warn_duplicate_module_file_extension : Warning<

"duplicate module file extension block name '%0'">,

InGroup<ModuleFileExtension>;

diff --git a/include/clang/Basic/LangOptions.h b/include/clang/Basic/LangOptions.h
index 2513de70e721..8488515d2b67 100644
--- a/include/clang/Basic/LangOptions.h
+++ b/include/clang/Basic/LangOptions.h

@@ -58,6 +58,7 @@ public:

SOB_Trapping // -ftrapv

};

+ // FIXME: Unify with TUKind.

enum CompilingModuleKind {

CMK_None, ///< Not compiling a module interface at all.

CMK_ModuleMap, ///< Compiling a module from a module map.

diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h
index eda802934006..5e01f6416748 100644
--- a/include/clang/Basic/SourceManager.h
+++ b/include/clang/Basic/SourceManager.h

@@ -722,6 +722,10 @@ public:

void clearIDTables();

+ /// Initialize this source manager suitably to replay the compilation

+ /// described by \p Old. Requires that \p Old outlive \p *this.

+ void initializeForReplay(const SourceManager &Old);

DiagnosticsEngine &getDiagnostics() const { return Diag; }

FileManager &getFileManager() const { return FileMgr; }