Code review feedback

Author: eugeneepshteyn

flang/include/flang/Evaluate/call.h

@@ -110,7 +110,6 @@ class ActualArgument {
 
   std::optional<DynamicType> GetType() const;
   int Rank() const;
-  bool IsArray() const;
   bool operator==(const ActualArgument &) const;
   llvm::raw_ostream &AsFortran(llvm::raw_ostream &) const;
 

flang/include/flang/Evaluate/check-expression.h

@@ -164,7 +164,7 @@ std::optional<parser::Message> CheckStatementFunction(
     const Symbol &, const Expr<SomeType> &, FoldingContext &);
 
 bool MayNeedCopy(const ActualArgument *, const characteristics::DummyArgument *,
-    FoldingContext &, bool);
+    FoldingContext &, bool forCopyOut);
 
 } // namespace Fortran::evaluate
 #endif

flang/lib/Evaluate/call.cpp

@@ -56,10 +56,6 @@ int ActualArgument::Rank() const {
   }
 }
 
-bool ActualArgument::IsArray() const {
-  return semantics::IsAssumedRank(*this) || Rank() > 0;
-}
-
 bool ActualArgument::operator==(const ActualArgument &that) const {
   return keyword_ == that.keyword_ && attrs_ == that.attrs_ && u_ == that.u_;
 }

flang/lib/Evaluate/check-expression.cpp

@@ -1446,7 +1446,7 @@ std::optional<parser::Message> CheckStatementFunction(
   return StmtFunctionChecker{sf, context}(expr);
 }
 
-// Helper class for cheching differences between actual and dummy arguments
+// Helper class for checking differences between actual and dummy arguments
 class CopyInOutExplicitInterface {
 public:
   explicit CopyInOutExplicitInterface(FoldingContext &fc,
@@ -1477,10 +1477,7 @@ class CopyInOutExplicitInterface {
         (dummyTreatAsArray && !dummyIsPolymorphic) || dummyIsVoidStar ||
         dummyObj_.attrs.test(
             characteristics::DummyDataObject::Attr::Contiguous)};
-    if (!actualTreatAsContiguous && dummyNeedsContiguity) {
-      return true;
-    }
-    return false;
+    return !actualTreatAsContiguous && dummyNeedsContiguity;
   }
 
   // Returns true, if actual and dummy have polymorphic differences
@@ -1513,9 +1510,10 @@ class CopyInOutExplicitInterface {
     return false;
   }
 
-  bool HaveArrayArgs() const {
+  bool HaveArrayOrAssumedRankArgs() const {
     bool dummyTreatAsArray{dummyObj_.ignoreTKR.test(common::IgnoreTKR::Rank)};
-    return actual_.IsArray() && (dummyObj_.IsArray() || dummyTreatAsArray);
+    return IsArrayOrAssumedRank(actual_) &&
+        (IsArrayOrAssumedRank(dummyObj_) || dummyTreatAsArray);
   }
 
   bool PassByValue() const {
@@ -1530,6 +1528,15 @@ class CopyInOutExplicitInterface {
 
   bool HasIntentIn() const { return dummyObj_.intent == common::Intent::In; }
 
+  static bool IsArrayOrAssumedRank(const ActualArgument &actual) {
+    return semantics::IsAssumedRank(actual) || actual.Rank() > 0;
+  }
+
+  static bool IsArrayOrAssumedRank(const characteristics::DummyDataObject &dummy) {
+    return dummy.type.attrs().test(characteristics::TypeAndShape::Attr::AssumedRank) ||
+      dummy.type.Rank() > 0;
+  }
+
 private:
   FoldingContext &fc_;
   const ActualArgument &actual_;
@@ -1556,8 +1563,9 @@ static bool MayNeedCopyIn(FoldingContext &fc, const ActualArgument &actual,
     if (check.HaveCoarrayDifferences()) {
       return true;
     }
-    // Note: contiguity and polymorphic checks deal with array arguments
-    if (!check.HaveArrayArgs()) {
+    // Note: contiguity and polymorphic checks deal with array or assumed rank
+    // arguments
+    if (!check.HaveArrayOrAssumedRankArgs()) {
       return false;
     }
     if (check.HaveContiguityDifferences()) {
@@ -1600,8 +1608,9 @@ static bool MayNeedCopyOut(FoldingContext &fc, const ActualArgument &actual,
     if (check.HaveCoarrayDifferences()) {
       return true;
     }
-    // Note: contiguity and polymorphic checks deal with array arguments
-    if (!check.HaveArrayArgs()) {
+    // Note: contiguity and polymorphic checks deal with array or assumed rank
+    // arguments
+    if (!check.HaveArrayOrAssumedRankArgs()) {
       return false;
     }
     if (check.HaveContiguityDifferences()) {