diff options
| author | Anders Carlsson <andersca@mac.com> | 2011-02-05 04:35:53 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2011-02-05 04:35:53 +0000 |
| commit | 1faa89f9c619e4b2411fab4af7e22ee7a2bd9009 (patch) | |
| tree | 750a23ef8d0138c080896483095c1030e23d3b97 /lib/CodeGen/CGVTables.cpp | |
| parent | 09f57b966c2a6c0a1c8d2e0be9862f6b2c89f9f4 (diff) | |
Re-land r124768, with a fix for PR9130.
We now emit everything except unused implicit virtual member functions when building the vtable.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@124935 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGVTables.cpp')
| -rw-r--r-- | lib/CodeGen/CGVTables.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/CGVTables.cpp b/lib/CodeGen/CGVTables.cpp index de6cbf52f3..eadfe9f146 100644 --- a/lib/CodeGen/CGVTables.cpp +++ b/lib/CodeGen/CGVTables.cpp @@ -2463,7 +2463,7 @@ llvm::Constant *CodeGenModule::GetAddrOfThunk(GlobalDecl GD, getCXXABI().getMangleContext().mangleThunk(MD, Thunk, Name); const llvm::Type *Ty = getTypes().GetFunctionTypeForVTable(GD); - return GetOrCreateLLVMFunction(Name, Ty, GD); + return GetOrCreateLLVMFunction(Name, Ty, GD, /*ForVTable=*/false); } static llvm::Value *PerformTypeAdjustment(CodeGenFunction &CGF, @@ -2918,7 +2918,7 @@ CodeGenVTables::CreateVTableInitializer(const CXXRecordDecl *RD, } else { const llvm::Type *Ty = CGM.getTypes().GetFunctionTypeForVTable(GD); - Init = CGM.GetAddrOfFunction(GD, Ty); + Init = CGM.GetAddrOfFunction(GD, Ty, /*ForVTable=*/true); } Init = llvm::ConstantExpr::getBitCast(Init, Int8PtrTy); |