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

AST: Limit zero-sized constexpr behavior to array types 

Restricting this "extension" to array types maximizes our standards
conformance while not miscompiling real-world programs.

llvm-svn: 224215
This commit is contained in:
David Majnemer 2014-12-14 08:40:47 +00:00
parent 0b23c37413
commit 8c92b87cd0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1426,7 +1426,9 @@ static bool isZeroSized(const LValue &Value) {
const ValueDecl *Decl = GetLValueBaseDecl(Value);
if (Decl && isa<VarDecl>(Decl)) {
QualType Ty = Decl->getType();
return Ty->isIncompleteType() || Decl->getASTContext().getTypeSize(Ty) == 0;
if (Ty->isArrayType())
return Ty->isIncompleteType() ||
Decl->getASTContext().getTypeSize(Ty) == 0;
}
return false;
}

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

@ -1960,6 +1960,7 @@ namespace PR21786 {
extern void (*start[])();
extern void (*end[])();
static_assert(&start != &end, ""); // expected-error {{constant expression}}
static_assert(&start != nullptr, "");
struct Foo;
struct Bar {
@ -1967,7 +1968,7 @@ namespace PR21786 {
static const Foo y;
};
static_assert(&Bar::x != nullptr, "");
static_assert(&Bar::x != &Bar::y, ""); // expected-error {{constant expression}}
static_assert(&Bar::x != &Bar::y, "");
}
namespace PR21859 {