diff options
author | Steven Wu <stevenwu@apple.com> | 2015-08-28 07:14:10 +0000 |
---|---|---|
committer | Steven Wu <stevenwu@apple.com> | 2015-08-28 07:14:10 +0000 |
commit | 85b5116ba2fa38ef76c78fd6bd5dc9b77237d5f8 (patch) | |
tree | 930b4376ee25e4b2b8cc80b594987c54b20bfd3a /lib/CodeGen/CGCXXABI.h | |
parent | 385eeb146f837120c223ba1b530756b1b4581673 (diff) |
Revert r246214 and r246213
These two commits causes llvm LTO bootstrap to hang in ScalarEvolution.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@246282 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGCXXABI.h')
-rw-r--r-- | lib/CodeGen/CGCXXABI.h | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/lib/CodeGen/CGCXXABI.h b/lib/CodeGen/CGCXXABI.h index 259c878f7f..5ef409ecde 100644 --- a/lib/CodeGen/CGCXXABI.h +++ b/lib/CodeGen/CGCXXABI.h @@ -218,10 +218,8 @@ public: virtual void emitThrow(CodeGenFunction &CGF, const CXXThrowExpr *E) = 0; virtual llvm::GlobalVariable *getThrowInfo(QualType T) { return nullptr; } - /// \brief Determine whether it's possible to emit a vtable for \p RD, even - /// though we do not know that the vtable has been marked as used by semantic - /// analysis. - virtual bool canSpeculativelyEmitVTable(const CXXRecordDecl *RD) const = 0; + virtual bool canEmitAvailableExternallyVTable( + const CXXRecordDecl *RD) const = 0; virtual void emitBeginCatch(CodeGenFunction &CGF, const CXXCatchStmt *C) = 0; @@ -348,25 +346,13 @@ public: virtual void emitVTableDefinitions(CodeGenVTables &CGVT, const CXXRecordDecl *RD) = 0; - /// Checks if ABI requires extra virtual offset for vtable field. - virtual bool - isVirtualOffsetNeededForVTableField(CodeGenFunction &CGF, - CodeGenFunction::VPtr Vptr) = 0; - - /// Checks if ABI requires to initilize vptrs for given dynamic class. - virtual bool doStructorsInitializeVPtrs(const CXXRecordDecl *VTableClass) = 0; - - /// Get the address point of the vtable for the given base subobject. - virtual llvm::Constant * - getVTableAddressPoint(BaseSubobject Base, - const CXXRecordDecl *VTableClass) = 0; - /// Get the address point of the vtable for the given base subobject while - /// building a constructor or a destructor. - virtual llvm::Value * - getVTableAddressPointInStructor(CodeGenFunction &CGF, const CXXRecordDecl *RD, - BaseSubobject Base, - const CXXRecordDecl *NearestVBase) = 0; + /// building a constructor or a destructor. On return, NeedsVirtualOffset + /// tells if a virtual base adjustment is needed in order to get the offset + /// of the base subobject. + virtual llvm::Value *getVTableAddressPointInStructor( + CodeGenFunction &CGF, const CXXRecordDecl *RD, BaseSubobject Base, + const CXXRecordDecl *NearestVBase, bool &NeedsVirtualOffset) = 0; /// Get the address point of the vtable for the given base subobject while /// building a constexpr. |