[cfe-commits] r91585 - /cfe/trunk/lib/CodeGen/CGRTTI.cpp
Anders Carlsson
andersca at mac.com
Wed Dec 16 21:10:59 PST 2009
Author: andersca
Date: Wed Dec 16 23:10:59 2009
New Revision: 91585
URL: http://llvm.org/viewvc/llvm-project?rev=91585&view=rev
Log:
Simplify RTTIBuilder::finish.
Modified:
cfe/trunk/lib/CodeGen/CGRTTI.cpp
Modified: cfe/trunk/lib/CodeGen/CGRTTI.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGRTTI.cpp?rev=91585&r1=91584&r2=91585&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGRTTI.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGRTTI.cpp Wed Dec 16 23:10:59 2009
@@ -188,12 +188,12 @@
return true;
}
- llvm::Constant *finish(llvm::Constant *const *Values, unsigned NumValues,
- llvm::GlobalVariable *GV,
+ llvm::Constant *finish(llvm::GlobalVariable *GV,
llvm::StringRef Name, bool Hidden,
llvm::GlobalVariable::LinkageTypes Linkage) {
llvm::Constant *C =
- llvm::ConstantStruct::get(VMContext, Values, NumValues, /*Packed=*/false);
+ llvm::ConstantStruct::get(VMContext, &Info[0], Info.size(),
+ /*Packed=*/false);
llvm::GlobalVariable *OGV = GV;
GV = new llvm::GlobalVariable(CGM.getModule(), C->getType(), true, Linkage,
@@ -277,7 +277,7 @@
}
}
- return finish(&Info[0], Info.size(), GV, Name, Hidden, Linkage);
+ return finish(GV, Name, Hidden, Linkage);
}
/// - BuildFlags - Build a __flags value for __pbase_type_info.
@@ -371,8 +371,7 @@
QualType(PtrMemTy->getClass(), 0)));
// We always generate these as hidden, only the name isn't hidden.
- return finish(&Info[0], Info.size(), GV, Name, /*Hidden=*/true,
- GetLinkageFromExternFlag(Extern));
+ return finish(GV, Name, /*Hidden=*/true, GetLinkageFromExternFlag(Extern));
}
llvm::Constant *BuildSimpleType(QualType Ty, const char *vtbl) {
@@ -388,13 +387,12 @@
bool Extern = DecideExtern(Ty);
bool Hidden = DecideHidden(Ty);
- llvm::Constant *Info[] = {
- BuildVtableRef(vtbl), BuildName(Ty, Hidden, Extern)
- };
+ Info.push_back(BuildVtableRef(vtbl));
+ Info.push_back(BuildName(Ty, Hidden, Extern));
// We always generate these as hidden, only the name isn't hidden.
- return finish(&Info[0], llvm::array_lengthof(Info), GV, Name,
- /*Hidden=*/true, GetLinkageFromExternFlag(Extern));
+ return finish(GV, Name, /*Hidden=*/true,
+ GetLinkageFromExternFlag(Extern));
}
/// BuildType - Builds the type info for the given type.
More information about the cfe-commits
mailing list