r188324 - sizeof(void) etc. should be a hard error in C++.
Arthur O'Dwyer
arthur.j.odwyer at gmail.com
Tue Aug 13 17:40:38 PDT 2013
Eli, you say this affects SFINAE, but it doesn't look like you added
any new tests that *verify* the intended effect. All your changes to
test/ were just working around the changed diagnostic output.
There should be some way to trigger this new behavior, right? How?
Thanks,
–Arthur
On Tue, Aug 13, 2013 at 3:26 PM, Eli Friedman <eli.friedman at gmail.com> wrote:
> Author: efriedma
> Date: Tue Aug 13 17:26:42 2013
> New Revision: 188324
>
> URL: http://llvm.org/viewvc/llvm-project?rev=188324&view=rev
> Log:
> sizeof(void) etc. should be a hard error in C++.
>
> PR16872.
>
> Modified:
> cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
> cfe/trunk/lib/Sema/SemaExpr.cpp
> cfe/trunk/test/CXX/expr/expr.post/expr.call/p7-0x.cpp
> cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p2.cpp
> cfe/trunk/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp
> cfe/trunk/test/SemaCXX/alignof-sizeof-reference.cpp
> cfe/trunk/test/SemaCXX/attr-cxx0x.cpp
> cfe/trunk/test/SemaCXX/dcl_ambig_res.cpp
> cfe/trunk/test/SemaTemplate/constexpr-instantiate.cpp
> cfe/trunk/test/SemaTemplate/resolve-single-template-id.cpp
>
> Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=188324&r1=188323&r2=188324&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
> +++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Tue Aug 13 17:26:42 2013
> @@ -4153,6 +4153,9 @@ def ext_sizeof_alignof_void_type : Exten
> def err_sizeof_alignof_incomplete_type : Error<
> "invalid application of '%select{sizeof|alignof|vec_step}0' to an "
> "incomplete type %1">;
> +def err_sizeof_alignof_function_type : Error<
> + "invalid application of '%select{sizeof|alignof|vec_step}0' to a "
> + "function type">;
> def err_sizeof_alignof_bitfield : Error<
> "invalid application of '%select{sizeof|alignof}0' to bit-field">;
> def err_alignof_member_of_incomplete_type : Error<
>
> Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=188324&r1=188323&r2=188324&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaExpr.cpp Tue Aug 13 17:26:42 2013
> @@ -3176,6 +3176,10 @@ static bool CheckExtensionTraitOperandTy
> SourceLocation Loc,
> SourceRange ArgRange,
> UnaryExprOrTypeTrait TraitKind) {
> + // Invalid types must be hard errors for SFINAE in C++.
> + if (S.LangOpts.CPlusPlus)
> + return true;
> +
> // C99 6.5.3.4p1:
> if (T->isFunctionType() &&
> (TraitKind == UETT_SizeOf || TraitKind == UETT_AlignOf)) {
> @@ -3258,6 +3262,12 @@ bool Sema::CheckUnaryExprOrTypeTraitOper
> ExprTy = E->getType();
> assert(!ExprTy->isReferenceType());
>
> + if (ExprTy->isFunctionType()) {
> + Diag(E->getExprLoc(), diag::err_sizeof_alignof_function_type)
> + << ExprKind << E->getSourceRange();
> + return true;
> + }
> +
> if (CheckObjCTraitOperandConstraints(*this, ExprTy, E->getExprLoc(),
> E->getSourceRange(), ExprKind))
> return true;
> @@ -3331,6 +3341,12 @@ bool Sema::CheckUnaryExprOrTypeTraitOper
> ExprKind, ExprRange))
> return true;
>
> + if (ExprType->isFunctionType()) {
> + Diag(OpLoc, diag::err_sizeof_alignof_function_type)
> + << ExprKind << ExprRange;
> + return true;
> + }
> +
> if (CheckObjCTraitOperandConstraints(*this, ExprType, OpLoc, ExprRange,
> ExprKind))
> return true;
>
> Modified: cfe/trunk/test/CXX/expr/expr.post/expr.call/p7-0x.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/expr/expr.post/expr.call/p7-0x.cpp?rev=188324&r1=188323&r2=188324&view=diff
> ==============================================================================
> --- cfe/trunk/test/CXX/expr/expr.post/expr.call/p7-0x.cpp (original)
> +++ cfe/trunk/test/CXX/expr/expr.post/expr.call/p7-0x.cpp Tue Aug 13 17:26:42 2013
> @@ -38,7 +38,7 @@ namespace PR11131 {
>
> S &getS();
>
> - void f(...);
> + int f(...);
>
> void g() {
> (void)sizeof(f(getS()));
>
> Modified: cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p2.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p2.cpp?rev=188324&r1=188323&r2=188324&view=diff
> ==============================================================================
> --- cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p2.cpp (original)
> +++ cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p2.cpp Tue Aug 13 17:26:42 2013
> @@ -15,7 +15,7 @@ struct P {
> };
>
> void unevaluated_operand(P &p, int i) {
> - int i2 = sizeof([]()->void{}()); // expected-error{{lambda expression in an unevaluated operand}}
> + int i2 = sizeof([] ()->int { return 0; }()); // expected-error{{lambda expression in an unevaluated operand}}
> const std::type_info &ti1 = typeid([&]() -> P& { return p; }());
> const std::type_info &ti2 = typeid([&]() -> int { return i; }()); // expected-error{{lambda expression in an unevaluated operand}}
> }
>
> Modified: cfe/trunk/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp?rev=188324&r1=188323&r2=188324&view=diff
> ==============================================================================
> --- cfe/trunk/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp (original)
> +++ cfe/trunk/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp Tue Aug 13 17:26:42 2013
> @@ -18,3 +18,11 @@ void test(A *a) {
> x = sizeof(a->bitX = 3); // expected-error {{invalid application of 'sizeof' to bit-field}}
> x = sizeof(a->bitY += 3); // expected-error {{invalid application of 'sizeof' to bit-field}}
> }
> +
> +void test2() {
> + int x;
> + x = sizeof(void); // expected-error {{invalid application of 'sizeof' to an incomplete type 'void'}}
> + x = sizeof(int()); // expected-error {{invalid application of 'sizeof' to a function type}}
> + x = sizeof(test2()); // expected-error {{invalid application of 'sizeof' to an incomplete type 'void'}}
> + x = sizeof(test2); // expected-error {{invalid application of 'sizeof' to a function type}}
> +}
>
> Modified: cfe/trunk/test/SemaCXX/alignof-sizeof-reference.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/alignof-sizeof-reference.cpp?rev=188324&r1=188323&r2=188324&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/alignof-sizeof-reference.cpp (original)
> +++ cfe/trunk/test/SemaCXX/alignof-sizeof-reference.cpp Tue Aug 13 17:26:42 2013
> @@ -10,8 +10,8 @@ void test() {
> static_assert(sizeof(char&) == 1, "bad size");
> }
>
> -void f(); // expected-note{{possible target for call}}
> -void f(int); // expected-note{{possible target for call}}
> +int f(); // expected-note{{possible target for call}}
> +int f(int); // expected-note{{possible target for call}}
> void g() {
> sizeof(&f); // expected-error{{reference to overloaded function could not be resolved; did you mean to call it with no arguments?}} \
> // expected-warning{{expression result unused}}
>
> Modified: cfe/trunk/test/SemaCXX/attr-cxx0x.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/attr-cxx0x.cpp?rev=188324&r1=188323&r2=188324&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/attr-cxx0x.cpp (original)
> +++ cfe/trunk/test/SemaCXX/attr-cxx0x.cpp Tue Aug 13 17:26:42 2013
> @@ -44,4 +44,4 @@ static_assert(alignof(align_class_temp_p
> static_assert(alignof(align_class_temp_pack_expr<8, 16, 32>) == 32, "template's alignment is wrong");
> static_assert(alignof(outer<int,char>::inner<double,short>) == alignof(int) * alignof(double), "template's alignment is wrong");
>
> -static_assert(alignof(int(int)) >= 1, "alignof(function) not positive"); // expected-warning{{invalid application of 'alignof' to a function type}}
> +static_assert(alignof(int(int)) >= 1, "alignof(function) not positive"); // expected-error{{invalid application of 'alignof' to a function type}}
>
> Modified: cfe/trunk/test/SemaCXX/dcl_ambig_res.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/dcl_ambig_res.cpp?rev=188324&r1=188323&r2=188324&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/dcl_ambig_res.cpp (original)
> +++ cfe/trunk/test/SemaCXX/dcl_ambig_res.cpp Tue Aug 13 17:26:42 2013
> @@ -44,9 +44,7 @@ S4<int(1)> y; // expected-error{{must be
> void foo5()
> {
> (void)sizeof(int(1)); //expression
> - // FIXME: should we make this an error rather than a warning?
> - // (It affects SFINAE)
> - (void)sizeof(int()); // expected-warning{{function type}}
> + (void)sizeof(int()); // expected-error{{function type}}
> }
>
> // [dcl.ambig.res]p6:
>
> Modified: cfe/trunk/test/SemaTemplate/constexpr-instantiate.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/constexpr-instantiate.cpp?rev=188324&r1=188323&r2=188324&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaTemplate/constexpr-instantiate.cpp (original)
> +++ cfe/trunk/test/SemaTemplate/constexpr-instantiate.cpp Tue Aug 13 17:26:42 2013
> @@ -201,8 +201,8 @@ namespace NoInstantiationWhenSelectingOv
> int n;
> };
>
> - void f(S);
> - void f(int);
> + int f(S);
> + int f(int);
>
> void g() { f(0); }
> void h() { (void)sizeof(f(0)); }
>
> Modified: cfe/trunk/test/SemaTemplate/resolve-single-template-id.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/resolve-single-template-id.cpp?rev=188324&r1=188323&r2=188324&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaTemplate/resolve-single-template-id.cpp (original)
> +++ cfe/trunk/test/SemaTemplate/resolve-single-template-id.cpp Tue Aug 13 17:26:42 2013
> @@ -33,7 +33,7 @@ int main()
> oneT<int>; // expected-warning {{expression result unused}}
> twoT<int>; // expected-error {{reference to overloaded function could not be resolved; did you mean to call it?}}
> typeid(oneT<int>); // expected-warning{{expression result unused}}
> - sizeof(oneT<int>); // expected-warning {{expression result unused}}
> + sizeof(oneT<int>); // expected-error {{invalid application of 'sizeof' to a function type}}
> sizeof(twoT<int>); //expected-error {{reference to overloaded function could not be resolved; did you mean to call it?}}
> decltype(oneT<int>)* fun = 0;
>
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
More information about the cfe-commits
mailing list