[cfe-commits] r48397 - in /cfe/trunk: AST/Decl.cpp AST/DeclSerialization.cpp Driver/RewriteTest.cpp Sema/SemaDecl.cpp include/clang/AST/Decl.h
Chris Lattner
sabre at nondot.org
Sat Mar 15 14:24:05 PDT 2008
Author: lattner
Date: Sat Mar 15 16:24:04 2008
New Revision: 48397
URL: http://llvm.org/viewvc/llvm-project?rev=48397&view=rev
Log:
Switch over functiondecl. This makes it obvious that the ASTContext
argument to Create should be first, not last.
Modified:
cfe/trunk/AST/Decl.cpp
cfe/trunk/AST/DeclSerialization.cpp
cfe/trunk/Driver/RewriteTest.cpp
cfe/trunk/Sema/SemaDecl.cpp
cfe/trunk/include/clang/AST/Decl.h
Modified: cfe/trunk/AST/Decl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/AST/Decl.cpp?rev=48397&r1=48396&r2=48397&view=diff
==============================================================================
--- cfe/trunk/AST/Decl.cpp (original)
+++ cfe/trunk/AST/Decl.cpp Sat Mar 15 16:24:04 2008
@@ -227,6 +227,15 @@
return new (Mem) ParmVarDecl(L, Id, T, S, PrevDecl);
}
+FunctionDecl *FunctionDecl::Create(ASTContext &C, SourceLocation L,
+ IdentifierInfo *Id, QualType T,
+ StorageClass S, bool isInline,
+ ScopedDecl *PrevDecl) {
+ void *Mem = C.getAllocator().Allocate<FunctionDecl>();
+ return new (Mem) FunctionDecl(L, Id, T, S, isInline, PrevDecl);
+}
+
+
EnumConstantDecl *EnumConstantDecl::Create(SourceLocation L, IdentifierInfo *Id,
QualType T, Expr *E,
const llvm::APSInt &V,
Modified: cfe/trunk/AST/DeclSerialization.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/AST/DeclSerialization.cpp?rev=48397&r1=48396&r2=48397&view=diff
==============================================================================
--- cfe/trunk/AST/DeclSerialization.cpp (original)
+++ cfe/trunk/AST/DeclSerialization.cpp Sat Mar 15 16:24:04 2008
@@ -338,7 +338,7 @@
bool IsInline = D.ReadBool();
FunctionDecl* decl =
- new FunctionDecl(SourceLocation(),NULL,QualType(),SClass,IsInline);
+ new FunctionDecl(SourceLocation(),NULL,QualType(),SClass, IsInline, 0);
decl->ValueDecl::ReadInRec(D);
D.ReadPtr(decl->DeclChain);
Modified: cfe/trunk/Driver/RewriteTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/RewriteTest.cpp?rev=48397&r1=48396&r2=48397&view=diff
==============================================================================
--- cfe/trunk/Driver/RewriteTest.cpp (original)
+++ cfe/trunk/Driver/RewriteTest.cpp Sat Mar 15 16:24:04 2008
@@ -1554,7 +1554,7 @@
QualType getFuncType = Context->getFunctionType(Context->getObjCSelType(),
&ArgTys[0], ArgTys.size(),
false /*isVariadic*/);
- SelGetUidFunctionDecl = new FunctionDecl(SourceLocation(),
+ SelGetUidFunctionDecl = FunctionDecl::Create(*Context, SourceLocation(),
SelGetUidIdent, getFuncType,
FunctionDecl::Extern, false, 0);
}
@@ -1568,7 +1568,7 @@
QualType getFuncType = Context->getFunctionType(Context->getObjCProtoType(),
&ArgTys[0], ArgTys.size(),
false /*isVariadic*/);
- GetProtocolFunctionDecl = new FunctionDecl(SourceLocation(),
+ GetProtocolFunctionDecl = FunctionDecl::Create(*Context, SourceLocation(),
SelGetProtoIdent, getFuncType,
FunctionDecl::Extern, false, 0);
}
@@ -1595,7 +1595,7 @@
QualType msgSendType = Context->getFunctionType(Context->getObjCIdType(),
&ArgTys[0], ArgTys.size(),
false);
- SuperContructorFunctionDecl = new FunctionDecl(SourceLocation(),
+ SuperContructorFunctionDecl = FunctionDecl::Create(*Context, SourceLocation(),
msgSendIdent, msgSendType,
FunctionDecl::Extern, false, 0);
}
@@ -1613,7 +1613,7 @@
QualType msgSendType = Context->getFunctionType(Context->getObjCIdType(),
&ArgTys[0], ArgTys.size(),
true /*isVariadic*/);
- MsgSendFunctionDecl = new FunctionDecl(SourceLocation(),
+ MsgSendFunctionDecl = FunctionDecl::Create(*Context, SourceLocation(),
msgSendIdent, msgSendType,
FunctionDecl::Extern, false, 0);
}
@@ -1634,7 +1634,7 @@
QualType msgSendType = Context->getFunctionType(Context->getObjCIdType(),
&ArgTys[0], ArgTys.size(),
true /*isVariadic*/);
- MsgSendSuperFunctionDecl = new FunctionDecl(SourceLocation(),
+ MsgSendSuperFunctionDecl = FunctionDecl::Create(*Context, SourceLocation(),
msgSendIdent, msgSendType,
FunctionDecl::Extern, false, 0);
}
@@ -1652,7 +1652,7 @@
QualType msgSendType = Context->getFunctionType(Context->getObjCIdType(),
&ArgTys[0], ArgTys.size(),
true /*isVariadic*/);
- MsgSendStretFunctionDecl = new FunctionDecl(SourceLocation(),
+ MsgSendStretFunctionDecl = FunctionDecl::Create(*Context, SourceLocation(),
msgSendIdent, msgSendType,
FunctionDecl::Extern, false, 0);
}
@@ -1675,7 +1675,8 @@
QualType msgSendType = Context->getFunctionType(Context->getObjCIdType(),
&ArgTys[0], ArgTys.size(),
true /*isVariadic*/);
- MsgSendSuperStretFunctionDecl = new FunctionDecl(SourceLocation(),
+ MsgSendSuperStretFunctionDecl = FunctionDecl::Create(*Context,
+ SourceLocation(),
msgSendIdent, msgSendType,
FunctionDecl::Extern, false, 0);
}
@@ -1693,7 +1694,7 @@
QualType msgSendType = Context->getFunctionType(Context->getObjCIdType(),
&ArgTys[0], ArgTys.size(),
true /*isVariadic*/);
- MsgSendFpretFunctionDecl = new FunctionDecl(SourceLocation(),
+ MsgSendFpretFunctionDecl = FunctionDecl::Create(*Context, SourceLocation(),
msgSendIdent, msgSendType,
FunctionDecl::Extern, false, 0);
}
@@ -1707,7 +1708,7 @@
QualType getClassType = Context->getFunctionType(Context->getObjCIdType(),
&ArgTys[0], ArgTys.size(),
false /*isVariadic*/);
- GetClassFunctionDecl = new FunctionDecl(SourceLocation(),
+ GetClassFunctionDecl = FunctionDecl::Create(*Context, SourceLocation(),
getClassIdent, getClassType,
FunctionDecl::Extern, false, 0);
}
@@ -1721,7 +1722,7 @@
QualType getClassType = Context->getFunctionType(Context->getObjCIdType(),
&ArgTys[0], ArgTys.size(),
false /*isVariadic*/);
- GetMetaClassFunctionDecl = new FunctionDecl(SourceLocation(),
+ GetMetaClassFunctionDecl = FunctionDecl::Create(*Context, SourceLocation(),
getClassIdent, getClassType,
FunctionDecl::Extern, false, 0);
}
Modified: cfe/trunk/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Sema/SemaDecl.cpp?rev=48397&r1=48396&r2=48397&view=diff
==============================================================================
--- cfe/trunk/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/Sema/SemaDecl.cpp Sat Mar 15 16:24:04 2008
@@ -166,8 +166,8 @@
InitBuiltinVaListType();
QualType R = Context.BuiltinInfo.GetBuiltinType(BID, Context);
- FunctionDecl *New = new FunctionDecl(SourceLocation(), II, R,
- FunctionDecl::Extern, false, 0);
+ FunctionDecl *New = FunctionDecl::Create(Context, SourceLocation(), II, R,
+ FunctionDecl::Extern, false, 0);
// Find translation-unit scope to insert this function into.
if (Scope *FnS = S->getFnParent())
@@ -753,9 +753,10 @@
case DeclSpec::SCS_private_extern: SC = FunctionDecl::PrivateExtern;break;
}
- FunctionDecl *NewFD = new FunctionDecl(D.getIdentifierLoc(), II, R, SC,
- D.getDeclSpec().isInlineSpecified(),
- LastDeclarator);
+ bool isInline = D.getDeclSpec().isInlineSpecified();
+ FunctionDecl *NewFD = FunctionDecl::Create(Context, D.getIdentifierLoc(),
+ II, R, SC, isInline,
+ LastDeclarator);
// Handle attributes.
HandleDeclAttributes(NewFD, D.getDeclSpec().getAttributes(),
D.getAttributes());
Modified: cfe/trunk/include/clang/AST/Decl.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Decl.h?rev=48397&r1=48396&r2=48397&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/Decl.h (original)
+++ cfe/trunk/include/clang/AST/Decl.h Sat Mar 15 16:24:04 2008
@@ -435,13 +435,18 @@
enum StorageClass {
None, Extern, Static, PrivateExtern
};
+private:
FunctionDecl(SourceLocation L, IdentifierInfo *Id, QualType T,
- StorageClass S = None, bool isInline = false,
- ScopedDecl *PrevDecl = 0)
+ StorageClass S, bool isInline, ScopedDecl *PrevDecl)
: ValueDecl(Function, L, Id, T, PrevDecl),
ParamInfo(0), Body(0), DeclChain(0), SClass(S), IsInline(isInline) {}
virtual ~FunctionDecl();
-
+public:
+ static FunctionDecl *Create(ASTContext &C, SourceLocation L,
+ IdentifierInfo *Id, QualType T,
+ StorageClass S = None, bool isInline = false,
+ ScopedDecl *PrevDecl = 0);
+
Stmt *getBody() const { return Body; }
void setBody(Stmt *B) { Body = B; }
More information about the cfe-commits
mailing list