Passes LIT tests

Author: eugeneepshteyn

flang/include/flang/Lower/CallInterface.h

@@ -159,8 +159,6 @@ class CallInterface {
   /// PassedEntity is what is provided back to the CallInterface user.
   /// It describe how the entity is plugged in the interface
   struct PassedEntity {
-    /// Helps with caller/callee differentiation
-    static constexpr bool isCaller = std::is_same_v<T, CallerInterface>;
     /// Is the dummy argument optional?
     bool isOptional() const;
     /// Can the argument be modified by the callee?

flang/lib/Lower/ConvertCall.cpp

@@ -1204,6 +1204,10 @@ static bool isParameterObjectOrSubObject(hlfir::Entity entity) {
 ///   fir.box_char...).
 /// This function should only be called with an actual that is present.
 /// The optional aspects must be handled by this function user.
+///
+/// Note: while Fortran::lower::CallerInterface::PassedEntity (the type of arg)
+/// is technically a template type, in the prepare*ActualArgument() calls
+/// it resolves to Fortran::evaluate::ActualArgument *
 static PreparedDummyArgument preparePresentUserCallActualArgument(
     mlir::Location loc, fir::FirOpBuilder &builder,
     const Fortran::lower::PreparedActualArgument &preparedActual,
@@ -1263,21 +1267,14 @@ static PreparedDummyArgument preparePresentUserCallActualArgument(
   bool mustDoCopyOut = mustDoCopyIn && arg.mayBeModifiedByCall();
   bool newMustDoCopyIn = false;
   bool newMustDoCopyOut = false;
-  if constexpr (Fortran::lower::CallerInterface::PassedEntity::isCaller) {
-    newMustDoCopyIn = arg.entity->GetMayNeedCopyIn();
-    newMustDoCopyOut = arg.entity->GetMayNeedCopyOut();
+  newMustDoCopyIn = actual.isArray() && arg.entity->GetMayNeedCopyIn();
+  newMustDoCopyOut = newMustDoCopyIn && arg.entity->GetMayNeedCopyOut();
 #if 1
-    llvm::dbgs() << "copyinout: CALLER " << "copy-in: old=" << mustDoCopyIn
-                 << ", new=" << newMustDoCopyIn
-                 << "| copy-out: old=" << mustDoCopyOut
-                 << ", new=" << newMustDoCopyOut << "\n";
+  llvm::dbgs() << "copyinout: CALLER " << "copy-in: old=" << mustDoCopyIn
+               << ", new=" << newMustDoCopyIn
+               << "| copy-out: old=" << mustDoCopyOut
+               << ", new=" << newMustDoCopyOut << "\n";
 #endif
-  } else {
-#if 1
-    llvm::dbgs() << "copyinout: CALLEE " << "copy-in=" << mustDoCopyIn
-                 << ", copy-out=" << mustDoCopyOut << "\n";
-#endif
-  }
   mustDoCopyIn = newMustDoCopyIn;
   mustDoCopyOut = newMustDoCopyOut;
 

flang/lib/Semantics/expression.cpp

@@ -4389,6 +4389,7 @@ MaybeExpr ExpressionAnalyzer::MakeFunctionRef(parser::CharBlock callSite,
     if (chars->functionResult) {
       const auto &result{*chars->functionResult};
       ProcedureRef procRef{std::move(proc), std::move(arguments)};
+      procRef.DetermineCopyInOut();
       if (result.IsProcedurePointer()) {
         return Expr<SomeType>{std::move(procRef)};
       } else {