diff options
| author | Ilya Biryukov <ibiryukov@google.com> | 2019-07-18 11:55:33 +0000 |
|---|---|---|
| committer | Ilya Biryukov <ibiryukov@google.com> | 2019-07-18 11:55:33 +0000 |
| commit | 4f8dc16fcdb6851c91b520d0ee595f5193ef51ef (patch) | |
| tree | 001336fbdb293ef73980ee4ef4a0e4f324d288ef /clang/lib/CodeGen/CGCXXABI.h | |
| parent | 8f5b44aead89a56c6fbf85ccfda03ae1e82ac431 (diff) | |
| download | bcm5719-llvm-4f8dc16fcdb6851c91b520d0ee595f5193ef51ef.tar.gz bcm5719-llvm-4f8dc16fcdb6851c91b520d0ee595f5193ef51ef.zip | |
Revert r366422: [OpenCL] Improve destructor support in C++ for OpenCL
Reason: this commit causes crashes in the clang compiler when building
LLVM Support with libc++, see https://bugs.llvm.org/show_bug.cgi?id=42665
for details.
llvm-svn: 366429
Diffstat (limited to 'clang/lib/CodeGen/CGCXXABI.h')
| -rw-r--r-- | clang/lib/CodeGen/CGCXXABI.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/clang/lib/CodeGen/CGCXXABI.h b/clang/lib/CodeGen/CGCXXABI.h index 3a9c3b34743..511bcd00d42 100644 --- a/clang/lib/CodeGen/CGCXXABI.h +++ b/clang/lib/CodeGen/CGCXXABI.h @@ -378,7 +378,7 @@ public: virtual void EmitDestructorCall(CodeGenFunction &CGF, const CXXDestructorDecl *DD, CXXDtorType Type, bool ForVirtualBase, bool Delegating, - Address This, QualType ThisTy) = 0; + Address This) = 0; /// Emits the VTable definitions required for the given record type. virtual void emitVTableDefinitions(CodeGenVTables &CGVT, @@ -421,15 +421,11 @@ public: llvm::Type *Ty, SourceLocation Loc) = 0; - using DeleteOrMemberCallExpr = - llvm::PointerUnion<const CXXDeleteExpr *, const CXXMemberCallExpr *>; - /// Emit the ABI-specific virtual destructor call. - virtual llvm::Value *EmitVirtualDestructorCall(CodeGenFunction &CGF, - const CXXDestructorDecl *Dtor, - CXXDtorType DtorType, - Address This, - DeleteOrMemberCallExpr E) = 0; + virtual llvm::Value * + EmitVirtualDestructorCall(CodeGenFunction &CGF, const CXXDestructorDecl *Dtor, + CXXDtorType DtorType, Address This, + const CXXMemberCallExpr *CE) = 0; virtual void adjustCallArgsForDestructorThunk(CodeGenFunction &CGF, GlobalDecl GD, |
