[clang] [SemaCXX] Implement CWG2351 `void{}` (PR #78060)
Mital Ashok via cfe-commits
cfe-commits at lists.llvm.org
Sat Jan 13 12:49:33 PST 2024
https://github.com/MitalAshok updated https://github.com/llvm/llvm-project/pull/78060
>From b33b2bc24ff0af7b2cb0f740826885f1f2dafb49 Mon Sep 17 00:00:00 2001
From: Mital Ashok <mital at mitalashok.co.uk>
Date: Sat, 13 Jan 2024 18:03:15 +0000
Subject: [PATCH] [SemaCXX] Implement CWG2351 `void{}`
---
clang/docs/ReleaseNotes.rst | 2 ++
clang/include/clang/AST/ExprCXX.h | 5 +--
clang/lib/Sema/SemaExprCXX.cpp | 25 +++++++++----
clang/test/CXX/drs/dr23xx.cpp | 41 +++++++++++++++++++++-
clang/test/SemaCXX/attr-annotate.cpp | 4 +--
clang/test/SemaCXX/cxx2a-explicit-bool.cpp | 4 +--
clang/test/SemaCXX/sugared-auto.cpp | 6 ++++
clang/www/cxx_dr_status.html | 2 +-
8 files changed, 75 insertions(+), 14 deletions(-)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 3cbce1be159437..00e200ea76e5bc 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -226,6 +226,8 @@ C++2c Feature Support
Resolutions to C++ Defect Reports
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Implemented `CWG2351 <https://wg21.link/CWG2351>`_ which allows ``void{}``
+ as a prvalue of type ``void``.
C Language Changes
------------------
diff --git a/clang/include/clang/AST/ExprCXX.h b/clang/include/clang/AST/ExprCXX.h
index 24278016431837..e7b732e4181127 100644
--- a/clang/include/clang/AST/ExprCXX.h
+++ b/clang/include/clang/AST/ExprCXX.h
@@ -2160,8 +2160,9 @@ class LambdaExpr final : public Expr,
const_child_range children() const;
};
-/// An expression "T()" which creates a value-initialized rvalue of type
-/// T, which is a non-class type. See (C++98 [5.2.3p2]).
+/// An expression "T()" which creates an rvalue of type T, which is a
+/// non-class type. For non-void T, the rvalue is value-initialized.
+/// See (C++98 [5.2.3p2]).
class CXXScalarValueInitExpr : public Expr {
friend class ASTStmtReader;
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 4ae04358d5df7c..d1229f0182d660 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -1600,12 +1600,25 @@ Sema::BuildCXXTypeConstructExpr(TypeSourceInfo *TInfo,
return ExprError(Diag(TyBeginLoc, diag::err_init_for_function_type)
<< Ty << FullRange);
- // C++17 [expr.type.conv]p2:
- // If the type is cv void and the initializer is (), the expression is a
- // prvalue of the specified type that performs no initialization.
- if (!Ty->isVoidType() &&
- RequireCompleteType(TyBeginLoc, ElemTy,
- diag::err_invalid_incomplete_type_use, FullRange))
+ // C++17 [expr.type.conv]p2, per DR2351:
+ // If the type is cv void and the initializer is () or {}, the expression is
+ // a prvalue of the specified type that performs no initialization.
+ if (Ty->isVoidType()) {
+
+ if (Exprs.empty())
+ return new (Context) CXXScalarValueInitExpr(
+ Ty.getUnqualifiedType(), TInfo, Kind.getRange().getEnd());
+ if (ListInitialization &&
+ cast<InitListExpr>(Exprs[0])->getNumInits() == 0) {
+ assert(getLangOpts().CPlusPlus11 && "ListInitialization in C++98/03?");
+ return CXXFunctionalCastExpr::Create(
+ Context, Ty.getUnqualifiedType(), VK_PRValue, TInfo, CK_NoOp,
+ Exprs[0], /*Path=*/nullptr, CurFPFeatureOverrides(),
+ Exprs[0]->getBeginLoc(), Exprs[0]->getEndLoc());
+ }
+ } else if (RequireCompleteType(TyBeginLoc, ElemTy,
+ diag::err_invalid_incomplete_type_use,
+ FullRange))
return ExprError();
// Otherwise, the expression is a prvalue of the specified type whose
diff --git a/clang/test/CXX/drs/dr23xx.cpp b/clang/test/CXX/drs/dr23xx.cpp
index d2f4e7652ab568..e1d1bd06235b5b 100644
--- a/clang/test/CXX/drs/dr23xx.cpp
+++ b/clang/test/CXX/drs/dr23xx.cpp
@@ -1,4 +1,5 @@
-// RUN: %clang_cc1 -std=c++98 %s -verify=expected -fexceptions -fcxx-exceptions -pedantic-errors 2>&1 | FileCheck %s
+// RUN: %clang_cc1 -std=c++98 %s -verify=expected,cxx98-03 -fexceptions -fcxx-exceptions -pedantic-errors 2>&1 | FileCheck %s
+// RUN: %clang_cc1 -std=c++03 %s -verify=expected,cxx98-03 -fexceptions -fcxx-exceptions -pedantic-errors 2>&1 | FileCheck %s
// RUN: %clang_cc1 -std=c++11 %s -verify=expected,since-cxx11 -fexceptions -fcxx-exceptions -pedantic-errors 2>&1 | FileCheck %s
// RUN: %clang_cc1 -std=c++14 %s -verify=expected,since-cxx11,since-cxx14 -fexceptions -fcxx-exceptions -pedantic-errors 2>&1 | FileCheck %s
// RUN: %clang_cc1 -std=c++17 %s -verify=expected,since-cxx11,since-cxx14,since-cxx17 -fexceptions -fcxx-exceptions -pedantic-errors 2>&1 | FileCheck %s
@@ -69,6 +70,44 @@ namespace dr2346 { // dr2346: 11
}
}
+namespace dr2351 { // dr2351: 18
+#if __cplusplus >= 201103L
+ static_assert((void{}, true), "");
+ // since-cxx11-warning at -1 {{left operand of comma operator has no effect}}
+
+ void f() {
+ return void{};
+ }
+
+ template<typename T>
+ void g() {
+ return T{};
+ }
+ template void g<void>();
+ template void g<const void>();
+
+ void h() {
+ return {};
+ // since-cxx11-error at -1 {{void function 'h' must not return a value}}
+ }
+
+ template<typename T, int... I>
+ T i() {
+ return T{I...};
+ }
+ template void i<void>();
+ template const void i<const void>();
+
+ static_assert((void({}), true), "");
+ // since-cxx11-error at -1 {{cannot initialize non-class type 'void' with a parenthesized initializer list}}
+#else
+ int I = (void{}, 0);
+ // cxx98-03-error at -1 {{expected ')'}}
+ // cxx98-03-note at -2 {{to match this '('}}
+ // cxx98-03-error at -3 {{expected expression}}
+#endif
+}
+
namespace dr2352 { // dr2352: 10
int **p;
const int *const *const &f1() { return p; }
diff --git a/clang/test/SemaCXX/attr-annotate.cpp b/clang/test/SemaCXX/attr-annotate.cpp
index 3854f72bbcac1c..846ef4119f1d7c 100644
--- a/clang/test/SemaCXX/attr-annotate.cpp
+++ b/clang/test/SemaCXX/attr-annotate.cpp
@@ -43,10 +43,10 @@ namespace test0 {
template<typename T>
struct B {
[[clang::annotate("test", ((void)T{}, 9))]] void t() {}
- // expected-error at -1 {{illegal initializer type 'void'}}
+ // expected-error at -1 {{cannot create object of function type 'void ()'}}
};
B<int> b;
- B<void> b1;
+ B<void ()> b1;
// expected-note at -1 {{in instantiation of template class}}
}
diff --git a/clang/test/SemaCXX/cxx2a-explicit-bool.cpp b/clang/test/SemaCXX/cxx2a-explicit-bool.cpp
index 9fdc059493aacb..55f99b2fd355ff 100644
--- a/clang/test/SemaCXX/cxx2a-explicit-bool.cpp
+++ b/clang/test/SemaCXX/cxx2a-explicit-bool.cpp
@@ -75,11 +75,11 @@ struct D {
template <typename T> struct E {
// expected-note at -1+ {{candidate constructor}}
explicit((T{}, false))
- // expected-error at -1 {{illegal initializer type 'void'}}
+ // expected-error at -1 {{cannot create object of function type 'void ()'}}
E(int);
};
-E<void> e = 1;
+E<void ()> e = 1;
// expected-error at -1 {{no viable conversion}}
// expected-note at -2 {{in instantiation of}}
diff --git a/clang/test/SemaCXX/sugared-auto.cpp b/clang/test/SemaCXX/sugared-auto.cpp
index 5fdfb09689b667..b5bb4f0f85a775 100644
--- a/clang/test/SemaCXX/sugared-auto.cpp
+++ b/clang/test/SemaCXX/sugared-auto.cpp
@@ -112,6 +112,12 @@ N t6 = [] { // expected-error {{rvalue of type 'void'}}
return;
}();
+N t7 = [] { // expected-error {{rvalue of type 'Virus' (aka 'void')}}
+ if (true)
+ return Ebola();
+ return SARS{};
+}();
+
} // namespace function_multiple_basic
#define TEST_AUTO(X, A, B) \
diff --git a/clang/www/cxx_dr_status.html b/clang/www/cxx_dr_status.html
index 4a3ed19161f9a5..207f032a5d45e4 100755
--- a/clang/www/cxx_dr_status.html
+++ b/clang/www/cxx_dr_status.html
@@ -13914,7 +13914,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2>
<td><a href="https://cplusplus.github.io/CWG/issues/2351.html">2351</a></td>
<td>CD5</td>
<td><TT>void{}</TT></td>
- <td class="unknown" align="center">Unknown</td>
+ <td class="unreleased" align="center">Clang 18</td>
</tr>
<tr id="2352">
<td><a href="https://cplusplus.github.io/CWG/issues/2352.html">2352</a></td>
More information about the cfe-commits
mailing list