Commit 70adacb1 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r366670 and r366694: 

------------------------------------------------------------------------
r366670 | mantognini | 2019-07-22 11:39:13 +0200 (Mon, 22 Jul 2019) | 4 lines

[OpenCL] Improve destructor support in C++ for OpenCL

This re-applies r366422 with a fix for Bug PR42665 and a new regression
test.
------------------------------------------------------------------------

------------------------------------------------------------------------
r366694 | mantognini | 2019-07-22 16:47:36 +0200 (Mon, 22 Jul 2019) | 5 lines

[NFC] Relaxed regression tests for PR42665

Following up on the buildbot failures, this commits relaxes some tests:
instead of checking for specific IR output, it now ensures that the
underlying issue (the crash), and only that, doesn't happen.
------------------------------------------------------------------------

llvm-svn: 366814
parent a57a0379

clang/include/clang/AST/DeclCXX.h

+11 −3
Original line number Diff line number Diff line
@@ -2232,20 +2232,20 @@ public: 


  overridden_method_range overridden_methods() const;



  /// Returns the parent of this method declaration, which

  /// Return the parent of this method declaration, which

  /// is the class in which this method is defined.

  const CXXRecordDecl *getParent() const {

    return cast<CXXRecordDecl>(FunctionDecl::getParent());

  }



  /// Returns the parent of this method declaration, which

  /// Return the parent of this method declaration, which

  /// is the class in which this method is defined.

  CXXRecordDecl *getParent() {

    return const_cast<CXXRecordDecl *>(

             cast<CXXRecordDecl>(FunctionDecl::getParent()));

  }



  /// Returns the type of the \c this pointer.

  /// Return the type of the \c this pointer.

  ///

  /// Should only be called for instance (i.e., non-static) methods. Note

  /// that for the call operator of a lambda closure type, this returns the
@@ -2253,9 +2253,17 @@ public: 
  /// 'this' type.

  QualType getThisType() const;



  /// Return the type of the object pointed by \c this.

  ///

  /// See getThisType() for usage restriction.

  QualType getThisObjectType() const;



  static QualType getThisType(const FunctionProtoType *FPT,

                              const CXXRecordDecl *Decl);



  static QualType getThisObjectType(const FunctionProtoType *FPT,

                                    const CXXRecordDecl *Decl);



  Qualifiers getMethodQualifiers() const {

    return getType()->getAs<FunctionProtoType>()->getMethodQuals();

  }

clang/include/clang/AST/ExprCXX.h

+8 −3
Original line number Diff line number Diff line
@@ -185,15 +185,20 @@ public: 
  static CXXMemberCallExpr *CreateEmpty(const ASTContext &Ctx, unsigned NumArgs,

                                        EmptyShell Empty);



  /// Retrieves the implicit object argument for the member call.

  /// Retrieve the implicit object argument for the member call.

  ///

  /// For example, in "x.f(5)", this returns the sub-expression "x".

  Expr *getImplicitObjectArgument() const;



  /// Retrieves the declaration of the called method.

  /// Retrieve the type of the object argument.

  ///

  /// Note that this always returns a non-pointer type.

  QualType getObjectType() const;



  /// Retrieve the declaration of the called method.

  CXXMethodDecl *getMethodDecl() const;



  /// Retrieves the CXXRecordDecl for the underlying type of

  /// Retrieve the CXXRecordDecl for the underlying type of

  /// the implicit object argument.

  ///

  /// Note that this is may not be the same declaration as that of the class

clang/lib/AST/DeclCXX.cpp

+22 −3
Original line number Diff line number Diff line
@@ -2253,12 +2253,23 @@ CXXMethodDecl::overridden_methods() const { 
  return getASTContext().overridden_methods(this);

}



static QualType getThisObjectType(ASTContext &C, const FunctionProtoType *FPT,

                                  const CXXRecordDecl *Decl) {

  QualType ClassTy = C.getTypeDeclType(Decl);

  return C.getQualifiedType(ClassTy, FPT->getMethodQuals());

}



QualType CXXMethodDecl::getThisType(const FunctionProtoType *FPT,

                                    const CXXRecordDecl *Decl) {

  ASTContext &C = Decl->getASTContext();

  QualType ClassTy = C.getTypeDeclType(Decl);

  ClassTy = C.getQualifiedType(ClassTy, FPT->getMethodQuals());

  return C.getPointerType(ClassTy);

  QualType ObjectTy = ::getThisObjectType(C, FPT, Decl);

  return C.getPointerType(ObjectTy);

}



QualType CXXMethodDecl::getThisObjectType(const FunctionProtoType *FPT,

                                          const CXXRecordDecl *Decl) {

  ASTContext &C = Decl->getASTContext();

  return ::getThisObjectType(C, FPT, Decl);

}



QualType CXXMethodDecl::getThisType() const {
@@ -2273,6 +2284,14 @@ QualType CXXMethodDecl::getThisType() const { 
                                    getParent());

}



QualType CXXMethodDecl::getThisObjectType() const {

  // Ditto getThisType.

  assert(isInstance() && "No 'this' for static methods!");



  return CXXMethodDecl::getThisObjectType(getType()->getAs<FunctionProtoType>(),

                                          getParent());

}



bool CXXMethodDecl::hasInlineBody() const {

  // If this function is a template instantiation, look at the template from

  // which it was instantiated.

clang/lib/AST/ExprCXX.cpp

+7 −0
Original line number Diff line number Diff line
@@ -651,6 +651,13 @@ Expr *CXXMemberCallExpr::getImplicitObjectArgument() const { 
  return nullptr;

}



QualType CXXMemberCallExpr::getObjectType() const {

  QualType Ty = getImplicitObjectArgument()->getType();

  if (Ty->isPointerType())

    Ty = Ty->getPointeeType();

  return Ty;

}



CXXMethodDecl *CXXMemberCallExpr::getMethodDecl() const {

  if (const auto *MemExpr = dyn_cast<MemberExpr>(getCallee()->IgnoreParens()))

    return cast<CXXMethodDecl>(MemExpr->getMemberDecl());

clang/lib/CodeGen/CGCXXABI.h

+9 −5
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ public: 
  virtual void EmitDestructorCall(CodeGenFunction &CGF,

                                  const CXXDestructorDecl *DD, CXXDtorType Type,

                                  bool ForVirtualBase, bool Delegating,

                                  Address This) = 0;

                                  Address This, QualType ThisTy) = 0;



  /// Emits the VTable definitions required for the given record type.

  virtual void emitVTableDefinitions(CodeGenVTables &CGVT,
@@ -421,11 +421,15 @@ 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,

                            const CXXMemberCallExpr *CE) = 0;

  virtual llvm::Value *EmitVirtualDestructorCall(CodeGenFunction &CGF,

                                                 const CXXDestructorDecl *Dtor,

                                                 CXXDtorType DtorType,

                                                 Address This,

                                                 DeleteOrMemberCallExpr E) = 0;



  virtual void adjustCallArgsForDestructorThunk(CodeGenFunction &CGF,

                                                GlobalDecl GD,