Variables declared inside a task don't have DSA. Also, avoid making the same node where there're more than one usage

closes llvm#29, closes llvm#30

Author: mikaoP

clang/lib/Sema/SemaOmpSs.cpp

@@ -264,6 +264,7 @@ class DSAAttrChecker final : public StmtVisitor<DSAAttrChecker, void> {
   Stmt *CS = nullptr;
   llvm::SmallVector<Expr *, 4> ImplicitShared;
   llvm::SmallVector<Expr *, 4> ImplicitFirstprivate;
+  llvm::SmallSet<const ValueDecl *, 4> InnerDecls;
 
 public:
   void VisitDeclRefExpr(DeclRefExpr *E) {
@@ -273,18 +274,24 @@ class DSAAttrChecker final : public StmtVisitor<DSAAttrChecker, void> {
     if (auto *VD = dyn_cast<VarDecl>(E->getDecl())) {
       VD = VD->getCanonicalDecl();
 
+      // Variables declared inside region don't have DSA
+      if (InnerDecls.count(VD))
+        return;
+
       DSAStackTy::DSAVarData DVarCurrent = Stack->getCurrentDSA(VD);
       DSAStackTy::DSAVarData DVarFromParent = Stack->getTopDSA(VD, /*FromParent=*/true);
 
-      bool IsParentExplicit = DVarFromParent.RefExpr && !DVarFromParent.Ignore;
-      bool IsCurrentExplicit = DVarCurrent.RefExpr && !DVarCurrent.Ignore;
+      bool ExistsParent = DVarFromParent.RefExpr;
+      bool ParentIgnore = DVarFromParent.Ignore;
 
-      // Check if the variable has explicit DSA only set on the current
+      bool ExistsCurrent = DVarCurrent.RefExpr;
+
+      // Check if the variable has DSA set on the current
       // directive and stop analysis if it so.
-      if (IsCurrentExplicit)
+      if (ExistsCurrent)
         return;
       // If explicit DSA comes from parent inherit it
-      if (IsParentExplicit) {
+      if (ExistsParent && !ParentIgnore) {
           switch (DVarFromParent.CKind) {
           case OSSC_shared:
             ImplicitShared.push_back(E);
@@ -309,6 +316,8 @@ class DSAAttrChecker final : public StmtVisitor<DSAAttrChecker, void> {
           // Define implicit data-sharing attributes for task.
           if (isOmpSsTaskingDirective(DKind))
             ImplicitShared.push_back(E);
+          // Record DSA as Ignored to avoid making the same node again
+          Stack->addDSA(VD, E, OSSC_shared, /*Ignore=*/true);
           break;
         case DSA_none:
           if (!DVarCurrent.Ignore) {
@@ -326,13 +335,19 @@ class DSAAttrChecker final : public StmtVisitor<DSAAttrChecker, void> {
             // Define implicit data-sharing attributes for task.
             if (isOmpSsTaskingDirective(DKind))
               ImplicitFirstprivate.push_back(E);
+
+            // Record DSA as Ignored to avoid making the same node again
+            Stack->addDSA(VD, E, OSSC_firstprivate, /*Ignore=*/true);
           } else {
             // If no default clause is present and the variable was shared/global
             // in the context encountering the construct, the variable will be shared.
 
             // Define implicit data-sharing attributes for task.
             if (isOmpSsTaskingDirective(DKind))
               ImplicitShared.push_back(E);
+
+            // Record DSA as Ignored to avoid making the same node again
+            Stack->addDSA(VD, E, OSSC_shared, /*Ignore=*/true);
           }
         }
       }
@@ -346,6 +361,12 @@ class DSAAttrChecker final : public StmtVisitor<DSAAttrChecker, void> {
     }
   }
 
+  void VisitDeclStmt(DeclStmt *S) {
+    for (const Decl *D : S->decls())
+      if (const auto *VD = dyn_cast_or_null<ValueDecl>(D))
+        InnerDecls.insert(VD);
+  }
+
   bool isErrorFound() const { return ErrorFound; }
 
   ArrayRef<Expr *> getImplicitShared() const {

clang/test/OmpSs/AST/task_default.cpp

@@ -12,3 +12,17 @@ int main() {
 // CHECK-NEXT: OSSSharedClause {{[a-z0-9]+}} <<invalid sloc>> <implicit>
 // CHECK-NEXT: DeclRefExpr {{[a-z0-9]+}} <line:{{[a-z0-9]+}}:{{[a-z0-9]+}}> 'int' lvalue Var {{[a-z0-9]+}} 'x' 'int'
 
+void foo()
+{
+    #pragma oss task default(none)
+    {
+        int k, asdf;
+        k = asdf + 0;
+        k = asdf + 1;
+        k = asdf + 2;
+    }
+}
+
+// CHECK: OSSTaskDirective {{[a-z0-9]+}} <line:{{[a-z0-9]+}}:{{[a-z0-9]+}}, col:{{[a-z0-9]+}}>
+// CHECK_NEXT: OSSDefaultClause {{[a-z0-9]+}} <col:{{[a-z0-9]+}}, col:{{[a-z0-9]+}}>
+// CHECK_NEXT: CompoundStmt {{[a-z0-9]+}} <line:{{[a-z0-9]+}}:{{[a-z0-9]+}}, line:{{[a-z0-9]+}}:{{[a-z0-9]+}}>