Step #1 to fixing PR2012: c89 allows declspecs to be completely

missing from function definitions only.  If we see a function 
definiton with missing declspecs, just fudge in an int.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49250 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2008-04-05 05:52:15 +00:00
Родитель b10f273eb6
Коммит a798ebc826
3 изменённых файлов: 25 добавлений и 4 удалений

Просмотреть файл

@ -49,6 +49,8 @@ struct LangOptions {
LaxVectorConversions = 0; LaxVectorConversions = 0;
} }
bool isC90() const { return !C99 && !CPlusPlus; }
/// Emit - Emit this LangOptions object to bitcode. /// Emit - Emit this LangOptions object to bitcode.
void Emit(llvm::Serializer& S) const; void Emit(llvm::Serializer& S) const;

Просмотреть файл

@ -356,8 +356,10 @@ Parser::DeclTy *Parser::ParseExternalDeclaration() {
/// compound-statement in function-definition. /// compound-statement in function-definition.
/// ///
/// function-definition: [C99 6.9.1] /// function-definition: [C99 6.9.1]
/// declaration-specifiers[opt] declarator declaration-list[opt] /// decl-specs declarator declaration-list[opt] compound-statement
/// compound-statement /// [C90] function-definition: [C99 6.7.1] - implicit int result
/// [C90] decl-specs[opt] declarator declaration-list[opt] compound-statement
///
/// declaration: [C99 6.7] /// declaration: [C99 6.7]
/// declaration-specifiers init-declarator-list[opt] ';' /// declaration-specifiers init-declarator-list[opt] ';'
/// [!C99] init-declarator-list ';' [TODO: warn in c99 mode] /// [!C99] init-declarator-list ';' [TODO: warn in c99 mode]
@ -451,8 +453,10 @@ Parser::DeclTy *Parser::ParseDeclarationOrFunctionDefinition() {
/// Declarator is well formed. If this is a K&R-style function, read the /// Declarator is well formed. If this is a K&R-style function, read the
/// parameters declaration-list, then start the compound-statement. /// parameters declaration-list, then start the compound-statement.
/// ///
/// declaration-specifiers[opt] declarator declaration-list[opt] /// function-definition: [C99 6.9.1]
/// compound-statement [TODO] /// decl-specs declarator declaration-list[opt] compound-statement
/// [C90] function-definition: [C99 6.7.1] - implicit int result
/// [C90] decl-specs[opt] declarator declaration-list[opt] compound-statement
/// ///
Parser::DeclTy *Parser::ParseFunctionDefinition(Declarator &D) { Parser::DeclTy *Parser::ParseFunctionDefinition(Declarator &D) {
const DeclaratorChunk &FnTypeInfo = D.getTypeObject(0); const DeclaratorChunk &FnTypeInfo = D.getTypeObject(0);
@ -460,6 +464,15 @@ Parser::DeclTy *Parser::ParseFunctionDefinition(Declarator &D) {
"This isn't a function declarator!"); "This isn't a function declarator!");
const DeclaratorChunk::FunctionTypeInfo &FTI = FnTypeInfo.Fun; const DeclaratorChunk::FunctionTypeInfo &FTI = FnTypeInfo.Fun;
// If this is C90 and the declspecs were completely missing, fudge in an
// implicit int. We do this here because this is the only place where
// declaration-specifiers are completely optional in the grammar.
if (getLang().isC90() && !D.getDeclSpec().getParsedSpecifiers() == 0) {
const char *PrevSpec;
D.getDeclSpec().SetTypeSpecType(DeclSpec::TST_int, D.getIdentifierLoc(),
PrevSpec);
}
// If this declaration was formed with a K&R-style identifier list for the // If this declaration was formed with a K&R-style identifier list for the
// arguments, parse declarations for all of the args next. // arguments, parse declarations for all of the args next.
// int foo(a,b) int a; float b; {} // int foo(a,b) int a; float b; {}

Просмотреть файл

@ -33,3 +33,9 @@ void test5(register);
/* PR2041 */ /* PR2041 */
int *restrict; int *restrict;
int *__restrict; /* expected-error {{expected identifier}} */ int *__restrict; /* expected-error {{expected identifier}} */
/* Implicit int, always ok */
foo() {}