Refactor for better debug output, add data stmt test

Author: mrkajetanp

flang/lib/Semantics/resolve-directives.cpp

@@ -2369,17 +2369,21 @@ void OmpAttributeVisitor::CreateImplicitSymbols(const Symbol *symbol) {
       dsa = prevDSA;
     } else if (taskGenDir) {
       // TODO 5) dummy arg in orphaned taskgen construct -> firstprivate
-      // variables with static storage duration are predetermined as shared
-      if (prevDSA.test(Symbol::Flag::OmpShared) || isStaticStorageDuration) {
+      if (prevDSA.test(Symbol::Flag::OmpShared)) {
         // 6) shared in enclosing context -> shared
         dsa = {Symbol::Flag::OmpShared};
         makeSymbol(dsa);
         PRINT_IMPLICIT_RULE("6) taskgen: shared");
+      } else if (isStaticStorageDuration) {
+        // 7) variables with static storage duration are predetermined as shared
+        dsa = {Symbol::Flag::OmpShared};
+        makeSymbol(dsa);
+        PRINT_IMPLICIT_RULE("7) taskgen: shared (static storage duration)");
       } else {
-        // 7) firstprivate
+        // 8) firstprivate
         dsa = {Symbol::Flag::OmpFirstPrivate};
         makeSymbol(dsa)->set(Symbol::Flag::OmpImplicit);
-        PRINT_IMPLICIT_RULE("7) taskgen: firstprivate");
+        PRINT_IMPLICIT_RULE("8) taskgen: firstprivate");
       }
     }
     prevDSA = dsa;

flang/test/Semantics/OpenMP/implicit-dsa.f90

@@ -170,7 +170,7 @@ subroutine implicit_dsa_test8
   !$omp end task
 end subroutine
 
-! Test static storage duration variables default to shared DSA
+! Test variables defined in modules default to shared DSA
 !DEF: /implicit_dsa_test9_mod Module
 module implicit_dsa_test9_mod
  !DEF: /implicit_dsa_test9_mod/tm3a PUBLIC (InDataStmt) ObjectEntity COMPLEX(4)
@@ -189,3 +189,19 @@ subroutine implict_dsa_test9
   print *,tm3a
   end subroutine
 end module
+
+! Test variables in data statement default to shared DSA
+!DEF: /implicit_dsa_test10 (Subroutine) Subprogram
+subroutine implicit_dsa_test10
+ !DEF: /implicit_dsa_test10/tm3a (Implicit, InDataStmt) ObjectEntity REAL(4)
+data tm3a /(0, 2)/
+!$omp task
+  !$omp task
+ !DEF: /implicit_dsa_test10/OtherConstruct1/OtherConstruct1/tm3a (OmpShared) HostAssoc REAL(4)
+    tm3a = (1, 2)
+  !$omp end task
+!$omp end task
+!$omp taskwait
+ !REF: /implicit_dsa_test10/tm3a
+print *,tm3a
+end subroutine