[flang] Correct IsHostAssociated() to be true for BLOCK constructs

[klausler]

Summary

The predicate IsHostAssocited() was implemented in a way that would
return true only for cases of host association into a module or inner
subprogram. Technically, the use of a name in a BLOCK construct
that is not declared therein is considered in the Fortran standard
to also be a form of host association, and this matters when doing
error checking on DATA statements.

[PeteSteinfeld]

All builds and tests correctly and looks good.

flang/include/flang/Semantics/scope.h

 };
 using EquivalenceSet = std::vector<EquivalenceObject>;
 
 class Scope {
   using mapType = std::map<SourceName, MutableSymbolRef>;
 
 public:
   ENUM_CLASS(Kind, Global, IntrinsicModules, Module, MainProgram, Subprogram,
-      BlockData, DerivedType, Block, Forall, ImpliedDos)
+      BlockData, DerivedType, BlockConstruct, Forall, OtherConstruct,
+      ImpliedDos)
   using ImportKind = common::ImportKind;
 
   // Create the Global scope -- the root of the scope tree
   explicit Scope(SemanticsContext &context)
       : Scope{*this, Kind::Global, nullptr, context} {}
   Scope(Scope &parent, Kind kind, Symbol *symbol, SemanticsContext &context)
       : parent_{parent}, kind_{kind}, symbol_{symbol}, context_{context} {
     if (symbol) {

flang/include/flang/Semantics/tools.h

 class Symbol;
 
 // Note: Here ProgramUnit includes internal subprograms while TopLevelUnit
 // does not. "program-unit" in the Fortran standard matches TopLevelUnit.
 const Scope &GetTopLevelUnitContaining(const Scope &);
 const Scope &GetTopLevelUnitContaining(const Symbol &);
 const Scope &GetProgramUnitContaining(const Scope &);
 const Scope &GetProgramUnitContaining(const Symbol &);
+const Scope &GetProgramUnitOrBlockConstructContaining(const Scope &);
+const Scope &GetProgramUnitOrBlockConstructContaining(const Symbol &);
 
 const Scope *FindModuleContaining(const Scope &);
 const Scope *FindModuleFileContaining(const Scope &);
 const Scope *FindPureProcedureContaining(const Scope &);
 const Scope *FindPureProcedureContaining(const Symbol &);
 const Symbol *FindPointerComponent(const Scope &);
 const Symbol *FindPointerComponent(const DerivedTypeSpec &);
 const Symbol *FindPointerComponent(const DeclTypeSpec &);

flang/lib/Semantics/data-to-inits.cpp

static bool ProcessScopes(const Scope &scope,
     evaluate::ExpressionAnalyzer &exprAnalyzer, DataInitializations &inits) {
   bool result{true}; // no error
   switch (scope.kind()) {
   case Scope::Kind::Global:
   case Scope::Kind::Module:
   case Scope::Kind::MainProgram:
   case Scope::Kind::Subprogram:
   case Scope::Kind::BlockData:
-  case Scope::Kind::Block: {
+  case Scope::Kind::BlockConstruct: {
     std::list<std::list<SymbolRef>> associations{GetStorageAssociations(scope)};
     for (const std::list<SymbolRef> &associated : associations) {
       if (std::find_if(associated.begin(), associated.end(), [](SymbolRef ref) {
             return IsInitialized(*ref);
           }) != associated.end()) {
         result &=
             CombineEquivalencedInitialization(associated, exprAnalyzer, inits);
       }

flang/lib/Semantics/resolve-names.cpp

 
 void AccVisitor::AddAccSourceRange(const parser::CharBlock &source) {
   messageHandler().set_currStmtSource(source);
   currScope().AddSourceRange(source);
 }
 
 bool AccVisitor::Pre(const parser::OpenACCBlockConstruct &x) {
   if (NeedsScope(x)) {
-    PushScope(Scope::Kind::Block, nullptr);
+    PushScope(Scope::Kind::OtherConstruct, nullptr);
   }
   return true;
 }
 
 void AccVisitor::Post(const parser::OpenACCBlockConstruct &x) {
   if (NeedsScope(x)) {
     PopScope();
   }
bool Pre(const parser::OmpEndBlockDirective &x) {
     AddOmpSourceRange(x.source);
     return true;
   }
   void Post(const parser::OmpEndBlockDirective &) {
     messageHandler().set_currStmtSource(std::nullopt);
   }
 
   bool Pre(const parser::OpenMPLoopConstruct &) {
-    PushScope(Scope::Kind::Block, nullptr);
+    PushScope(Scope::Kind::OtherConstruct, nullptr);
     return true;
   }
   void Post(const parser::OpenMPLoopConstruct &) { PopScope(); }
   bool Pre(const parser::OmpBeginLoopDirective &x) {
     AddOmpSourceRange(x.source);
     return true;
   }
   void Post(const parser::OmpBeginLoopDirective &) {
     messageHandler().set_currStmtSource(std::nullopt);
   }
   bool Pre(const parser::OmpEndLoopDirective &x) {
     AddOmpSourceRange(x.source);
     return true;
   }
   void Post(const parser::OmpEndLoopDirective &) {
     messageHandler().set_currStmtSource(std::nullopt);
   }
 
   bool Pre(const parser::OpenMPSectionsConstruct &) {
-    PushScope(Scope::Kind::Block, nullptr);
+    PushScope(Scope::Kind::OtherConstruct, nullptr);
     return true;
   }
   void Post(const parser::OpenMPSectionsConstruct &) { PopScope(); }
   bool Pre(const parser::OmpBeginSectionsDirective &x) {
     AddOmpSourceRange(x.source);
     return true;
   }
   void Post(const parser::OmpBeginSectionsDirective &) {

 
 void OmpVisitor::AddOmpSourceRange(const parser::CharBlock &source) {
   messageHandler().set_currStmtSource(source);
   currScope().AddSourceRange(source);
 }
 
 bool OmpVisitor::Pre(const parser::OpenMPBlockConstruct &x) {
   if (NeedsScope(x)) {
-    PushScope(Scope::Kind::Block, nullptr);
+    PushScope(Scope::Kind::OtherConstruct, nullptr);
   }
   return true;
 }
 
 void OmpVisitor::Post(const parser::OpenMPBlockConstruct &x) {
   if (NeedsScope(x)) {
     PopScope();
   }

 }
 
 void ScopeHandler::PushScope(Scope::Kind kind, Symbol *symbol) {
   PushScope(currScope().MakeScope(kind, symbol));
 }
 void ScopeHandler::PushScope(Scope &scope) {
   currScope_ = &scope;
   auto kind{currScope_->kind()};
-  if (kind != Scope::Kind::Block) {
+  if (kind != Scope::Kind::BlockConstruct &&
+      kind != Scope::Kind::OtherConstruct) {
     BeginScope(scope);
   }
   // The name of a module or submodule cannot be "used" in its scope,
   // as we read 19.3.1(2), so we allow the name to be used as a local
   // identifier in the module or submodule too.  Same with programs
   // (14.1(3)) and BLOCK DATA.
   if (!currScope_->IsDerivedType() && kind != Scope::Kind::Module &&
       kind != Scope::Kind::MainProgram && kind != Scope::Kind::BlockData) {
if (auto known{evaluate::ToInt64(value)}) {
     return currScope_->MakeLogicalType(std::move(value));
   }
 }
 
 void ScopeHandler::NotePossibleBadForwardRef(const parser::Name &name) {
   if (inSpecificationPart_ && name.symbol) {
     auto kind{currScope().kind()};
     if ((kind == Scope::Kind::Subprogram && !currScope().IsStmtFunction()) ||
-        kind == Scope::Kind::Block) {
+        kind == Scope::Kind::BlockConstruct) {
       bool isHostAssociated{&name.symbol->owner() == &currScope()
               ? name.symbol->has<HostAssocDetails>()
               : name.symbol->owner().Contains(currScope())};
       if (isHostAssociated) {
         specPartState_.forwardRefs.insert(name.source);
       }
     }
   }

 }
 Symbol &DeclarationVisitor::HandleAttributeStmt(
     Attr attr, const parser::Name &name) {
   auto *symbol{FindInScope(name)};
   if (attr == Attr::ASYNCHRONOUS || attr == Attr::VOLATILE) {
     // these can be set on a symbol that is host-assoc or use-assoc
     if (!symbol &&
         (currScope().kind() == Scope::Kind::Subprogram ||
-            currScope().kind() == Scope::Kind::Block)) {
+            currScope().kind() == Scope::Kind::BlockConstruct)) {
       if (auto *hostSymbol{FindSymbol(name)}) {
         symbol = &MakeHostAssocSymbol(name, *hostSymbol);
       }
     }
   } else if (symbol && symbol->has<UseDetails>()) {
     Say(currStmtSource().value(),
         "Cannot change %s attribute on use-associated '%s'"_err_en_US,
         EnumToString(attr), name.source);
     return *symbol;
   }
   if (!symbol) {
     symbol = &MakeSymbol(name, EntityDetails{});
   }
   symbol->attrs().set(attr);
   symbol->attrs() = HandleSaveName(name.source, symbol->attrs());
   return *symbol;
 }
 // C1107
 bool DeclarationVisitor::CheckNotInBlock(const char *stmt) {
-  if (currScope().kind() == Scope::Kind::Block) {
+  if (currScope().kind() == Scope::Kind::BlockConstruct) {
     Say(MessageFormattedText{
         "%s statement is not allowed in a BLOCK construct"_err_en_US, stmt});
     return false;
   } else {
     return true;
   }
 }
 
for (const SourceName &name : specPartState_.saveInfo.entities) {
     } else {
       SetSaveAttr(*symbol);
     }
   }
   for (const SourceName &name : specPartState_.saveInfo.commons) {
     if (auto *symbol{currScope().FindCommonBlock(name)}) {
       auto &objects{symbol->get<CommonBlockDetails>().objects()};
       if (objects.empty()) {
-        if (currScope().kind() != Scope::Kind::Block) {
+        if (currScope().kind() != Scope::Kind::BlockConstruct) {
           Say(name,
               "'%s' appears as a COMMON block in a SAVE statement but not in"
               " a COMMON statement"_err_en_US);
         } else { // C1108
           Say(name,
               "SAVE statement in BLOCK construct may not contain a"
               " common block name '%s'"_err_en_US);
         }
if (const auto *name{std::get_if<parser::Name>(&elem->base.u)}) {
       }
     }
   }
   return true;
 }
 
 bool ConstructVisitor::Pre(const parser::DoConstruct &x) {
   if (x.IsDoConcurrent()) {
-    PushScope(Scope::Kind::Block, nullptr);
+    PushScope(Scope::Kind::OtherConstruct, nullptr);
   }
   return true;
 }
 void ConstructVisitor::Post(const parser::DoConstruct &x) {
   if (x.IsDoConcurrent()) {
     PopScope();
   }
 }
 
 bool ConstructVisitor::Pre(const parser::ForallConstruct &) {
   PushScope(Scope::Kind::Forall, nullptr);
   return true;
 }
 void ConstructVisitor::Post(const parser::ForallConstruct &) { PopScope(); }
 bool ConstructVisitor::Pre(const parser::ForallStmt &) {
   PushScope(Scope::Kind::Forall, nullptr);
   return true;
 }
 void ConstructVisitor::Post(const parser::ForallStmt &) { PopScope(); }
 
 bool ConstructVisitor::Pre(const parser::BlockStmt &x) {
   CheckDef(x.v);
-  PushScope(Scope::Kind::Block, nullptr);
+  PushScope(Scope::Kind::BlockConstruct, nullptr);
   return false;
 }
 bool ConstructVisitor::Pre(const parser::EndBlockStmt &x) {
   PopScope();
   CheckRef(x.v);
   return false;
 }
 
 void ConstructVisitor::Post(const parser::Selector &x) {
   GetCurrentAssociation().selector = ResolveSelector(x);
 }
 
 void ConstructVisitor::Post(const parser::AssociateStmt &x) {
   CheckDef(x.t);
-  PushScope(Scope::Kind::Block, nullptr);
+  PushScope(Scope::Kind::OtherConstruct, nullptr);
   const auto assocCount{std::get<std::list<parser::Association>>(x.t).size()};
   for (auto nthLastAssoc{assocCount}; nthLastAssoc > 0; --nthLastAssoc) {
     SetCurrentAssociation(nthLastAssoc);
     if (auto *symbol{MakeAssocEntity()}) {
       if (ExtractCoarrayRef(GetCurrentAssociation().selector.expr)) { // C1103
         Say("Selector must not be a coindexed object"_err_en_US);
       }
       SetTypeFromAssociation(*symbol);
bool ConstructVisitor::Pre(const parser::Association &x) {
   PushAssociation();
   const auto &name{std::get<parser::Name>(x.t)};
   GetCurrentAssociation().name = &name;
   return true;
 }
 
 bool ConstructVisitor::Pre(const parser::ChangeTeamStmt &x) {
   CheckDef(x.t);
-  PushScope(Scope::Kind::Block, nullptr);
+  PushScope(Scope::Kind::OtherConstruct, nullptr);
   PushAssociation();
   return true;
 }
 
 void ConstructVisitor::Post(const parser::CoarrayAssociation &x) {
   const auto &decl{std::get<parser::CodimensionDecl>(x.t)};
   const auto &name{std::get<parser::Name>(decl.t)};
   if (auto *symbol{FindInScope(name)}) {
void ConstructVisitor::Post(const parser::SelectRankStmt &x) {
   if (const std::optional<parser::Name> &name{std::get<1>(x.t)}) {
     // This isn't a name in the current scope, it is in each SelectRankCaseStmt
     MakePlaceholder(*name, MiscDetails::Kind::SelectRankAssociateName);
     association.name = &*name;
   }
 }
 
 bool ConstructVisitor::Pre(const parser::SelectTypeConstruct::TypeCase &) {
-  PushScope(Scope::Kind::Block, nullptr);
+  PushScope(Scope::Kind::OtherConstruct, nullptr);
   return true;
 }
 void ConstructVisitor::Post(const parser::SelectTypeConstruct::TypeCase &) {
   PopScope();
 }
 
 bool ConstructVisitor::Pre(const parser::SelectRankConstruct::RankCase &) {
-  PushScope(Scope::Kind::Block, nullptr);
+  PushScope(Scope::Kind::OtherConstruct, nullptr);
   return true;
 }
 void ConstructVisitor::Post(const parser::SelectRankConstruct::RankCase &) {
   PopScope();
 }
 
 void ConstructVisitor::Post(const parser::TypeGuardStmt::Guard &x) {
   if (auto *symbol{MakeAssocEntity()}) {

flang/lib/Semantics/tools.cpp

return DEREF(FindScopeContaining(start, [](const Scope &scope) {
     }
   }));
 }
 
 const Scope &GetProgramUnitContaining(const Symbol &symbol) {
   return GetProgramUnitContaining(symbol.owner());
 }
 
+const Scope &GetProgramUnitOrBlockConstructContaining(const Scope &start) {
+  CHECK(!start.IsTopLevel());
+  return DEREF(FindScopeContaining(start, [](const Scope &scope) {
+    switch (scope.kind()) {
+    case Scope::Kind::Module:
+    case Scope::Kind::MainProgram:
+    case Scope::Kind::Subprogram:
+    case Scope::Kind::BlockData:
+    case Scope::Kind::BlockConstruct:
+      return true;
+    default:
+      return false;
+    }
+  }));
+}
+
+const Scope &GetProgramUnitOrBlockConstructContaining(const Symbol &symbol) {
+  return GetProgramUnitOrBlockConstructContaining(symbol.owner());
+}
+
 const Scope *FindPureProcedureContaining(const Scope &start) {
   // N.B. We only need to examine the innermost containing program unit
   // because an internal subprogram of a pure subprogram must also
   // be pure (C1592).
   if (start.IsTopLevel()) {
     return nullptr;
   } else {
     const Scope &scope{GetProgramUnitContaining(start)};

 
 bool IsCommonBlockContaining(const Symbol &block, const Symbol &object) {
   const auto &objects{block.get<CommonBlockDetails>().objects()};
   auto found{std::find(objects.begin(), objects.end(), object)};
   return found != objects.end();
 }
 
 bool IsUseAssociated(const Symbol &symbol, const Scope &scope) {
-  const Scope &owner{GetProgramUnitContaining(symbol.GetUltimate().owner())};
+  const Scope &owner{
+      GetProgramUnitOrBlockConstructContaining(symbol.GetUltimate().owner())};
   return owner.kind() == Scope::Kind::Module &&
-      owner != GetProgramUnitContaining(scope);
+      owner != GetProgramUnitOrBlockConstructContaining(scope);
 }
 
 bool DoesScopeContain(
     const Scope *maybeAncestor, const Scope &maybeDescendent) {
   return maybeAncestor && !maybeDescendent.IsTopLevel() &&
       FindScopeContaining(maybeDescendent.parent(),
           [&](const Scope &scope) { return &scope == maybeAncestor; });
 }
 
 bool DoesScopeContain(const Scope *maybeAncestor, const Symbol &symbol) {
   return DoesScopeContain(maybeAncestor, symbol.owner());
 }
 
 static const Symbol &FollowHostAssoc(const Symbol &symbol) {
   for (const Symbol *s{&symbol};;) {
     const auto *details{s->detailsIf<HostAssocDetails>()};
     if (!details) {
       return *s;
     }
     s = &details->symbol();
   }
 }
 
 bool IsHostAssociated(const Symbol &symbol, const Scope &scope) {
-  const Scope &subprogram{GetProgramUnitContaining(scope)};
   return DoesScopeContain(
-      &GetProgramUnitContaining(FollowHostAssoc(symbol)), subprogram);
+      &GetProgramUnitOrBlockConstructContaining(FollowHostAssoc(symbol)),
+      GetProgramUnitOrBlockConstructContaining(scope));
 }
 
 bool IsInStmtFunction(const Symbol &symbol) {
   if (const Symbol * function{symbol.owner().symbol()}) {
     return IsStmtFunction(*function);
   }
   return false;
 }

flang/test/Semantics/OpenACC/acc-symbols01.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenacc
 
 !DEF: /mm MainProgram
 program mm
   !DEF: /mm/x ObjectEntity REAL(4)
   !DEF: /mm/y ObjectEntity REAL(4)
   real x, y
   !DEF: /mm/a ObjectEntity INTEGER(4)
   !DEF: /mm/b ObjectEntity INTEGER(4)
   !DEF: /mm/c ObjectEntity INTEGER(4)
   !DEF: /mm/i ObjectEntity INTEGER(4)
   integer a(10), b(10), c(10), i
   !REF: /mm/b
   b = 2
  !$acc parallel present(c) firstprivate(b) private(a)
  !$acc loop
-  !DEF: /mm/Block1/i (AccPrivate, AccPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /mm/OtherConstruct1/i (AccPrivate, AccPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-   !DEF: /mm/Block1/a (AccPrivate) HostAssoc INTEGER(4)
-   !REF: /mm/Block1/i
-   !DEF: /mm/Block1/b (AccFirstPrivate) HostAssoc INTEGER(4)
+   !DEF: /mm/OtherConstruct1/a (AccPrivate) HostAssoc INTEGER(4)
+   !REF: /mm/OtherConstruct1/i
+   !DEF: /mm/OtherConstruct1/b (AccFirstPrivate) HostAssoc INTEGER(4)
    a(i) = b(i)
   end do
  !$acc end parallel
  end program
 

flang/test/Semantics/OpenMP/omp-do-schedule03.f90

program ompdoschedule
   real  a(100),y(100),z(100)
   !DEF: /ompdoschedule/b ObjectEntity INTEGER(4)
   !DEF: /ompdoschedule/i ObjectEntity INTEGER(4)
   !DEF: /ompdoschedule/n ObjectEntity INTEGER(4)
   integer  b,i,n
   !REF: /ompdoschedule/b
   b = 10
   !$omp do  schedule(static,b-b)
-  !DEF: /ompdoschedule/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /ompdoschedule/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   !REF: /ompdoschedule/n
   do i = 2,n+1
     !REF: /ompdoschedule/y
-    !REF: /ompdoschedule/Block1/i
+    !REF: /ompdoschedule/OtherConstruct1/i
     !REF: /ompdoschedule/z
     !REF: /ompdoschedule/a
     y(i) = z(i-1) + a(i)
   end do
   !$omp end do
 end program ompdoschedule

flang/test/Semantics/OpenMP/omp-do-schedule04.f90

subroutine tds
   !DEF: /tds/k ObjectEntity INTEGER(4)
   integer i,j,k
 
   !REF: /tds/j
   j = 11
   !REF: /tds/k
   k = 12
   !$omp do  schedule(static,j-k)
-  !DEF: /tds/Block1/i (OmpPrivate,OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /tds/OtherConstruct1/i (OmpPrivate,OmpPreDetermined) HostAssoc INTEGER(4)
   do i = 1,10
     !REF: /tds/y
-    !REF: /tds/Block1/i
+    !REF: /tds/OtherConstruct1/i
     !REF: /tds/z
     !REF: /tds/a
     y(i) = z(i-1)+a(i)
   end do
   !$omp end do
 end subroutine tds

flang/test/Semantics/OpenMP/omp-do01-positivecase.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
 ! The loop iteration variable may not appear in a firstprivate directive.
 ! A positive case
 
 !DEF: /omp_do MainProgram
 program omp_do
   !DEF: /omp_do/i ObjectEntity INTEGER(4)
   integer i
 
   !$omp do  firstprivate(k)
-  !DEF: /omp_do/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_do/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     print *, "Hello"
   end do
   !$omp end do
 
 end program omp_do

flang/test/Semantics/OpenMP/omp-do04-positivecase.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Do Loop Constructs
 
 !DEF: /omp_do1 MainProgram
 program omp_do1
   !DEF: /omp_do1/i ObjectEntity INTEGER(4)
   !DEF: /omp_do1/j ObjectEntity INTEGER(4)
   !DEF: /omp_do1/k (OmpThreadprivate) ObjectEntity INTEGER(4)
   !DEF: /omp_do1/n (OmpThreadprivate) ObjectEntity INTEGER(4)
   integer i, j, k, n
   !$omp threadprivate (k,n)
   !$omp do
-  !DEF: /omp_do1/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_do1/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     !REF: /omp_do1/j
     do j=1,10
       print *, "Hello"
     end do
   end do
   !$omp end do
 end program omp_do1

flang/test/Semantics/OpenMP/omp-do05-positivecase.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct restrictions on single directive.
 ! A positive case
 
 !DEF: /omp_do MainProgram
 program omp_do
   !DEF: /omp_do/i ObjectEntity INTEGER(4)
   !DEF: /omp_do/n ObjectEntity INTEGER(4)
   integer i,n
   !$omp parallel
-  !DEF: /omp_do/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_do/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     !$omp single
     print *, "hello"
     !$omp end single
   end do
   !$omp end parallel
 
   !$omp parallel  default(shared)
   !$omp do
-  !DEF: /omp_do/Block2/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_do/OtherConstruct2/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   !REF: /omp_do/n
   do i=1,n
     !$omp parallel
     !$omp single
     !DEF: /work EXTERNAL (Subroutine) ProcEntity
-    !REF: /omp_do/Block2/Block1/i
+    !REF: /omp_do/OtherConstruct2/OtherConstruct1/i
     call work(i, 1)
     !$omp end single
     !$omp end parallel
   end do
   !$omp end do
   !$omp end parallel
 
 end program omp_do

flang/test/Semantics/OpenMP/omp-do06-positivecases.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
 ! The ordered clause must be present on the loop construct if any ordered
 ! region ever binds to a loop region arising from the loop construct.
 
 ! A positive case
 !DEF: /omp_do MainProgram
 program omp_do
   !DEF: /omp_do/i ObjectEntity INTEGER(4)
   !DEF: /omp_do/j ObjectEntity INTEGER(4)
   !DEF: /omp_do/k ObjectEntity INTEGER(4)
   integer i, j, k
   !$omp do  ordered
-    !DEF: /omp_do/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+    !DEF: /omp_do/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     do i=1,10
       !$omp ordered
       !DEF: /my_func EXTERNAL (Subroutine) ProcEntity
       call my_func
       !$omp end ordered
     end do
   !$omp end do
 end program omp_do

flang/test/Semantics/OpenMP/omp-do11.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Do Loop Constructs
 
 !DEF: /omp_do MainProgram
 program omp_do
   !DEF: /omp_do/i ObjectEntity INTEGER(4)
   !DEF: /omp_do/j ObjectEntity INTEGER(4)
   !DEF: /omp_do/k ObjectEntity INTEGER(4)
   integer i, j, k
   !$omp do
-  !DEF: /omp_do/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_do/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     !REF: /omp_do/j
     do j=1,10
-      !REF: /omp_do/Block1/i
+      !REF: /omp_do/OtherConstruct1/i
       !REF: /omp_do/j
       print *, "it", i, j
     end do
   end do
   !$omp end do
 end program omp_do
 
 !DEF: /omp_do2 (Subroutine)Subprogram
 subroutine omp_do2
   !DEF: /omp_do2/i ObjectEntity INTEGER(4)
   !DEF: /omp_do2/k ObjectEntity INTEGER(4)
   integer :: i = 0, k
   !$omp do
-  !DEF: /omp_do2/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_do2/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !REF: /omp_do2/Block1/i
+    !REF: /omp_do2/OtherConstruct1/i
     print *, "it", i
   end do
   !$omp end do
 end subroutine omp_do2

flang/test/Semantics/OpenMP/omp-do12.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Do Loop constructs.
 
 !DEF: /omp_cycle MainProgram
 program omp_cycle
   !$omp do  collapse(1)
-  !DEF: /omp_cycle/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
-    !REF: /omp_cycle/Block1/i
+    !REF: /omp_cycle/OtherConstruct1/i
     if (i<1) cycle
     !DEF: /omp_cycle/j (Implicit) ObjectEntity INTEGER(4)
     do j=0,10
       !DEF: /omp_cycle/k (Implicit) ObjectEntity INTEGER(4)
       do k=0,10
-        !REF: /omp_cycle/Block1/i
+        !REF: /omp_cycle/OtherConstruct1/i
         !REF: /omp_cycle/j
         !REF: /omp_cycle/k
         print *, i, j, k
       end do
     end do
   end do
   !$omp end do
 
   !$omp do  collapse(1)
-  !DEF: /omp_cycle/Block2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OtherConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
     !REF: /omp_cycle/j
     do j=0,10
-      !REF: /omp_cycle/Block2/i
+      !REF: /omp_cycle/OtherConstruct2/i
       if (i<1) cycle
       !REF: /omp_cycle/k
       do k=0,10
-        !REF: /omp_cycle/Block2/i
+        !REF: /omp_cycle/OtherConstruct2/i
         !REF: /omp_cycle/j
         !REF: /omp_cycle/k
         print *, i, j, k
       end do
     end do
   end do
   !$omp end do
 
   !$omp do  collapse(2)
-  !DEF: /omp_cycle/Block3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OtherConstruct3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
-    !DEF: /omp_cycle/Block3/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+    !DEF: /omp_cycle/OtherConstruct3/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     do j=0,10
       !REF: /omp_cycle/k
       do k=0,10
-        !REF: /omp_cycle/Block3/i
+        !REF: /omp_cycle/OtherConstruct3/i
         if (i<1) cycle
-        !REF: /omp_cycle/Block3/i
-        !REF: /omp_cycle/Block3/j
+        !REF: /omp_cycle/OtherConstruct3/i
+        !REF: /omp_cycle/OtherConstruct3/j
         !REF: /omp_cycle/k
         print *, i, j, k
       end do
     end do
   end do
   !$omp end do
 
   !$omp do  collapse(3)
-  !DEF: /omp_cycle/Block4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OtherConstruct4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
-    !DEF: /omp_cycle/Block4/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+    !DEF: /omp_cycle/OtherConstruct4/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     do j=0,10
-      !DEF: /omp_cycle/Block4/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+      !DEF: /omp_cycle/OtherConstruct4/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
       do k=0,10
-        !REF: /omp_cycle/Block4/i
+        !REF: /omp_cycle/OtherConstruct4/i
         if (i<1) cycle
-        !REF: /omp_cycle/Block4/i
-        !REF: /omp_cycle/Block4/j
-        !REF: /omp_cycle/Block4/k
+        !REF: /omp_cycle/OtherConstruct4/i
+        !REF: /omp_cycle/OtherConstruct4/j
+        !REF: /omp_cycle/OtherConstruct4/k
         print *, i, j, k
       end do
     end do
   end do
   !$omp end do
 
   !$omp do  collapse(3)
-  !DEF: /omp_cycle/Block5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OtherConstruct5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   foo:do i=0,10
-    !DEF: /omp_cycle/Block5/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+    !DEF: /omp_cycle/OtherConstruct5/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     foo1:do j=0,10
-      !DEF: /omp_cycle/Block5/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+      !DEF: /omp_cycle/OtherConstruct5/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
       foo2:do k=0,10
-        !REF: /omp_cycle/Block5/i
+        !REF: /omp_cycle/OtherConstruct5/i
         if (i<1) cycle foo2
-        !REF: /omp_cycle/Block5/i
-        !REF: /omp_cycle/Block5/j
-        !REF: /omp_cycle/Block5/k
+        !REF: /omp_cycle/OtherConstruct5/i
+        !REF: /omp_cycle/OtherConstruct5/j
+        !REF: /omp_cycle/OtherConstruct5/k
         print *, i, j, k
       end do foo2
     end do foo1
   end do foo
   !$omp end do
 end program omp_cycle

flang/test/Semantics/OpenMP/omp-do14.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Do Loop constructs.
 
 !DEF: /omp_cycle MainProgram
 program omp_cycle
   !$omp do  collapse(1)
-  !DEF: /omp_cycle/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
     cycle
     !DEF: /omp_cycle/j (Implicit) ObjectEntity INTEGER(4)
     do j=0,10
       !DEF: /omp_cycle/k (Implicit) ObjectEntity INTEGER(4)
       do k=0,10
-        !REF: /omp_cycle/Block1/i
+        !REF: /omp_cycle/OtherConstruct1/i
         !REF: /omp_cycle/j
         !REF: /omp_cycle/k
         print *, i, j, k
       end do
     end do
   end do
   !$omp end do
 
   !$omp do  collapse(1)
-  !DEF: /omp_cycle/Block2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OtherConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
     !REF: /omp_cycle/j
     do j=0,10
       cycle
       !REF: /omp_cycle/k
       do k=0,10
-        !REF: /omp_cycle/Block2/i
+        !REF: /omp_cycle/OtherConstruct2/i
         !REF: /omp_cycle/j
         !REF: /omp_cycle/k
         print *, i, j, k
       end do
     end do
   end do
   !$omp end do
 
   !$omp do  collapse(2)
-  !DEF: /omp_cycle/Block3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OtherConstruct3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
-    !DEF: /omp_cycle/Block3/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+    !DEF: /omp_cycle/OtherConstruct3/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     do j=0,10
       !REF: /omp_cycle/k
       do k=0,10
         cycle
-        !REF: /omp_cycle/Block3/i
-        !REF: /omp_cycle/Block3/j
+        !REF: /omp_cycle/OtherConstruct3/i
+        !REF: /omp_cycle/OtherConstruct3/j
         !REF: /omp_cycle/k
         print *, i, j, k
       end do
     end do
   end do
   !$omp end do
 
   !$omp do  collapse(3)
-  !DEF: /omp_cycle/Block4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OtherConstruct4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
-    !DEF: /omp_cycle/Block4/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+    !DEF: /omp_cycle/OtherConstruct4/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     do j=0,10
-      !DEF: /omp_cycle/Block4/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+      !DEF: /omp_cycle/OtherConstruct4/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
       do k=0,10
         cycle
-        !REF: /omp_cycle/Block4/i
-        !REF: /omp_cycle/Block4/j
-        !REF: /omp_cycle/Block4/k
+        !REF: /omp_cycle/OtherConstruct4/i
+        !REF: /omp_cycle/OtherConstruct4/j
+        !REF: /omp_cycle/OtherConstruct4/k
         print *, i, j, k
       end do
     end do
   end do
   !$omp end do
 
   !$omp do  ordered(3)
-  !DEF: /omp_cycle/Block5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OtherConstruct5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   foo:do i=0,10
-    !DEF: /omp_cycle/Block5/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+    !DEF: /omp_cycle/OtherConstruct5/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     foo1:do j=0,10
-      !DEF: /omp_cycle/Block5/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+      !DEF: /omp_cycle/OtherConstruct5/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
       foo2:do k=0,10
         cycle foo2
-        !REF: /omp_cycle/Block5/i
-        !REF: /omp_cycle/Block5/j
-        !REF: /omp_cycle/Block5/k
+        !REF: /omp_cycle/OtherConstruct5/i
+        !REF: /omp_cycle/OtherConstruct5/j
+        !REF: /omp_cycle/OtherConstruct5/k
         print *, i, j, k
       end do foo2
     end do foo1
   end do foo
   !$omp end do
 end program omp_cycle

flang/test/Semantics/OpenMP/omp-do17.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Do Loop constructs.
 
 !DEF: /test MainProgram
 program test
  !DEF: /test/i ObjectEntity INTEGER(4)
  !DEF: /test/j ObjectEntity INTEGER(4)
  !DEF: /test/k ObjectEntity INTEGER(4)
  integer i, j, k
  !$omp do  collapse(2)
- !DEF: /test/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /test/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  foo: do i=0,10
-  !DEF: /test/Block1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /test/OtherConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   foo1: do j=0,10
    !REF: /test/k
    foo2: do k=0,10
-    !REF: /test/Block1/i
+    !REF: /test/OtherConstruct1/i
     select case (i)
     case (5)
      cycle foo1
     case (7)
      cycle foo2
     end select
-    !REF: /test/Block1/i
-    !REF: /test/Block1/j
+    !REF: /test/OtherConstruct1/i
+    !REF: /test/OtherConstruct1/j
     !REF: /test/k
     print *, i, j, k
    end do foo2
   end do foo1
  end do foo
 
  !$omp do  collapse(2)
- !DEF: /test/Block2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /test/OtherConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  foo: do i=0,10
-  !DEF: /test/Block2/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /test/OtherConstruct2/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   foo1: do j=0,10
    !REF: /test/k
    foo2: do k=0,10
-    !REF: /test/Block2/i
+    !REF: /test/OtherConstruct2/i
     if (i<3) then
      cycle foo1
-     !REF: /test/Block2/i
+     !REF: /test/OtherConstruct2/i
     else if (i>8) then
      cycle foo1
     else
      cycle foo2
     end if
-    !REF: /test/Block2/i
-    !REF: /test/Block2/j
+    !REF: /test/OtherConstruct2/i
+    !REF: /test/OtherConstruct2/j
     !REF: /test/k
     print *, i, j, k
    end do foo2
   end do foo1
  end do foo
 !$omp end do
 end program test

flang/test/Semantics/OpenMP/omp-reduction08.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.6 Reduction Clause Positive cases
 
 !DEF: /omp_reduction MainProgram
 program omp_reduction
   !DEF: /omp_reduction/i ObjectEntity INTEGER(4)
   integer i
   !DEF: /omp_reduction/k ObjectEntity INTEGER(4)
   integer :: k = 10
   !DEF: /omp_reduction/m ObjectEntity INTEGER(4)
   integer :: m = 12
   !$omp parallel do  reduction(max:k)
-  !DEF: /omp_reduction/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/Block1/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OtherConstruct1/k (OmpReduction) HostAssoc INTEGER(4)
     !DEF: /omp_reduction/max ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity
     !REF: /omp_reduction/m
     k = max(k, m)
   end do
   !$omp end parallel do
 
   !$omp parallel do  reduction(min:k)
-  !DEF: /omp_reduction/Block2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OtherConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/Block2/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OtherConstruct2/k (OmpReduction) HostAssoc INTEGER(4)
     !DEF: /omp_reduction/min ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity
     !REF: /omp_reduction/m
     k = min(k, m)
   end do
   !$omp end parallel do
 
   !$omp parallel do  reduction(iand:k)
-  !DEF: /omp_reduction/Block3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OtherConstruct3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/Block3/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OtherConstruct3/k (OmpReduction) HostAssoc INTEGER(4)
     !DEF: /omp_reduction/iand ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity
     !REF: /omp_reduction/m
     k = iand(k, m)
   end do
   !$omp end parallel do
 
   !$omp parallel do  reduction(ior:k)
-  !DEF: /omp_reduction/Block4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OtherConstruct4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/Block4/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OtherConstruct4/k (OmpReduction) HostAssoc INTEGER(4)
     !DEF: /omp_reduction/ior ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity
     !REF: /omp_reduction/m
     k = ior(k, m)
   end do
   !$omp end parallel do
 
   !$omp parallel do  reduction(ieor:k)
-  !DEF: /omp_reduction/Block5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OtherConstruct5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/Block5/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OtherConstruct5/k (OmpReduction) HostAssoc INTEGER(4)
     !DEF: /omp_reduction/ieor ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity
     !REF: /omp_reduction/m
     k = ieor(k,m)
   end do
   !$omp end parallel do
 
 end program omp_reduction

flang/test/Semantics/OpenMP/omp-reduction09.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.6 Reduction Clause Positive cases.
 !DEF: /omp_reduction MainProgram
 program omp_reduction
   !DEF: /omp_reduction/i ObjectEntity INTEGER(4)
   integer i
   !DEF: /omp_reduction/k ObjectEntity INTEGER(4)
   integer :: k = 10
   !DEF: /omp_reduction/a ObjectEntity INTEGER(4)
   integer a(10)
   !DEF: /omp_reduction/b ObjectEntity INTEGER(4)
   integer b(10,10,10)
 
   !$omp parallel  shared(k)
   !$omp do  reduction(+:k)
-  !DEF: /omp_reduction/Block1/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OtherConstruct1/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/Block1/Block1/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OtherConstruct1/OtherConstruct1/k (OmpReduction) HostAssoc INTEGER(4)
     k = k+1
   end do
   !$omp end do
   !$omp end parallel
 
 
   !$omp parallel do  reduction(+:a(10))
-  !DEF: /omp_reduction/Block2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OtherConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     !REF: /omp_reduction/k
     k = k+1
   end do
   !$omp end parallel do
 
 
   !$omp parallel do  reduction(+:a(1:10:1))
-  !DEF: /omp_reduction/Block3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OtherConstruct3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     !REF: /omp_reduction/k
     k = k+1
   end do
   !$omp end parallel do
 
   !$omp parallel do  reduction(+:b(1:10:1,1:5,2))
-  !DEF: /omp_reduction/Block4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OtherConstruct4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     !REF: /omp_reduction/k
     k = k+1
   end do
   !$omp end parallel do
 
   !$omp parallel do  reduction(+:b(1:10:1,1:5,2:5:1))
-  !DEF: /omp_reduction/Block5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OtherConstruct5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     !REF: /omp_reduction/k
     k = k+1
   end do
   !$omp end parallel do
 
   !$omp parallel  private(i)
   !$omp do reduction(+:k) reduction(+:j)
-  !DEF: /omp_reduction/Block6/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OtherConstruct6/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/Block6/Block1/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OtherConstruct6/OtherConstruct1/k (OmpReduction) HostAssoc INTEGER(4)
     k = k+1
   end do
   !$omp end do
   !$omp end parallel
 
   !$omp do reduction(-:k) reduction(*:j) reduction(-:l)
-  !DEF: /omp_reduction/Block7/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OtherConstruct7/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/Block7/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OtherConstruct7/k (OmpReduction) HostAssoc INTEGER(4)
     k = k+1
   end do
   !$omp end do
 
 
   !$omp do reduction(.and.:k) reduction(.or.:j) reduction(.eqv.:l)
-  !DEF: /omp_reduction/Block8/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OtherConstruct8/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/Block8/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OtherConstruct8/k (OmpReduction) HostAssoc INTEGER(4)
     k = k+1
   end do
   !$omp end do
 
 end program omp_reduction

flang/test/Semantics/OpenMP/omp-symbol01.f90

  t%b = 1
  !REF: /mm/b
  b = 2
  !DEF: /mm/a (Implicit) ObjectEntity REAL(4)
  a = 1.0
  !DEF: /mm/c (Implicit) ObjectEntity REAL(4)
  c = 2.0
 !$omp parallel do  private(a,t,/c/) shared(c)
- !DEF: /mm/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /mm/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  do i=1,10
-  !DEF: /mm/Block1/a (OmpPrivate) HostAssoc REAL(4)
+  !DEF: /mm/OtherConstruct1/a (OmpPrivate) HostAssoc REAL(4)
   !REF: /mm/b
-  !REF: /mm/Block1/i
+  !REF: /mm/OtherConstruct1/i
   a = a+b(i)
-  !DEF: /mm/Block1/t (OmpPrivate) HostAssoc TYPE(myty)
+  !DEF: /mm/OtherConstruct1/t (OmpPrivate) HostAssoc TYPE(myty)
   !REF: /md/myty/a
-  !REF: /mm/Block1/i
+  !REF: /mm/OtherConstruct1/i
   t%a = i
-  !DEF: /mm/Block1/y (OmpPrivate) HostAssoc REAL(4)
+  !DEF: /mm/OtherConstruct1/y (OmpPrivate) HostAssoc REAL(4)
   y = 0.
-  !DEF: /mm/Block1/x (OmpPrivate) HostAssoc REAL(4)
-  !REF: /mm/Block1/a
-  !REF: /mm/Block1/i
-  !REF: /mm/Block1/y
+  !DEF: /mm/OtherConstruct1/x (OmpPrivate) HostAssoc REAL(4)
+  !REF: /mm/OtherConstruct1/a
+  !REF: /mm/OtherConstruct1/i
+  !REF: /mm/OtherConstruct1/y
   x = a+i+y
   !REF: /mm/c
   c = 3.0
  end do
 end program

flang/test/Semantics/OpenMP/omp-symbol02.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 
 ! 1.4.1 Structure of the OpenMP Memory Model
 
 ! Test implicit declaration in the OpenMP directive enclosing scope
 ! through clause; also test to avoid creating multiple symbols for
 ! the same variable
 
   !DEF: /MainProgram1/b (Implicit) ObjectEntity REAL(4)
   b = 2
   !DEF: /MainProgram1/c (Implicit) ObjectEntity REAL(4)
   c = 0
   !$omp parallel  private(a,b) shared(c,d)
-  !DEF: /MainProgram1/Block1/a (OmpPrivate) HostAssoc REAL(4)
+  !DEF: /MainProgram1/OtherConstruct1/a (OmpPrivate) HostAssoc REAL(4)
   a = 3.
-  !DEF: /MainProgram1/Block1/b (OmpPrivate) HostAssoc REAL(4)
+  !DEF: /MainProgram1/OtherConstruct1/b (OmpPrivate) HostAssoc REAL(4)
   b = 4
   !REF: /MainProgram1/c
   c = 5
   !DEF: /MainProgram1/d (Implicit) ObjectEntity REAL(4)
   d = 6
   !$omp end parallel
   !DEF: /MainProgram1/a (Implicit) ObjectEntity REAL(4)
   print *, a
 end program

flang/test/Semantics/OpenMP/omp-symbol03.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 
 ! 1.4.1 Structure of the OpenMP Memory Model
 ! In the inner OpenMP region, SHARED `a` refers to the `a` in the outer OpenMP
 ! region; PRIVATE `b` refers to the new `b` in the same OpenMP region
 
   !DEF: /MainProgram1/b (Implicit) ObjectEntity REAL(4)
   b = 2
   !$omp parallel  private(a) shared(b)
-  !DEF: /MainProgram1/Block1/a (OmpPrivate) HostAssoc REAL(4)
+  !DEF: /MainProgram1/OtherConstruct1/a (OmpPrivate) HostAssoc REAL(4)
   a = 3.
   !REF: /MainProgram1/b
   b = 4
   !$omp parallel  private(b) shared(a)
-  !REF: /MainProgram1/Block1/a
+  !REF: /MainProgram1/OtherConstruct1/a
   a = 5.
-  !DEF: /MainProgram1/Block1/Block1/b (OmpPrivate) HostAssoc REAL(4)
+  !DEF: /MainProgram1/OtherConstruct1/OtherConstruct1/b (OmpPrivate) HostAssoc REAL(4)
   b = 6
   !$omp end parallel
   !$omp end parallel
   !DEF: /MainProgram1/a (Implicit) ObjectEntity REAL(4)
   !REF: /MainProgram1/b
   print *, a, b
 end program

flang/test/Semantics/OpenMP/omp-symbol04.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 
 ! 2.15.3 Data-Sharing Attribute Clauses
 ! Both PARALLEL and DO (worksharing) directives need to create new scope,
 ! so PRIVATE `a` will have new symbol in each region
 
   !DEF: /MainProgram1/a ObjectEntity REAL(8)
   real*8 a
   !REF: /MainProgram1/a
   a = 3.14
   !$omp parallel  private(a)
-  !DEF: /MainProgram1/Block1/a (OmpPrivate) HostAssoc REAL(8)
+  !DEF: /MainProgram1/OtherConstruct1/a (OmpPrivate) HostAssoc REAL(8)
   a = 2.
   !$omp do  private(a)
-  !DEF: /MainProgram1/Block1/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /MainProgram1/OtherConstruct1/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-     !DEF: /MainProgram1/Block1/Block1/a (OmpPrivate) HostAssoc REAL(8)
+     !DEF: /MainProgram1/OtherConstruct1/OtherConstruct1/a (OmpPrivate) HostAssoc REAL(8)
      a = 1.
   end do
   !$omp end parallel
   !REF: /MainProgram1/a
   print *, a
 end program

flang/test/Semantics/OpenMP/omp-symbol05.f90

subroutine foo
     a = 1
     !DEF: /mm/i PUBLIC (Implicit, OmpThreadprivate) ObjectEntity INTEGER(4)
     !REF: /mm/foo/a
     i = a
     !$omp end parallel
     !REF: /mm/foo/a
     print *, a
     block
-      !DEF: /mm/foo/Block2/i ObjectEntity REAL(4)
+      !DEF: /mm/foo/BlockConstruct1/i ObjectEntity REAL(4)
       real i
-      !REF: /mm/foo/Block2/i
+      !REF: /mm/foo/BlockConstruct1/i
       i = 3.14
     end block
   end subroutine foo
 end module mm
 !DEF: /tt MainProgram
 program tt
   !REF: /mm
   use :: mm
   !DEF: /tt/foo (Subroutine) Use
   call foo
 end program tt

flang/test/Semantics/OpenMP/omp-symbol06.f90

 ! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 
 ! 2.15.3 Data-Sharing Attribute Clauses
 ! A list item that specifies a given variable may not appear in more than
 ! one clause on the same directive, except that a variable may be specified
 ! in both firstprivate and lastprivate clauses.
 
   !DEF: /MainProgram1/a (Implicit) ObjectEntity REAL(4)
   a = 1.
   !$omp parallel do  firstprivate(a) lastprivate(a)
-  !DEF: /MainProgram1/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /MainProgram1/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-     !DEF: /MainProgram1/Block1/a (OmpFirstPrivate, OmpLastPrivate) HostAssoc REAL(4)
+     !DEF: /MainProgram1/OtherConstruct1/a (OmpFirstPrivate, OmpLastPrivate) HostAssoc REAL(4)
      a = 2.
   end do
 end program

flang/test/Semantics/OpenMP/omp-symbol07.f90

subroutine function_call_in_region
   implicit none
   !DEF: /function_call_in_region/foo (Function) ProcEntity REAL(4)
   real foo
   !DEF: /function_call_in_region/a ObjectEntity REAL(4)
   real :: a = 0.
   !DEF: /function_call_in_region/b ObjectEntity REAL(4)
   real :: b = 5.
   !$omp parallel  default(none) private(a) shared(b)
-  !DEF: /function_call_in_region/Block1/a (OmpPrivate) HostAssoc REAL(4)
+  !DEF: /function_call_in_region/OtherConstruct1/a (OmpPrivate) HostAssoc REAL(4)
   !REF: /function_call_in_region/foo
   !REF: /function_call_in_region/b
   a = foo(b)
   !$omp end parallel
   !REF: /function_call_in_region/a
   !REF: /function_call_in_region/b
   print *, a, b
 end subroutine function_call_in_region
 !DEF: /mm MainProgram
 program mm
   !REF: /function_call_in_region
   call function_call_in_region
 end program mm

flang/test/Semantics/OpenMP/omp-symbol08.f90

  !DEF: /test_do/i ObjectEntity INTEGER(4)
  !DEF: /test_do/j ObjectEntity INTEGER(4)
  !DEF: /test_do/k ObjectEntity INTEGER(4)
  integer i, j, k
 !$omp parallel
  !REF: /test_do/i
  i = 99
 !$omp do  collapse(2)
- !DEF: /test_do/Block1/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /test_do/OtherConstruct1/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  do i=1,5
-  !DEF: /test_do/Block1/Block1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /test_do/OtherConstruct1/OtherConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do j=6,10
    !REF: /test_do/a
    a(1,1,1) = 0.
-   !DEF: /test_do/Block1/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+   !DEF: /test_do/OtherConstruct1/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
    do k=11,15
     !REF: /test_do/a
-    !REF: /test_do/Block1/k
-    !REF: /test_do/Block1/Block1/j
-    !REF: /test_do/Block1/Block1/i
+    !REF: /test_do/OtherConstruct1/k
+    !REF: /test_do/OtherConstruct1/OtherConstruct1/j
+    !REF: /test_do/OtherConstruct1/OtherConstruct1/i
     a(k,j,i) = 1.
    end do
   end do
  end do
 !$omp end parallel
 end subroutine test_do
 
 ! Rule a)
 !DEF: /test_pardo (Subroutine) Subprogram
 subroutine test_pardo
  implicit none
  !DEF: /test_pardo/a ObjectEntity REAL(4)
  real a(20,20,20)
  !DEF: /test_pardo/i ObjectEntity INTEGER(4)
  !DEF: /test_pardo/j ObjectEntity INTEGER(4)
  !DEF: /test_pardo/k ObjectEntity INTEGER(4)
  integer i, j, k
 !$omp parallel do  collapse(2) private(k) ordered(2)
- !DEF: /test_pardo/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /test_pardo/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  do i=1,5
-   !DEF: /test_pardo/Block1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+   !DEF: /test_pardo/OtherConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     do j=6,10
    !REF: /test_pardo/a
    a(1,1,1) = 0.
-   !DEF: /test_pardo/Block1/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+   !DEF: /test_pardo/OtherConstruct1/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
    do k=11,15
     !REF: /test_pardo/a
-    !REF: /test_pardo/Block1/k
-    !REF: /test_pardo/Block1/j
-    !REF: /test_pardo/Block1/i
+    !REF: /test_pardo/OtherConstruct1/k
+    !REF: /test_pardo/OtherConstruct1/j
+    !REF: /test_pardo/OtherConstruct1/i
     a(k,j,i) = 1.
    end do
   end do
  end do
 end subroutine test_pardo
 
 ! Rule a)
 !DEF: /test_taskloop (Subroutine) Subprogram
 subroutine test_taskloop
  implicit none
  !DEF: /test_taskloop/a ObjectEntity REAL(4)
  real a(5,5)
  !DEF: /test_taskloop/i ObjectEntity INTEGER(4)
  !DEF: /test_taskloop/j ObjectEntity INTEGER(4)
  integer i, j
 !$omp taskloop  private(j)
- !DEF: /test_taskloop/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /test_taskloop/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  do i=1,5
-  !DEF: /test_taskloop/Block1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
-  !REF: /test_taskloop/Block1/i
+  !DEF: /test_taskloop/OtherConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !REF: /test_taskloop/OtherConstruct1/i
   do j=1,i
    !REF: /test_taskloop/a
-   !REF: /test_taskloop/Block1/j
-   !REF: /test_taskloop/Block1/i
+   !REF: /test_taskloop/OtherConstruct1/j
+   !REF: /test_taskloop/OtherConstruct1/i
    a(j,i) = 3.14
   end do
  end do
 !$omp end taskloop
 end subroutine test_taskloop
 
 ! Rule a); OpenMP 4.5 Examples teams.2.f90
 ! TODO: reduction; data-mapping attributes

  !DEF: /dotprod/i ObjectEntity INTEGER(4)
  !DEF: /dotprod/i0 ObjectEntity INTEGER(4)
  integer block_size, num_teams, block_threads, i, i0
  !REF: /dotprod/sum
  sum = 0.0e0
 !$omp target  map(to:b,c)  map(tofrom:sum)
 !$omp teams  num_teams(num_teams) thread_limit(block_threads) reduction(+:sum)
 !$omp distribute
- !DEF: /dotprod/Block1/Block1/Block1/i0 (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /dotprod/OtherConstruct1/OtherConstruct1/OtherConstruct1/i0 (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  !REF: /dotprod/n
  !REF: /dotprod/block_size
  do i0=1,n,block_size
 !$omp parallel do  reduction(+:sum)
-  !DEF: /dotprod/Block1/Block1/Block1/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
-  !REF: /dotprod/Block1/Block1/Block1/i0
+  !DEF: /dotprod/OtherConstruct1/OtherConstruct1/OtherConstruct1/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !REF: /dotprod/OtherConstruct1/OtherConstruct1/OtherConstruct1/i0
   !DEF: /dotprod/min ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity
   !REF: /dotprod/block_size
   !REF: /dotprod/n
   do i=i0,min(i0+block_size, n)
-   !DEF: /dotprod/Block1/Block1/Block1/Block1/sum (OmpReduction) HostAssoc REAL(4)
+   !DEF: /dotprod/OtherConstruct1/OtherConstruct1/OtherConstruct1/OtherConstruct1/sum (OmpReduction) HostAssoc REAL(4)
    !REF: /dotprod/b
-   !REF: /dotprod/Block1/Block1/Block1/Block1/i
+   !REF: /dotprod/OtherConstruct1/OtherConstruct1/OtherConstruct1/OtherConstruct1/i
    !REF: /dotprod/c
    sum = sum+b(i)*c(i)
   end do
  end do
 !$omp end teams
 !$omp end target
  !REF: /dotprod/sum
  print *, sum
 end subroutine dotprod
 
 ! Rule b)
 ! TODO: nested constructs (j, k should be private too)
 !DEF: /test_simd (Subroutine) Subprogram
 subroutine test_simd
  implicit none
  !DEF: /test_simd/a ObjectEntity REAL(4)
  real a(20,20,20)
  !DEF: /test_simd/i ObjectEntity INTEGER(4)
  !DEF: /test_simd/j ObjectEntity INTEGER(4)
  !DEF: /test_simd/k ObjectEntity INTEGER(4)
  integer i, j, k
 !$omp parallel do simd
- !DEF: /test_simd/Block1/i (OmpLinear, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /test_simd/OtherConstruct1/i (OmpLinear, OmpPreDetermined) HostAssoc INTEGER(4)
  do i=1,5
-  !DEF: /test_simd/Block1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /test_simd/OtherConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do j=6,10
-   !DEF: /test_simd/Block1/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+   !DEF: /test_simd/OtherConstruct1/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
    do k=11,15
     !REF: /test_simd/a
-    !REF: /test_simd/Block1/k
-    !REF: /test_simd/Block1/j
-    !REF: /test_simd/Block1/i
+    !REF: /test_simd/OtherConstruct1/k
+    !REF: /test_simd/OtherConstruct1/j
+    !REF: /test_simd/OtherConstruct1/i
     a(k,j,i) = 3.14
    end do
   end do
  end do
 end subroutine test_simd
 
 ! Rule c)
 !DEF: /test_simd_multi (Subroutine) Subprogram
 subroutine test_simd_multi
  implicit none
  !DEF: /test_simd_multi/a ObjectEntity REAL(4)
  real a(20,20,20)
  !DEF: /test_simd_multi/i ObjectEntity INTEGER(4)
  !DEF: /test_simd_multi/j ObjectEntity INTEGER(4)
  !DEF: /test_simd_multi/k ObjectEntity INTEGER(4)
  integer i, j, k
 !$omp parallel do simd  collapse(3)
- !DEF: /test_simd_multi/Block1/i (OmpLastPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /test_simd_multi/OtherConstruct1/i (OmpLastPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  do i=1,5
-  !DEF: /test_simd_multi/Block1/j (OmpLastPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /test_simd_multi/OtherConstruct1/j (OmpLastPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do j=6,10
-   !DEF: /test_simd_multi/Block1/k (OmpLastPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+   !DEF: /test_simd_multi/OtherConstruct1/k (OmpLastPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
    do k=11,15
     !REF: /test_simd_multi/a
-    !REF: /test_simd_multi/Block1/k
-    !REF: /test_simd_multi/Block1/j
-    !REF: /test_simd_multi/Block1/i
+    !REF: /test_simd_multi/OtherConstruct1/k
+    !REF: /test_simd_multi/OtherConstruct1/j
+    !REF: /test_simd_multi/OtherConstruct1/i
     a(k,j,i) = 3.14
    end do
   end do
  end do
 end subroutine test_simd_multi
 
 ! Rule d)
 !DEF: /test_seq_loop (Subroutine) Subprogram
 subroutine test_seq_loop
   implicit none
   !DEF: /test_seq_loop/i ObjectEntity INTEGER(4)
   !DEF: /test_seq_loop/j ObjectEntity INTEGER(4)
   integer i, j
   !REF: /test_seq_loop/i
   i = -1
   !REF: /test_seq_loop/j
   j = -1
   !$omp parallel
   !REF: /test_seq_loop/i
   !REF: /test_seq_loop/j
   print *, i, j
   !$omp parallel
   !REF: /test_seq_loop/i
-  !DEF: /test_seq_loop/Block1/Block1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /test_seq_loop/OtherConstruct1/OtherConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   print *, i, j
   !$omp do
-  !DEF: /test_seq_loop/Block1/Block1/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /test_seq_loop/OtherConstruct1/OtherConstruct1/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-   !REF: /test_seq_loop/Block1/Block1/j
+   !REF: /test_seq_loop/OtherConstruct1/OtherConstruct1/j
    do j=1,10
    end do
   end do
   !REF: /test_seq_loop/i
-  !REF: /test_seq_loop/Block1/Block1/j
+  !REF: /test_seq_loop/OtherConstruct1/OtherConstruct1/j
   print *, i, j
   !$omp end parallel
   !REF: /test_seq_loop/i
   !REF: /test_seq_loop/j
   print *, i, j
   !$omp end parallel
   !REF: /test_seq_loop/i
   !REF: /test_seq_loop/j
   print *, i, j
 end subroutine test_seq_loop

flang/test/Semantics/data16.f90

 ! RUN: %python %S/test_errors.py %s %flang_fc1
-! Ensure that implicit declarations work in DATA statements
-! appearing in specification parts of inner procedures; they
-! should not elicit diagnostics about initialization of host
-! associated objects.
 program main
  contains
   subroutine subr
     data foo/6.66/ ! implicit declaration of "foo": ok
+    integer m
     !ERROR: Implicitly typed local entity 'n' not allowed in specification expression
     real a(n)
     !ERROR: Host-associated object 'n' must not be initialized in a DATA statement
     data n/123/
+    block
+      real b(m)
+      !ERROR: Host-associated object 'm' must not be initialized in a DATA statement
+      data m/10/
+    end block
   end subroutine
 end program

flang/test/Semantics/symbol05.f90

 ! RUN: %python %S/test_symbols.py %s %flang_fc1
 ! Explicit and implicit entities in blocks
 
 !DEF: /s1 (Subroutine) Subprogram
 subroutine s1
  !DEF: /s1/x ObjectEntity INTEGER(4)
  integer x
  block
-  !DEF: /s1/Block1/y ObjectEntity INTEGER(4)
+  !DEF: /s1/BlockConstruct1/y ObjectEntity INTEGER(4)
   integer y
   !REF: /s1/x
   x = 1
-  !REF: /s1/Block1/y
+  !REF: /s1/BlockConstruct1/y
   y = 2.0
  end block
  block
-  !DEF: /s1/Block2/y ObjectEntity REAL(4)
+  !DEF: /s1/BlockConstruct2/y ObjectEntity REAL(4)
   real y
-  !REF: /s1/Block2/y
+  !REF: /s1/BlockConstruct2/y
   y = 3.0
  end block
 end subroutine
 
 !DEF: /s2 (Subroutine) Subprogram
 subroutine s2
  implicit integer(w-x)
  block

  end subroutine
 end subroutine
 
 !DEF: /s3 (Subroutine) Subprogram
 subroutine s3
  !DEF: /s3/j ObjectEntity INTEGER(8)
  integer(kind=8) j
  block
-  !DEF: /s3/Block1/t DerivedType
+  !DEF: /s3/BlockConstruct1/t DerivedType
   type :: t
-   !DEF: /s3/Block1/t/x ObjectEntity REAL(4)
-   !DEF: /s3/Block1/t/ImpliedDos1/i (Implicit) ObjectEntity INTEGER(4)
+   !DEF: /s3/BlockConstruct1/t/x ObjectEntity REAL(4)
+   !DEF: /s3/BlockConstruct1/t/ImpliedDos1/i (Implicit) ObjectEntity INTEGER(4)
    real :: x(10) = [(i, i=1,10)]
-   !DEF: /s3/Block1/t/y ObjectEntity REAL(4)
-   !DEF: /s3/Block1/t/ImpliedDos2/j ObjectEntity INTEGER(8)
+   !DEF: /s3/BlockConstruct1/t/y ObjectEntity REAL(4)
+   !DEF: /s3/BlockConstruct1/t/ImpliedDos2/j ObjectEntity INTEGER(8)
    real :: y(10) = [(j, j=1,10)]
   end type
  end block
 end subroutine
 
 !DEF: /s4 (Subroutine) Subprogram
 subroutine s4
  implicit integer(x)
  interface
   !DEF: /s4/s EXTERNAL (Subroutine) Subprogram
   !DEF: /s4/s/x (Implicit) ObjectEntity REAL(4)
   !DEF: /s4/s/y (Implicit) ObjectEntity INTEGER(4)
   subroutine s (x, y)
    implicit integer(y)
   end subroutine
  end interface
 end subroutine
 
 !DEF: /s5 (Subroutine) Subprogram
 subroutine s5
  block
-  !DEF: /s5/Block1/x (Implicit) ObjectEntity REAL(4)
+  !DEF: /s5/BlockConstruct1/x (Implicit) ObjectEntity REAL(4)
   dimension :: x(2)
   block
-   !DEF: /s5/Block1/Block1/x (Implicit) ObjectEntity REAL(4)
+   !DEF: /s5/BlockConstruct1/BlockConstruct1/x (Implicit) ObjectEntity REAL(4)
    dimension :: x(3)
   end block
  end block
  !DEF: /s5/x (Implicit) ObjectEntity REAL(4)
  x = 1.0
 end subroutine
 
 !DEF: /s6 (Subroutine) Subprogram
 subroutine s6
   !DEF: /s6/i ObjectEntity INTEGER(4)
   !DEF: /s6/j ObjectEntity INTEGER(4)
   !DEF: /s6/k ObjectEntity INTEGER(4)
   integer i, j, k
   block
-    !DEF: /s6/Block1/i ASYNCHRONOUS, VOLATILE HostAssoc INTEGER(4)
+    !DEF: /s6/BlockConstruct1/i ASYNCHRONOUS, VOLATILE HostAssoc INTEGER(4)
     volatile :: i
-    !DEF: /s6/Block1/j ASYNCHRONOUS HostAssoc INTEGER(4)
+    !DEF: /s6/BlockConstruct1/j ASYNCHRONOUS HostAssoc INTEGER(4)
     asynchronous :: j
-    !REF: /s6/Block1/i
+    !REF: /s6/BlockConstruct1/i
     asynchronous :: i
-    !DEF: /s6/Block1/k TARGET (Implicit) ObjectEntity INTEGER(4)
+    !DEF: /s6/BlockConstruct1/k TARGET (Implicit) ObjectEntity INTEGER(4)
     target :: k
   end block
 end subroutine
 
 !DEF: /m7 Module
 module m7
   !DEF: /m7/i PUBLIC ObjectEntity INTEGER(4)
   !DEF: /m7/j PUBLIC ObjectEntity INTEGER(4)

flang/test/Semantics/symbol09.f90

 end subroutine
 
 !DEF: /s2 (Subroutine) Subprogram
 subroutine s2
  !DEF: /s2/a ObjectEntity REAL(4)
  real a(10)
  !DEF: /s2/i ObjectEntity INTEGER(4)
  integer i
- !DEF: /s2/Block1/i ObjectEntity INTEGER(4)
+ !DEF: /s2/OtherConstruct1/i ObjectEntity INTEGER(4)
  do concurrent(i=1:10)
   !REF: /s2/a
-  !REF: /s2/Block1/i
+  !REF: /s2/OtherConstruct1/i
   a(i) = i
  end do
  !REF: /s2/i
  do i=1,10
   !REF: /s2/a
   !REF: /s2/i
   a(i) = i
  end do

 end subroutine
 
 !DEF: /s6 (Subroutine) Subprogram
 subroutine s6
  !DEF: /s6/j ObjectEntity INTEGER(8)
  integer(kind=8) j
  !DEF: /s6/a ObjectEntity INTEGER(4)
  integer :: a(5) = 1
- !DEF: /s6/Block1/i ObjectEntity INTEGER(4)
- !DEF: /s6/Block1/j (LocalityLocal) HostAssoc INTEGER(8)
- !DEF: /s6/Block1/k (Implicit, LocalityLocalInit) HostAssoc INTEGER(4)
-  !DEF: /s6/Block1/a (LocalityShared) HostAssoc INTEGER(4)
+ !DEF: /s6/OtherConstruct1/i ObjectEntity INTEGER(4)
+ !DEF: /s6/OtherConstruct1/j (LocalityLocal) HostAssoc INTEGER(8)
+ !DEF: /s6/OtherConstruct1/k (Implicit, LocalityLocalInit) HostAssoc INTEGER(4)
+  !DEF: /s6/OtherConstruct1/a (LocalityShared) HostAssoc INTEGER(4)
  do concurrent(integer::i=1:5)local(j)local_init(k)shared(a)
-  !REF: /s6/Block1/a
-  !REF: /s6/Block1/i
-  !REF: /s6/Block1/j
+  !REF: /s6/OtherConstruct1/a
+  !REF: /s6/OtherConstruct1/i
+  !REF: /s6/OtherConstruct1/j
   a(i) = j+1
  end do
 end subroutine
 
 !DEF: /s7 (Subroutine) Subprogram
 subroutine s7
  !DEF: /s7/one PARAMETER ObjectEntity REAL(4)
  real, parameter :: one = 1.0

flang/test/Semantics/symbol11.f90

 ! RUN: %python %S/test_symbols.py %s %flang_fc1
 !DEF: /s1 (Subroutine) Subprogram
 subroutine s1
  implicit none
  !DEF: /s1/x ObjectEntity REAL(8)
  real(kind=8) :: x = 2.0
  !DEF: /s1/a ObjectEntity INTEGER(4)
  integer a
  !DEF: /s1/t DerivedType
  type :: t
  end type
  !REF: /s1/t
  !DEF: /s1/z ALLOCATABLE ObjectEntity CLASS(t)
  class(t), allocatable :: z
- !DEF: /s1/Block1/a AssocEntity REAL(8)
+ !DEF: /s1/OtherConstruct1/a AssocEntity REAL(8)
  !REF: /s1/x
- !DEF: /s1/Block1/b AssocEntity REAL(8)
- !DEF: /s1/Block1/c AssocEntity CLASS(t)
+ !DEF: /s1/OtherConstruct1/b AssocEntity REAL(8)
+ !DEF: /s1/OtherConstruct1/c AssocEntity CLASS(t)
  !REF: /s1/z
  associate (a => x, b => x+1, c => z)
   !REF: /s1/x
-  !REF: /s1/Block1/a
+  !REF: /s1/OtherConstruct1/a
   x = a
  end associate
 end subroutine
 
 !DEF: /s2 (Subroutine) Subprogram
 subroutine s2
  !DEF: /s2/x ObjectEntity CHARACTER(4_4,1)
  !DEF: /s2/y ObjectEntity CHARACTER(4_4,1)
  character(len=4) x, y
- !DEF: /s2/Block1/z AssocEntity CHARACTER(4_8,1)
+ !DEF: /s2/OtherConstruct1/z AssocEntity CHARACTER(4_8,1)
  !REF: /s2/x
  associate (z => x)
-  !REF: /s2/Block1/z
+  !REF: /s2/OtherConstruct1/z
   print *, "z:", z
  end associate
  !TODO: need correct length for z
- !DEF: /s2/Block2/z AssocEntity CHARACTER(8_8,1)
+ !DEF: /s2/OtherConstruct2/z AssocEntity CHARACTER(8_8,1)
  !REF: /s2/x
  !REF: /s2/y
  associate (z => x//y)
-  !REF: /s2/Block2/z
+  !REF: /s2/OtherConstruct2/z
   print *, "z:", z
  end associate
 end subroutine
 
 !DEF: /s3 (Subroutine) Subprogram
 subroutine s3
  !DEF: /s3/t1 DerivedType
  type :: t1

  !REF: /s3/t1
  !DEF: /s3/x POINTER ObjectEntity CLASS(t1)
  class(t1), pointer :: x
  !REF: /s3/x
  select type (y => x)
   !REF: /s3/t2
   class is (t2)
    !REF: /s3/i
-   !DEF: /s3/Block1/y TARGET AssocEntity TYPE(t2)
+   !DEF: /s3/OtherConstruct1/y TARGET AssocEntity TYPE(t2)
    !REF: /s3/t2/a2
    i = y%a2
   !REF: /s3/t1
   type is (t1)
    !REF: /s3/i
-   !DEF: /s3/Block2/y TARGET AssocEntity TYPE(t1)
+   !DEF: /s3/OtherConstruct2/y TARGET AssocEntity TYPE(t1)
    !REF: /s3/t1/a1
    i = y%a1
   class default
-   !DEF: /s3/Block3/y TARGET AssocEntity CLASS(t1)
+   !DEF: /s3/OtherConstruct3/y TARGET AssocEntity CLASS(t1)
    print *, y
  end select
 end subroutine
 
 !DEF: /s4 (Subroutine) Subprogram
 subroutine s4
  !DEF: /s4/t1 DerivedType
  type :: t1
   !DEF: /s4/t1/a ObjectEntity REAL(4)
   real :: a
  end type
  !DEF: /s4/t2 DerivedType
  type :: t2
   !REF: /s4/t1
   !DEF: /s4/t2/b ObjectEntity TYPE(t1)
   type(t1) :: b
  end type
  !REF: /s4/t2
  !DEF: /s4/x ObjectEntity TYPE(t2)
  type(t2) :: x
- !DEF: /s4/Block1/y AssocEntity TYPE(t1)
+ !DEF: /s4/OtherConstruct1/y AssocEntity TYPE(t1)
  !REF: /s4/x
  !REF: /s4/t2/b
  associate(y => x%b)
-  !REF: /s4/Block1/y
+  !REF: /s4/OtherConstruct1/y
   !REF: /s4/t1/a
   y%a = 0.0
  end associate
 end subroutine
 
 !DEF: /s5 (Subroutine) Subprogram
 subroutine s5
  !DEF: /s5/t DerivedType
  type :: t
   !DEF: /s5/t/a ObjectEntity REAL(4)
   real :: a
  end type
  !DEF: /s5/b ObjectEntity REAL(4)
  real b
- !DEF: /s5/Block1/x AssocEntity TYPE(t)
+ !DEF: /s5/OtherConstruct1/x AssocEntity TYPE(t)
  !DEF: /s5/f (Function) Subprogram TYPE(t)
  associate(x => f())
   !REF: /s5/b
-  !REF: /s5/Block1/x
+  !REF: /s5/OtherConstruct1/x
   !REF: /s5/t/a
   b = x%a
  end associate
 contains
  !REF: /s5/f
  function f()
   !REF: /s5/t
   !DEF: /s5/f/f ObjectEntity TYPE(t)
   type(t) :: f
  end function
 end subroutine