simplify

Author: akuhlens

flang/include/flang/Evaluate/variable.h

@@ -289,7 +289,7 @@ struct DataRef {
   const Symbol &GetLastSymbol() const;
   std::optional<Expr<SubscriptInteger>> LEN() const;
   llvm::raw_ostream &AsFortran(llvm::raw_ostream &) const;
-  bool IsPathFrom(const DataRef &) const;
+
   std::variant<SymbolRef, Component, ArrayRef, CoarrayRef> u;
 };
 
@@ -400,7 +400,7 @@ template <typename T> class Designator {
   const Symbol *GetLastSymbol() const;
   std::optional<Expr<SubscriptInteger>> LEN() const;
   llvm::raw_ostream &AsFortran(llvm::raw_ostream &o) const;
-  bool IsPathFrom(const Designator<T> &) const;
+
   Variant u;
 };
 

flang/lib/Evaluate/variable.cpp

@@ -751,70 +751,6 @@ bool DescriptorInquiry::operator==(const DescriptorInquiry &that) const {
   return field_ == that.field_ && base_ == that.base_ &&
       dimension_ == that.dimension_;
 }
-#include <type_traits>
-#include <utility>
-template <typename T, typename = void> struct has_union : std::false_type {};
-template <typename T>
-struct has_union<T, std::void_t<decltype(T::u)>> : std::true_type {};
-template <typename T, typename = void> struct has_base : std::false_type {};
-template <typename T>
-struct has_base<T, std::void_t<decltype(std::declval<T>().base())>>
-    : std::true_type {};
-template <typename T, typename = void>
-struct has_GetFirstSymbol : std::false_type {};
-template <typename T>
-struct has_GetFirstSymbol<T,
-    std::void_t<decltype(std::declval<T>().GetFirstSymbol())>>
-    : std::true_type {};
-
-template <typename P, typename R>
-bool TestVariableIsPathFromRoot(const P &path, const R &root) {
-  const SymbolRef *pathSym{nullptr}, *rootSym{nullptr};
-  if constexpr (has_union<P>::value) {
-    pathSym = std::get_if<SymbolRef>(&path.u);
-  }
-  if constexpr (has_union<R>::value) {
-    rootSym = std::get_if<SymbolRef>(&root.u);
-  }
-  if (pathSym) {
-    return rootSym && AreSameSymbol(*rootSym, *pathSym);
-  }
-  if constexpr (has_GetFirstSymbol<P>::value) {
-    if (rootSym) {
-      return AreSameSymbol(path.GetFirstSymbol(), *rootSym);
-    }
-  }
-  if constexpr (std::is_same_v<P, R>) {
-    if (path == root) {
-      return true;
-    }
-  }
-  if constexpr (has_base<P>::value) {
-    return TestVariableIsPathFromRoot(path.base(), root);
-  }
-  if constexpr (has_union<P>::value) {
-    return common::visit(
-        common::visitors{
-            [&](const auto &x) { return TestVariableIsPathFromRoot(x, root); },
-        },
-        path.u);
-  }
-  return false;
-}
-
-bool DataRef::IsPathFrom(const DataRef &that) const {
-  return TestVariableIsPathFromRoot(*this, that);
-}
-
-template <typename T>
-bool Designator<T>::IsPathFrom(const Designator<T> &that) const {
-  return TestVariableIsPathFromRoot(*this, that);
-}
-
-template <typename T, typename U>
-optional<bool> Designator<T>::IsSameEntity(const Designator<U> &that) const {
-  return std::nullopt;
-}
 
 #ifdef _MSC_VER // disable bogus warning about missing definitions
 #pragma warning(disable : 4661)

flang/lib/Semantics/check-allocate.cpp

@@ -471,26 +471,13 @@ static bool HaveCompatibleLengths(
 }
 
 bool IsSameAllocation(const SomeExpr *root, const SomeExpr *path) {
-  if (root) {
-    if (std::optional<evaluate::DataRef> rootRef{ExtractDataRef(root)}) {
-      if (path) {
-        if (std::optional<evaluate::DataRef> pathRef{ExtractDataRef(path)}) {
-          if (pathRef->IsPathFrom(*rootRef)) {
-            return true;
-          }
-        } else {
-          if (*root == *path) {
-            return true;
-          }
-        }
-      }
-    } else {
-      if (path && *root == *path) {
-        return true;
-      }
-    }
+  if (root && path) {
+    // For now we just use equality of expressions. If we implement a more
+    // sophisticated alias analysis we should use it here.
+    return *root == *path;
+  } else {
+    return false;
   }
-  return false;
 }
 
 bool AllocationCheckerHelper::RunChecks(SemanticsContext &context) {

flang/test/Semantics/OpenACC/acc-data-function.f90

@@ -0,0 +1,19 @@
+! RUN: %python %S/../test_errors.py %s %flang -fopenacc -pedantic
+
+module mm_acc_rout_function
+contains
+    integer function dosomething(res)
+        !$acc routine seq
+        integer :: res
+        dosomething = res + 1
+    end function
+end module
+    
+program main
+    use mm_acc_rout_function
+    implicit none
+    integer :: res = 1
+    !$acc serial default(none) copy(res)
+    res = dosomething(res)
+    !$acc end serial
+end program

flang/test/Semantics/allocate14.f90

@@ -46,11 +46,11 @@ program allocate14
   !ERROR: ERRMSG variable in DEALLOCATE must not be the variable being deallocated
   deallocate(tt(2)%msg, stat=tt(2)%i, errmsg=tt(2)%msg)
 
-  !ERROR: STAT variable in ALLOCATE must not be the variable being allocated
-  !ERROR: ERRMSG variable in ALLOCATE must not be the variable being allocated
+  !TODO: STAT variable in ALLOCATE must not be the variable being allocated
+  !TODO: ERRMSG variable in ALLOCATE must not be the variable being allocated
   allocate(ts(10), stat=ts(1)%i, errmsg=ts(1)%msg)
-  !ERROR: STAT variable in DEALLOCATE must not be the variable being deallocated
-  !ERROR: ERRMSG variable in DEALLOCATE must not be the variable being deallocated
+  !TODO: STAT variable in DEALLOCATE must not be the variable being deallocated
+  !TODO: ERRMSG variable in DEALLOCATE must not be the variable being deallocated
   deallocate(ts, stat=ts(1)%i, errmsg=ts(1)%msg)
 end program