Fix va_arg handling to do argument decaying at the correct place. This

fixes problems handling references of va_list, which happens on x86_64.
This fixes PR2841 and rdar://6252231

llvm-svn: 56809
This commit is contained in:
Chris Lattner 2008-09-29 22:28:25 +00:00
parent f61a84ec43
commit 4a80a59b6e
2 changed files with 11 additions and 6 deletions

View File

@ -137,9 +137,6 @@ static QualType DecodeTypeFromStr(const char *&Str, ASTContext &Context,
case 'a':
Type = Context.getBuiltinVaListType();
assert(!Type.isNull() && "builtin va list type not initialized!");
// Do array -> pointer decay. The builtin should use the decayed type.
if (Type->isArrayType())
Type = Context.getArrayDecayedType(Type);
break;
case 'V': {
char *End;
@ -185,8 +182,15 @@ QualType Builtin::Context::GetBuiltinType(unsigned id,
llvm::SmallVector<QualType, 8> ArgTypes;
QualType ResType = DecodeTypeFromStr(TypeStr, Context);
while (TypeStr[0] && TypeStr[0] != '.')
ArgTypes.push_back(DecodeTypeFromStr(TypeStr, Context));
while (TypeStr[0] && TypeStr[0] != '.') {
QualType Ty = DecodeTypeFromStr(TypeStr, Context);
// Do array -> pointer decay. The builtin should use the decayed type.
if (Ty->isArrayType())
Ty = Context.getArrayDecayedType(Ty);
ArgTypes.push_back(Ty);
}
assert((TypeStr[0] != '.' || TypeStr[1] == 0) &&
"'.' should only occur at end of builtin type list!");

View File

@ -1,4 +1,5 @@
// RUN: clang -fsyntax-only -verify %s
// RUN: clang -fsyntax-only -verify %s &&
// RUN: clang -fsyntax-only -verify %s -triple x86_64-apple-darwin9
void f1(int a)
{