maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Don't crash while printing APValues that are lvalues casted to a 

decidedly non-reference, non-pointer type. Fixes <rdar://problem/13090123>.

llvm-svn: 173747
This commit is contained in:
Douglas Gregor 2013-01-29 01:26:43 +00:00
parent 0cdcc98200
commit 0b7bc7f996
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/AST/APValue.cpp
View File

@ -348,6 +348,8 @@ void APValue::printPretty(raw_ostream &Out, ASTContext &Ctx, QualType Ty) const{
bool IsReference = Ty->isReferenceType(); bool IsReference = Ty->isReferenceType();
QualType InnerTy QualType InnerTy
= IsReference ? Ty.getNonReferenceType() : Ty->getPointeeType(); = IsReference ? Ty.getNonReferenceType() : Ty->getPointeeType();
if (InnerTy.isNull())
InnerTy = Ty;
if (!hasLValuePath()) { if (!hasLValuePath()) {
// No lvalue path: just print the offset. // No lvalue path: just print the offset.

13
clang/test/CXX/expr/expr.const/p2-0x.cpp
View File

@ -594,3 +594,16 @@ static const bool or_value = and_or<true>::or_value;
static_assert(and_value == false, ""); static_assert(and_value == false, "");
static_assert(or_value == true, ""); static_assert(or_value == true, "");
namespace rdar13090123 {
typedef __INTPTR_TYPE__ intptr_t;
constexpr intptr_t f(intptr_t x) {
return (((x) >> 21) * 8); // expected-note{{subexpression not valid in a constant expression}}
}
extern "C" int foo;
constexpr intptr_t i = f((intptr_t)&foo - 10); // expected-error{{constexpr variable 'i' must be initialized by a constant expression}} \
// expected-note{{in call to 'f((char*)&foo + -10)'}}
}