summaryrefslogtreecommitdiff
path: root/include/clang/Basic
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2019-05-21 23:15:20 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2019-05-21 23:15:20 +0000
commitbeec40f7fdb23833c51c2aa79009ce741b03d49a (patch)
treeef663b599651f5753f132320041dde98ae432185 /include/clang/Basic
parent695aab4c2beb2412fc3531e9f55b22267ecf9af3 (diff)
downloadclang-beec40f7fdb23833c51c2aa79009ce741b03d49a.tar.gz
[c++20] P1330R0: permit simple-assignments that change the active member
of a union within constant expression evaluation. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@361329 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Basic')
-rw-r--r--include/clang/Basic/DiagnosticASTKinds.td2
-rw-r--r--include/clang/Basic/DiagnosticIDs.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/clang/Basic/DiagnosticASTKinds.td b/include/clang/Basic/DiagnosticASTKinds.td
index f1172a91ea..363dc444db 100644
--- a/include/clang/Basic/DiagnosticASTKinds.td
+++ b/include/clang/Basic/DiagnosticASTKinds.td
@@ -55,6 +55,8 @@ def note_constexpr_non_global : Note<
"%select{temporary|%3}2 is not a constant expression">;
def note_constexpr_uninitialized : Note<
"%select{|sub}0object of type %1 is not initialized">;
+def note_constexpr_subobject_declared_here : Note<
+ "subobject declared here">;
def note_constexpr_array_index : Note<"cannot refer to element %0 of "
"%select{array of %2 element%plural{1:|:s}2|non-array object}1 "
"in a constant expression">;
diff --git a/include/clang/Basic/DiagnosticIDs.h b/include/clang/Basic/DiagnosticIDs.h
index 0ea0cebed3..8ee9a970b1 100644
--- a/include/clang/Basic/DiagnosticIDs.h
+++ b/include/clang/Basic/DiagnosticIDs.h
@@ -33,7 +33,7 @@ namespace clang {
DIAG_SIZE_SERIALIZATION = 120,
DIAG_SIZE_LEX = 400,
DIAG_SIZE_PARSE = 500,
- DIAG_SIZE_AST = 150,
+ DIAG_SIZE_AST = 200,
DIAG_SIZE_COMMENT = 100,
DIAG_SIZE_CROSSTU = 100,
DIAG_SIZE_SEMA = 4000,