From: Chris Lattner Date: Sun, 6 Apr 2008 07:49:57 +0000 (+0000) Subject: move a semantic check out of the parser into sema. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3420766281f1d9626cfa710c000247f9625f26d4;p=clang move a semantic check out of the parser into sema. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49273 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index 3ea0d9f4c1..0eb5c1f257 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -1304,19 +1304,6 @@ void Parser::ParseFunctionDeclarator(SourceLocation LParenLoc, Declarator &D) { if (Tok.is(tok::kw___attribute)) ParmDecl.AddAttributes(ParseAttributes()); - // Verify C99 6.7.5.3p2: The only SCS allowed is 'register'. - if (DS.getStorageClassSpec() != DeclSpec::SCS_unspecified && - DS.getStorageClassSpec() != DeclSpec::SCS_register) { - Diag(DS.getStorageClassSpecLoc(), - diag::err_invalid_storage_class_in_func_decl); - DS.ClearStorageClassSpecs(); - } - if (DS.isThreadSpecified()) { - Diag(DS.getThreadSpecLoc(), - diag::err_invalid_storage_class_in_func_decl); - DS.ClearStorageClassSpecs(); - } - // Remember this parsed parameter in ParamInfo. IdentifierInfo *ParmII = ParmDecl.getIdentifier(); diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp index d46e997567..725da22334 100644 --- a/lib/Sema/SemaType.cpp +++ b/lib/Sema/SemaType.cpp @@ -504,10 +504,29 @@ Sema::TypeResult Sema::ActOnTypeName(Scope *S, Declarator &D) { return T.getAsOpaquePtr(); } -// Called from Parser::ParseParenDeclarator(). +/// ActOnParamDeclaratorType - Called from Parser::ParseFunctionDeclarator() +/// when analyzing function prototypes. +/// +/// Note: parameters have identifiers, but we don't care about them here, we +/// just want the type converted. +/// Sema::TypeResult Sema::ActOnParamDeclaratorType(Scope *S, Declarator &D) { - // Note: parameters have identifiers, but we don't care about them here, we - // just want the type converted. + DeclSpec &DS = D.getDeclSpec(); + + // Verify C99 6.7.5.3p2: The only SCS allowed is 'register'. + if (DS.getStorageClassSpec() != DeclSpec::SCS_unspecified && + DS.getStorageClassSpec() != DeclSpec::SCS_register) { + Diag(DS.getStorageClassSpecLoc(), + diag::err_invalid_storage_class_in_func_decl); + DS.ClearStorageClassSpecs(); + } + if (DS.isThreadSpecified()) { + Diag(DS.getThreadSpecLoc(), + diag::err_invalid_storage_class_in_func_decl); + DS.ClearStorageClassSpecs(); + } + + QualType T = GetTypeForDeclarator(D, S); assert(!T.isNull() && "GetTypeForDeclarator() returned null type");