Revert "[Flang][OpenMP] Add PointerAssociateScalar to Cray Pointer used in the DSA (llvm#133232)"

This reverts commit d317f02.

Author: ronlieb

flang/lib/Lower/ConvertExprToHLFIR.cpp

@@ -278,8 +278,7 @@ class HlfirDesignatorBuilder {
   gen(const Fortran::evaluate::SymbolRef &symbolRef) {
     if (std::optional<fir::FortranVariableOpInterface> varDef =
             getSymMap().lookupVariableDefinition(symbolRef)) {
-      if (symbolRef.get().GetUltimate().test(
-              Fortran::semantics::Symbol::Flag::CrayPointee)) {
+      if (symbolRef->test(Fortran::semantics::Symbol::Flag::CrayPointee)) {
         // The pointee is represented with a descriptor inheriting
         // the shape and type parameters of the pointee.
         // We have to update the base_addr to point to the current

flang/lib/Semantics/resolve-directives.cpp

@@ -2276,7 +2276,7 @@ void OmpAttributeVisitor::Post(const parser::Name &name) {
             // the scope of the parallel region, and not in this scope.
             // TODO: check whether this should be caught in IsObjectWithDSA
             !symbol->test(Symbol::Flag::OmpPrivate)) {
-          if (symbol->GetUltimate().test(Symbol::Flag::CrayPointee)) {
+          if (symbol->test(Symbol::Flag::CrayPointee)) {
             std::string crayPtrName{
                 semantics::GetCrayPointer(*symbol).name().ToString()};
             if (!IsObjectWithDSA(*currScope().FindSymbol(crayPtrName)))