replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix treatment of case which came up on std-proposals@: 'void' is permitted in core constant expressions, despite not being a literal type. 

llvm-svn: 164968
This commit is contained in:
Richard Smith 2012-10-01 20:36:17 +00:00
parent 1620ebd98f
commit cdd1da209d
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/AST/ExprConstant.cpp
View File

@ -6196,11 +6196,9 @@ static bool Evaluate(APValue &Result, EvalInfo &Info, const Expr *E) {
return false;
Result = Info.CurrentCall->Temporaries[E];
} else if (E->getType()->isVoidType()) {
if (Info.getLangOpts().CPlusPlus0x)
if (!Info.getLangOpts().CPlusPlus0x)
Info.CCEDiag(E, diag::note_constexpr_nonliteral)
<< E->getType();
else
Info.CCEDiag(E, diag::note_invalid_subexpr_in_const_expr);
if (!EvaluateVoid(E, Info))
return false;
} else if (Info.getLangOpts().CPlusPlus0x) {

18
clang/test/SemaCXX/constant-expression-cxx11.cpp
View File

@ -1390,3 +1390,21 @@ namespace TLS {
constexpr int *g() { return &m; }
constexpr int *r = g();
}
namespace Void {
constexpr void f() { return; } // expected-error{{constexpr function's return type 'void' is not a literal type}}
void assert_failed(const char *msg, const char *file, int line); // expected-note {{declared here}}
#define ASSERT(expr) ((expr) ? static_cast<void>(0) : assert_failed(#expr, __FILE__, __LINE__))
template<typename T, size_t S>
constexpr T get(T (&a)[S], size_t k) {
return ASSERT(k > 0 && k < S), a[k]; // expected-note{{non-constexpr function 'assert_failed'}}
}
#undef ASSERT
template int get(int (&a)[4], size_t);
constexpr int arr[] = { 4, 1, 2, 3, 4 };
static_assert(get(arr, 1) == 1, "");
static_assert(get(arr, 4) == 4, "");
static_assert(get(arr, 0) == 4, ""); // expected-error{{not an integral constant expression}} \
// expected-note{{in call to 'get(arr, 0)'}}
}