From 8b6912660ee0ee1c866e4d377cea0d819ab7402c Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Fri, 21 Nov 2014 21:09:12 +0000 Subject: [PATCH] Sema: Don't permit variably modified types in typeid GCC and ICC both reject this and the 'Runtime-sized arrays with automatic storage duration' (N3639) paper forbade this as well. Previously, we would crash on our way to mangling. This fixes PR21632. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@222569 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticSemaKinds.td | 1 + lib/Sema/SemaExprCXX.cpp | 7 +++++++ test/SemaCXX/typeid.cpp | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 310a9b2a2f..9639b3ce42 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -5303,6 +5303,7 @@ def err_uuidof_without_guid : Error< def err_uuidof_with_multiple_guids : Error< "cannot call operator __uuidof on a type with multiple GUIDs">; def err_incomplete_typeid : Error<"'typeid' of incomplete type %0">; +def err_variably_modified_typeid : Error<"'typeid' of variably modified type %0">; def err_static_illegal_in_new : Error< "the 'static' modifier for the array size is not legal in new expressions">; def err_array_new_needs_size : Error< diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp index 9399668510..c71a4e93bb 100644 --- a/lib/Sema/SemaExprCXX.cpp +++ b/lib/Sema/SemaExprCXX.cpp @@ -384,6 +384,9 @@ ExprResult Sema::BuildCXXTypeId(QualType TypeInfoType, RequireCompleteType(TypeidLoc, T, diag::err_incomplete_typeid)) return ExprError(); + if (T->isVariablyModifiedType()) + return ExprError(Diag(TypeidLoc, diag::err_variably_modified_typeid) << T); + return new (Context) CXXTypeidExpr(TypeInfoType.withConst(), Operand, SourceRange(TypeidLoc, RParenLoc)); } @@ -438,6 +441,10 @@ ExprResult Sema::BuildCXXTypeId(QualType TypeInfoType, } } + if (E->getType()->isVariablyModifiedType()) + return ExprError(Diag(TypeidLoc, diag::err_variably_modified_typeid) + << E->getType()); + return new (Context) CXXTypeidExpr(TypeInfoType.withConst(), E, SourceRange(TypeidLoc, RParenLoc)); } diff --git a/test/SemaCXX/typeid.cpp b/test/SemaCXX/typeid.cpp index d3a2a28deb..48fcce0b49 100644 --- a/test/SemaCXX/typeid.cpp +++ b/test/SemaCXX/typeid.cpp @@ -21,3 +21,9 @@ void g1(X &x) { (void)typeid(X&); // expected-error{{'typeid' of incomplete type 'X'}} (void)typeid(x); // expected-error{{'typeid' of incomplete type 'X'}} } + +void h(int i) { + char V[i]; + typeid(V); // expected-error{{'typeid' of variably modified type 'char [i]'}} + typeid(char [i]); // expected-error{{'typeid' of variably modified type 'char [i]'}} +} -- 2.40.0