add a testcase for PR12094 and fix a crash on pointer to incomplete type,

reported by Richard Smith.

llvm-svn: 151993
This commit is contained in:
Chris Lattner 2012-03-04 00:52:12 +00:00
parent 522fa53703
commit aaa18fad7d
2 changed files with 18 additions and 3 deletions

View File

@ -1264,9 +1264,13 @@ unsigned CodeGenFunction::GetPointeeAlignment(const Expr *Addr) {
// Check if the type is a pointer. The implicit cast operand might not be. // Check if the type is a pointer. The implicit cast operand might not be.
while (Addr->getType()->isPointerType()) { while (Addr->getType()->isPointerType()) {
QualType PtTy = Addr->getType()->getPointeeType(); QualType PtTy = Addr->getType()->getPointeeType();
// Can't get alignment of incomplete types.
if (!PtTy->isIncompleteType()) {
unsigned NewA = getContext().getTypeAlignInChars(PtTy).getQuantity(); unsigned NewA = getContext().getTypeAlignInChars(PtTy).getQuantity();
if (NewA > Align) if (NewA > Align)
Align = NewA; Align = NewA;
}
// If the address is an implicit cast, repeat with the cast operand. // If the address is an implicit cast, repeat with the cast operand.
if (const ImplicitCastExpr *CastAddr = dyn_cast<ImplicitCastExpr>(Addr)) { if (const ImplicitCastExpr *CastAddr = dyn_cast<ImplicitCastExpr>(Addr)) {

View File

@ -48,3 +48,14 @@ void test5(char *P, char *Q) {
int test6(char *X) { int test6(char *X) {
return __builtin___memcpy_chk(X, X, 42, 42) != 0; return __builtin___memcpy_chk(X, X, 42, 42) != 0;
} }
// CHECK: @test7
// PR12094
int test7(int *p) {
// CHECK: call void @llvm.memset{{.*}}256, i32 4, i1 false)
__builtin_memset(p, 0, 256); // Should be alignment = 4
struct snd_pcm_hw_params_t* hwparams; // incomplete type.
__builtin_memset(hwparams, 0, 256); // No crash alignment = 1
// CHECK: call void @llvm.memset{{.*}}256, i32 1, i1 false)
}