wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the RTTIBuilder's finish member function to take a pointer to the constants array + the length of the array. 

llvm-svn: 91241
This commit is contained in:
Anders Carlsson 2009-12-13 16:38:01 +00:00
parent abdc1c274b
commit e7025c55a4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/lib/CodeGen/CGRTTI.cpp
View File

@ -25,7 +25,6 @@ class RTTIBuilder {
llvm::SmallSet<const CXXRecordDecl *, 16> SeenVBase; llvm::SmallSet<const CXXRecordDecl *, 16> SeenVBase;
llvm::SmallSet<const CXXRecordDecl *, 32> SeenBase; llvm::SmallSet<const CXXRecordDecl *, 32> SeenBase;
// Type info flags. // Type info flags.
enum { enum {
/// TI_Const - Type has const qualifier. /// TI_Const - Type has const qualifier.
@ -187,13 +186,12 @@ public:
return true; return true;
} }
llvm::Constant *finish(std::vector<llvm::Constant *> &info, llvm::Constant *finish(llvm::Constant *const *Values, unsigned NumValues,
llvm::GlobalVariable *GV, llvm::GlobalVariable *GV,
llvm::StringRef Name, bool Hidden, llvm::StringRef Name, bool Hidden,
llvm::GlobalVariable::LinkageTypes Linkage) { llvm::GlobalVariable::LinkageTypes Linkage) {
llvm::Constant *C = llvm::Constant *C =
llvm::ConstantStruct::get(VMContext, &info[0], info.size(), llvm::ConstantStruct::get(VMContext, Values, NumValues, /*Packed=*/false);
/*Packed=*/false);
llvm::GlobalVariable *OGV = GV; llvm::GlobalVariable *OGV = GV;
GV = new llvm::GlobalVariable(CGM.getModule(), C->getType(), true, Linkage, GV = new llvm::GlobalVariable(CGM.getModule(), C->getType(), true, Linkage,
@ -278,7 +276,7 @@ public:
} }
} }
return finish(info, GV, Name, Hidden, Linkage); return finish(&info[0], info.size(), GV, Name, Hidden, Linkage);
} }
/// - BuildFlags - Build a __flags value for __pbase_type_info. /// - BuildFlags - Build a __flags value for __pbase_type_info.
@ -372,7 +370,7 @@ public:
info.push_back(BuildType(QualType(PtrMemTy->getClass(), 0))); info.push_back(BuildType(QualType(PtrMemTy->getClass(), 0)));
// We always generate these as hidden, only the name isn't hidden. // We always generate these as hidden, only the name isn't hidden.
return finish(info, GV, Name, /*Hidden=*/true, return finish(&info[0], info.size(), GV, Name, /*Hidden=*/true,
GetLinkageFromExternFlag(Extern)); GetLinkageFromExternFlag(Extern));
} }
@ -399,7 +397,7 @@ public:
info.push_back(BuildName(Ty, Hidden, Extern)); info.push_back(BuildName(Ty, Hidden, Extern));
// We always generate these as hidden, only the name isn't hidden. // We always generate these as hidden, only the name isn't hidden.
return finish(info, GV, Name, /*Hidden=*/true, return finish(&info[0], info.size(), GV, Name, /*Hidden=*/true,
GetLinkageFromExternFlag(Extern)); GetLinkageFromExternFlag(Extern));
} }