Commit 980133a2 authored by Anastasia Stulova's avatar Anastasia Stulova
Browse files

[OpenCL] Use generic addr space for lambda call operator 

Since lambdas are represented by callable objects, we add
generic addr space for implicit object parameter in call
operator.

Any lambda variable declared in __constant addr space
(which is not convertible to generic) fails to compile with
a diagnostic. To support constant addr space we need to
add a way to qualify the lambda call operators.

Tags: #clang

Differential Revision: https://reviews.llvm.org/D69938
parent 62827737

clang/include/clang/Sema/Sema.h

+3 −0
Original line number Diff line number Diff line
@@ -3907,6 +3907,9 @@ public: 
  /// Add the given method to the list of globally-known methods.

  void addMethodToGlobalList(ObjCMethodList *List, ObjCMethodDecl *Method);













  /// Returns default addr space for method qualifiers.













  LangAS getDefaultCXXMethodAddrSpace() const;



























private:















  /// AddMethodToGlobalPool - Add an instance or factory method to the global















  /// pool. See descriptoin of AddInstanceMethodToGlobalPool.

































clang/lib/Sema/Sema.cpp



+6
−0






























Original line number
Diff line number
Diff line








@@ -1290,6 +1290,12 @@ NamedDecl *Sema::getCurFunctionOrMethodDecl() {













  return nullptr;















}





























LangAS Sema::getDefaultCXXMethodAddrSpace() const {













  if (getLangOpts().OpenCL)













    return LangAS::opencl_generic;













  return LangAS::Default;













}





























void Sema::EmitCurrentDiagnostic(unsigned DiagID) {















  // FIXME: It doesn't make sense to me that DiagID is an incoming argument here















  // and yet we also use the current diag ID on the DiagnosticsEngine. This has

































clang/lib/Sema/SemaDeclCXX.cpp



+15
−12






























Original line number
Diff line number
Diff line








@@ -11417,10 +11417,9 @@ void Sema::setupImplicitSpecialMemberType(CXXMethodDecl *SpecialMem,













  // Build an exception specification pointing back at this constructor.















  FunctionProtoType::ExtProtoInfo EPI = getImplicitMethodEPI(*this, SpecialMem);



























  if (getLangOpts().OpenCLCPlusPlus) {













    // OpenCL: Implicitly defaulted special member are of the generic address













    // space.













    EPI.TypeQuals.addAddressSpace(LangAS::opencl_generic);













  LangAS AS = getDefaultCXXMethodAddrSpace();













  if (AS != LangAS::Default) {













    EPI.TypeQuals.addAddressSpace(AS);















  }





























  auto QT = Context.getFunctionType(ResultTy, Args, EPI);










@@ -12330,8 +12329,9 @@ CXXMethodDecl *Sema::DeclareImplicitCopyAssignment(CXXRecordDecl *ClassDecl) {













    return nullptr;





























  QualType ArgType = Context.getTypeDeclType(ClassDecl);













  if (Context.getLangOpts().OpenCLCPlusPlus)













    ArgType = Context.getAddrSpaceQualType(ArgType, LangAS::opencl_generic);













  LangAS AS = getDefaultCXXMethodAddrSpace();













  if (AS != LangAS::Default)













    ArgType = Context.getAddrSpaceQualType(ArgType, AS);















  QualType RetType = Context.getLValueReferenceType(ArgType);















  bool Const = ClassDecl->implicitCopyAssignmentHasConstParam();















  if (Const)










@@ -12656,8 +12656,9 @@ CXXMethodDecl *Sema::DeclareImplicitMoveAssignment(CXXRecordDecl *ClassDecl) {













  // constructor rules.





























  QualType ArgType = Context.getTypeDeclType(ClassDecl);













  if (Context.getLangOpts().OpenCLCPlusPlus)













    ArgType = Context.getAddrSpaceQualType(ArgType, LangAS::opencl_generic);













  LangAS AS = getDefaultCXXMethodAddrSpace();













  if (AS != LangAS::Default)













    ArgType = Context.getAddrSpaceQualType(ArgType, AS);















  QualType RetType = Context.getLValueReferenceType(ArgType);















  ArgType = Context.getRValueReferenceType(ArgType);
























@@ -13034,8 +13035,9 @@ CXXConstructorDecl *Sema::DeclareImplicitCopyConstructor(













  if (Const)















    ArgType = ArgType.withConst();



























  if (Context.getLangOpts().OpenCLCPlusPlus)













    ArgType = Context.getAddrSpaceQualType(ArgType, LangAS::opencl_generic);













  LangAS AS = getDefaultCXXMethodAddrSpace();













  if (AS != LangAS::Default)













    ArgType = Context.getAddrSpaceQualType(ArgType, AS);





























  ArgType = Context.getLValueReferenceType(ArgType);
























@@ -13166,8 +13168,9 @@ CXXConstructorDecl *Sema::DeclareImplicitMoveConstructor(













  QualType ClassType = Context.getTypeDeclType(ClassDecl);





























  QualType ArgType = ClassType;













  if (Context.getLangOpts().OpenCLCPlusPlus)













    ArgType = Context.getAddrSpaceQualType(ClassType, LangAS::opencl_generic);













  LangAS AS = getDefaultCXXMethodAddrSpace();













  if (AS != LangAS::Default)













    ArgType = Context.getAddrSpaceQualType(ClassType, AS);















  ArgType = Context.getRValueReferenceType(ArgType);





























  bool Constexpr = defaultedSpecialMemberIsConstexpr(*this, ClassDecl,

































clang/lib/Sema/SemaLambda.cpp



+4
−0






























Original line number
Diff line number
Diff line








@@ -917,6 +917,10 @@ void Sema::ActOnStartOfLambdaDefinition(LambdaIntroducer &Intro,













        /*IsVariadic=*/false, /*IsCXXMethod=*/true));















    EPI.HasTrailingReturn = true;















    EPI.TypeQuals.addConst();













    LangAS AS = getDefaultCXXMethodAddrSpace();













    if (AS != LangAS::Default)













      EPI.TypeQuals.addAddressSpace(AS);





























    // C++1y [expr.prim.lambda]:















    //   The lambda return type is 'auto', which is replaced by the















    //   trailing-return type if provided and/or deduced from 'return'

































clang/lib/Sema/SemaType.cpp



+5
−2






























Original line number
Diff line number
Diff line








@@ -4950,7 +4950,9 @@ static TypeSourceInfo *GetFullTypeForDeclarator(TypeProcessingState &state,













                          .getScopeRep()















                          ->getKind() == NestedNameSpecifier::TypeSpec) ||















                 state.getDeclarator().getContext() ==













                     DeclaratorContext::MemberContext;













                     DeclaratorContext::MemberContext ||













                 state.getDeclarator().getContext() ==













                     DeclaratorContext::LambdaExprContext;















        };































        if (state.getSema().getLangOpts().OpenCLCPlusPlus && IsClassMember()) {









@@ -4969,7 +4971,8 @@ static TypeSourceInfo *GetFullTypeForDeclarator(TypeProcessingState &state,













          // If a class member function's address space is not set, set it to















          // __generic.















          LangAS AS =













              (ASIdx == LangAS::Default ? LangAS::opencl_generic : ASIdx);













              (ASIdx == LangAS::Default ? S.getDefaultCXXMethodAddrSpace()













                                        : ASIdx);















          EPI.TypeQuals.addAddressSpace(AS);















        }















        T = Context.getFunctionType(T, ParamTys, EPI);