From 41af093ee62a4aea948ffef4482c9e2a496d710e Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 14 Nov 2007 06:34:38 +0000 Subject: [PATCH] implement test/Sema/typedef-prototype.c, allowing code to declare a function with a typedef: typedef int unary_int_func(int arg); unary_int_func add_one; This patch contributed by Seo Sanghyeon! git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@44100 91177308-0d34-0410-b5e6-96231b3b80d8 --- Sema/Sema.h | 3 ++- Sema/SemaDecl.cpp | 16 ++++++---------- test/Sema/typedef-prototype.c | 8 ++++++++ 3 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 test/Sema/typedef-prototype.c diff --git a/Sema/Sema.h b/Sema/Sema.h index 40b966e52b..8b470fe5c6 100644 --- a/Sema/Sema.h +++ b/Sema/Sema.h @@ -224,7 +224,8 @@ private: DeclTy **Elements, unsigned NumElements); private: /// Subroutines of ActOnDeclarator()... - TypedefDecl *ParseTypedefDecl(Scope *S, Declarator &D, ScopedDecl *LastDecl); + TypedefDecl *ParseTypedefDecl(Scope *S, Declarator &D, QualType T, + ScopedDecl *LastDecl); TypedefDecl *MergeTypeDefDecl(TypedefDecl *New, ScopedDecl *Old); FunctionDecl *MergeFunctionDecl(FunctionDecl *New, ScopedDecl *Old); VarDecl *MergeVarDecl(VarDecl *New, ScopedDecl *Old); diff --git a/Sema/SemaDecl.cpp b/Sema/SemaDecl.cpp index 1540b7caae..36813bafca 100644 --- a/Sema/SemaDecl.cpp +++ b/Sema/SemaDecl.cpp @@ -572,8 +572,11 @@ Sema::ActOnDeclarator(Scope *S, Declarator &D, DeclTy *lastDecl) { ScopedDecl *New; bool InvalidDecl = false; + QualType R = GetTypeForDeclarator(D, S); + assert(!R.isNull() && "GetTypeForDeclarator() returned null type"); + if (D.getDeclSpec().getStorageClassSpec() == DeclSpec::SCS_typedef) { - TypedefDecl *NewTD = ParseTypedefDecl(S, D, LastDeclarator); + TypedefDecl *NewTD = ParseTypedefDecl(S, D, R, LastDeclarator); if (!NewTD) return 0; // Handle attributes prior to checking for duplicates in MergeVarDecl @@ -595,10 +598,7 @@ Sema::ActOnDeclarator(Scope *S, Declarator &D, DeclTy *lastDecl) { InvalidDecl = true; } } - } else if (D.isFunctionDeclarator()) { - QualType R = GetTypeForDeclarator(D, S); - assert(!R.isNull() && "GetTypeForDeclarator() returned null type"); - + } else if (R.getTypePtr()->isFunctionType()) { FunctionDecl::StorageClass SC = FunctionDecl::None; switch (D.getDeclSpec().getStorageClassSpec()) { default: assert(0 && "Unknown storage class!"); @@ -628,8 +628,6 @@ Sema::ActOnDeclarator(Scope *S, Declarator &D, DeclTy *lastDecl) { } New = NewFD; } else { - QualType R = GetTypeForDeclarator(D, S); - assert(!R.isNull() && "GetTypeForDeclarator() returned null type"); if (R.getTypePtr()->isObjcInterfaceType()) { Diag(D.getIdentifierLoc(), diag::err_statically_allocated_object, D.getIdentifier()->getName()); @@ -1041,11 +1039,9 @@ ScopedDecl *Sema::ImplicitlyDefineFunction(SourceLocation Loc, } -TypedefDecl *Sema::ParseTypedefDecl(Scope *S, Declarator &D, +TypedefDecl *Sema::ParseTypedefDecl(Scope *S, Declarator &D, QualType T, ScopedDecl *LastDeclarator) { assert(D.getIdentifier() && "Wrong callback for declspec without declarator"); - - QualType T = GetTypeForDeclarator(D, S); assert(!T.isNull() && "GetTypeForDeclarator() returned null type"); // Scope manipulation handled by caller. diff --git a/test/Sema/typedef-prototype.c b/test/Sema/typedef-prototype.c new file mode 100644 index 0000000000..e646604ae3 --- /dev/null +++ b/test/Sema/typedef-prototype.c @@ -0,0 +1,8 @@ +// RUN: clang -fsyntax-only -verify %s + +typedef int unary_int_func(int arg); +unary_int_func add_one; + +int add_one(int arg) { + return arg + 1; +} -- 2.40.0