commit 92327c50d39586feeedd046eb73095dd9705cac6
author Alexey Bataev <a.bataev@hotmail.com> Mon Mar 26 16:40:55 2018 +0000
committer Alexey Bataev <a.bataev@hotmail.com> Mon Mar 26 16:40:55 2018 +0000
tree 9b23b6db07b073ea408d41b1a0a872ed4f1ea884
parent 3f72a6b7a1c616ae4f3c46b2c89a9da53fd24a51

[OPENMP] Codegen for declare target with link clause.

If the link clause is used on the declare target directive, the object
should be linked on target or target data directives, not during the
codegen. Patch adds support for this clause.

llvm-svn: 328544

clang/lib/Sema/SemaOpenMP.cpp

diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
index 76b7f3a..ca9dc32 100644
--- a/clang/lib/Sema/SemaOpenMP.cpp
+++ b/clang/lib/Sema/SemaOpenMP.cpp
@@ -1215,6 +1215,17 @@
   DSAStack->popFunction(OldFSI);
 }
 
+static llvm::Optional<OMPDeclareTargetDeclAttr::MapTypeTy>
+isDeclareTargetDeclaration(const ValueDecl *VD) {
+  for (const auto *D : VD->redecls()) {
+    if (!D->hasAttrs())
+      continue;
+    if (const auto *Attr = D->getAttr<OMPDeclareTargetDeclAttr>())
+      return Attr->getMapType();
+  }
+  return llvm::None;
+}
+
 bool Sema::IsOpenMPCapturedByRef(ValueDecl *D, unsigned Level) {
   assert(LangOpts.OpenMP && "OpenMP is not allowed");
 
@@ -1392,10 +1403,8 @@
     // If the declaration is enclosed in a 'declare target' directive,
     // then it should not be captured.
     //
-    for (const auto *Var = VD->getMostRecentDecl(); Var;
-         Var = Var->getPreviousDecl())
-      if (Var->hasAttr<OMPDeclareTargetDeclAttr>())
-        return nullptr;
+    if (isDeclareTargetDeclaration(VD))
+      return nullptr;
     return VD;
   }
 
@@ -1929,7 +1938,10 @@
         return;
 
       // Skip internally declared static variables.
-      if (VD->hasGlobalStorage() && !CS->capturesVariable(VD))
+      llvm::Optional<OMPDeclareTargetDeclAttr::MapTypeTy> Res =
+          isDeclareTargetDeclaration(VD);
+      if (VD->hasGlobalStorage() && !CS->capturesVariable(VD) &&
+          (!Res || *Res != OMPDeclareTargetDeclAttr::MT_Link))
         return;
 
       auto ELoc = E->getExprLoc();
@@ -1976,7 +1988,7 @@
           IsFirstprivate =
               IsFirstprivate ||
               (VD->getType().getNonReferenceType()->isScalarType() &&
-               Stack->getDefaultDMA() != DMA_tofrom_scalar);
+               Stack->getDefaultDMA() != DMA_tofrom_scalar && !Res);
           if (IsFirstprivate)
             ImplicitFirstprivate.emplace_back(E);
           else