cjdb created this revision.
cjdb added a reviewer: aaron.ballman.
Herald added a subscriber: dexonsmith.
cjdb requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D116260
Files:
clang/include/clang/AST/Type.h
clang/include/clang/Basic/Specifiers.h
clang/include/clang/Basic/TokenKinds.def
clang/include/clang/Sema/DeclSpec.h
clang/lib/AST/ItaniumMangle.cpp
clang/lib/AST/JSONNodeDumper.cpp
clang/lib/AST/TypePrinter.cpp
clang/lib/Format/FormatToken.cpp
clang/lib/Lex/PPMacroExpansion.cpp
clang/lib/Parse/ParseDecl.cpp
clang/lib/Parse/ParseDeclCXX.cpp
clang/lib/Sema/DeclSpec.cpp
clang/lib/Sema/SemaDecl.cpp
clang/lib/Sema/SemaTemplateVariadic.cpp
clang/lib/Sema/SemaType.cpp
clang/test/SemaCXX/remove_cvref.cpp
Index: clang/test/SemaCXX/remove_cvref.cpp
===================================================================
--- clang/test/SemaCXX/remove_cvref.cpp
+++ clang/test/SemaCXX/remove_cvref.cpp
@@ -9,6 +9,10 @@
static_assert(__is_same(__remove_volatile(const T), const T), "");
static_assert(__is_same(__remove_volatile(volatile T), T), "");
static_assert(__is_same(__remove_volatile(const volatile T), const T), "");
+
+ static_assert(__is_same(__remove_cv(const T), T), "");
+ static_assert(__is_same(__remove_cv(volatile T), T), "");
+ static_assert(__is_same(__remove_cv(const volatile T), T), "");
return true;
}
Index: clang/lib/Sema/SemaType.cpp
===================================================================
--- clang/lib/Sema/SemaType.cpp
+++ clang/lib/Sema/SemaType.cpp
@@ -1269,6 +1269,8 @@
return UnaryTransformType::AddVolatile;
case TST_remove_const:
return UnaryTransformType::RemoveConst;
+ case TST_remove_cv:
+ return UnaryTransformType::RemoveCV;
case TST_remove_volatile:
return UnaryTransformType::RemoveVolatile;
case TST_underlyingType:
@@ -1665,6 +1667,7 @@
case DeclSpec::TST_add_cv:
case DeclSpec::TST_add_volatile:
case DeclSpec::TST_remove_const:
+ case DeclSpec::TST_remove_cv:
case DeclSpec::TST_remove_volatile:
Result = S.GetTypeFromParser(DS.getRepAsType());
assert(!Result.isNull() && "Didn't get a type for the transformation?");
@@ -9097,6 +9100,7 @@
case UnaryTransformType::AddCV:
case UnaryTransformType::AddVolatile:
case UnaryTransformType::RemoveConst:
+ case UnaryTransformType::RemoveCV:
case UnaryTransformType::RemoveVolatile: {
SplitQualType Split = BaseType.getSplitUnqualifiedType();
Qualifiers Quals = BaseType.getQualifiers();
@@ -9115,6 +9119,9 @@
case UnaryTransformType::RemoveConst:
Quals.removeConst();
break;
+ case UnaryTransformType::RemoveCV:
+ Quals.removeConst();
+ [[fallthrough]];
case UnaryTransformType::RemoveVolatile:
Quals.removeVolatile();
break;
Index: clang/lib/Sema/SemaTemplateVariadic.cpp
===================================================================
--- clang/lib/Sema/SemaTemplateVariadic.cpp
+++ clang/lib/Sema/SemaTemplateVariadic.cpp
@@ -865,6 +865,7 @@
case TST_add_cv:
case TST_add_volatile:
case TST_remove_const:
+ case TST_remove_cv:
case TST_remove_volatile:
case TST_atomic: {
QualType T = DS.getRepAsType().get();
Index: clang/lib/Sema/SemaDecl.cpp
===================================================================
--- clang/lib/Sema/SemaDecl.cpp
+++ clang/lib/Sema/SemaDecl.cpp
@@ -149,6 +149,7 @@
case tok::kw___add_cv:
case tok::kw___add_volatile:
case tok::kw___remove_const:
+ case tok::kw___remove_cv:
case tok::kw___remove_volatile:
case tok::kw___auto_type:
return true;
@@ -5608,6 +5609,7 @@
case DeclSpec::TST_add_cv:
case DeclSpec::TST_add_volatile:
case DeclSpec::TST_remove_const:
+ case DeclSpec::TST_remove_cv:
case DeclSpec::TST_remove_volatile:
case DeclSpec::TST_atomic: {
// Grab the type from the parser.
Index: clang/lib/Sema/DeclSpec.cpp
===================================================================
--- clang/lib/Sema/DeclSpec.cpp
+++ clang/lib/Sema/DeclSpec.cpp
@@ -395,6 +395,7 @@
case TST_add_cv:
case TST_add_volatile:
case TST_remove_const:
+ case TST_remove_cv:
case TST_remove_volatile:
case TST_typename:
case TST_typeofType: {
@@ -591,6 +592,8 @@
return "__add_volatile";
case DeclSpec::TST_remove_const:
return "__remove_const";
+ case DeclSpec::TST_remove_cv:
+ return "__remove_cv";
case DeclSpec::TST_remove_volatile:
return "__remove_volatile";
case DeclSpec::TST_unknown_anytype: return "__unknown_anytype";
Index: clang/lib/Parse/ParseDeclCXX.cpp
===================================================================
--- clang/lib/Parse/ParseDeclCXX.cpp
+++ clang/lib/Parse/ParseDeclCXX.cpp
@@ -1534,7 +1534,7 @@
tok::kw___is_trivially_assignable,
tok::kw___is_trivially_constructible, tok::kw___is_trivially_copyable,
tok::kw___is_union, tok::kw___is_unsigned, tok::kw___is_void,
- tok::kw___is_volatile, tok::kw___remove_const,
+ tok::kw___is_volatile, tok::kw___remove_const, tok::kw___remove_cv,
tok::kw___remove_volatile))
// GNU libstdc++ 4.2 and libc++ use certain intrinsic names as the
// name of struct templates, but some are keywords in GCC >= 4.3
Index: clang/lib/Parse/ParseDecl.cpp
===================================================================
--- clang/lib/Parse/ParseDecl.cpp
+++ clang/lib/Parse/ParseDecl.cpp
@@ -4119,6 +4119,7 @@
case tok::kw___add_cv:
case tok::kw___add_volatile:
case tok::kw___remove_const:
+ case tok::kw___remove_cv:
case tok::kw___remove_volatile:
ParseTypeTransformTypeSpecifier(DS);
continue;
@@ -4233,6 +4234,8 @@
return DeclSpec::TST_add_volatile;
case tok::kw___remove_const:
return DeclSpec::TST_remove_const;
+ case tok::kw___remove_cv:
+ return DeclSpec::TST_remove_cv;
case tok::kw___remove_volatile:
return DeclSpec::TST_remove_volatile;
}
Index: clang/lib/Lex/PPMacroExpansion.cpp
===================================================================
--- clang/lib/Lex/PPMacroExpansion.cpp
+++ clang/lib/Lex/PPMacroExpansion.cpp
@@ -1662,6 +1662,7 @@
.Case("__add_cv", true)
.Case("__add_volatile", true)
.Case("__remove_const", true)
+ .Case("__remove_cv", true)
.Case("__remove_volatile", true)
.Default(false);
} else {
Index: clang/lib/Format/FormatToken.cpp
===================================================================
--- clang/lib/Format/FormatToken.cpp
+++ clang/lib/Format/FormatToken.cpp
@@ -61,6 +61,7 @@
case tok::kw___add_cv:
case tok::kw___add_volatile:
case tok::kw___remove_const:
+ case tok::kw___remove_cv:
case tok::kw___remove_volatile:
case tok::annot_typename:
case tok::kw_char8_t:
Index: clang/lib/AST/TypePrinter.cpp
===================================================================
--- clang/lib/AST/TypePrinter.cpp
+++ clang/lib/AST/TypePrinter.cpp
@@ -1125,9 +1125,10 @@
case UnaryTransformType::AddVolatile:
case UnaryTransformType::RemoveConst:
case UnaryTransformType::RemoveVolatile: {
- constexpr std::array<const char *, 6> Transformation = {
+ constexpr std::array<const char *, 7> Transformation = {
"__underlying_type", "__add_const", "__add_cv",
- "__add_volatile", "__remove_const", "__remove_volatile"};
+ "__add_volatile", "__remove_const", "__remove_cv",
+ "__remove_volatile"};
OS << Transformation[T->getUTTKind()] << '(';
print(T->getBaseType(), OS, StringRef());
OS << ')';
@@ -1149,6 +1150,7 @@
case UnaryTransformType::AddCV:
case UnaryTransformType::AddVolatile:
case UnaryTransformType::RemoveConst:
+ case UnaryTransformType::RemoveCV:
case UnaryTransformType::RemoveVolatile:
return;
}
Index: clang/lib/AST/JSONNodeDumper.cpp
===================================================================
--- clang/lib/AST/JSONNodeDumper.cpp
+++ clang/lib/AST/JSONNodeDumper.cpp
@@ -677,6 +677,9 @@
case UnaryTransformType::RemoveConst:
JOS.attribute("transformedKind", "remove_const");
break;
+ case UnaryTransformType::RemoveCV:
+ JOS.attribute("transformedKind", "remove_cv");
+ break;
case UnaryTransformType::RemoveVolatile:
JOS.attribute("transformedKind", "remove_volatile");
break;
Index: clang/lib/AST/ItaniumMangle.cpp
===================================================================
--- clang/lib/AST/ItaniumMangle.cpp
+++ clang/lib/AST/ItaniumMangle.cpp
@@ -3937,6 +3937,9 @@
case UnaryTransformType::RemoveConst:
Out << "3rc";
break;
+ case UnaryTransformType::RemoveCV:
+ Out << "3rcv";
+ break;
case UnaryTransformType::RemoveVolatile:
Out << "3rv";
break;
Index: clang/include/clang/Sema/DeclSpec.h
===================================================================
--- clang/include/clang/Sema/DeclSpec.h
+++ clang/include/clang/Sema/DeclSpec.h
@@ -295,6 +295,7 @@
static const TST TST_add_cv = clang::TST_add_cv;
static const TST TST_add_volatile = clang::TST_add_volatile;
static const TST TST_remove_const = clang::TST_remove_const;
+ static const TST TST_remove_cv = clang::TST_remove_cv;
static const TST TST_remove_volatile = clang::TST_remove_volatile;
static const TST TST_auto = clang::TST_auto;
static const TST TST_auto_type = clang::TST_auto_type;
Index: clang/include/clang/Basic/TokenKinds.def
===================================================================
--- clang/include/clang/Basic/TokenKinds.def
+++ clang/include/clang/Basic/TokenKinds.def
@@ -512,6 +512,7 @@
KEYWORD(__add_cv, KEYCXX)
KEYWORD(__add_volatile, KEYCXX)
KEYWORD(__remove_const, KEYCXX)
+KEYWORD(__remove_cv, KEYCXX)
KEYWORD(__remove_volatile, KEYCXX)
// Clang-only C++ Type Traits
Index: clang/include/clang/Basic/Specifiers.h
===================================================================
--- clang/include/clang/Basic/Specifiers.h
+++ clang/include/clang/Basic/Specifiers.h
@@ -87,6 +87,7 @@
TST_add_cv, // __add_cv extension
TST_add_volatile, // __add_volatile extension
TST_remove_const, // __remove_const extension
+ TST_remove_cv, // __remove_cv extension
TST_remove_volatile, // __remove_volatile extension
TST_auto, // C++11 auto
TST_decltype_auto, // C++1y decltype(auto)
Index: clang/include/clang/AST/Type.h
===================================================================
--- clang/include/clang/AST/Type.h
+++ clang/include/clang/AST/Type.h
@@ -4558,6 +4558,7 @@
AddConst,
AddVolatile,
RemoveConst,
+ RemoveCV,
RemoveVolatile,
};
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
