wip

Author: klausler

flang/lib/Evaluate/intrinsics.cpp

@@ -2032,16 +2032,16 @@ std::optional<SpecificCall> IntrinsicInterface::Match(
       dimArg = j;
       argOk = true;
       break;
-    case KindCode::same: {
+    case KindCode::same:
       if (!sameArg) {
         sameArg = arg;
+        argOk = true;
+      } else {
+        auto sameType{sameArg->GetType().value()};
+        argOk = sameType.IsTkLenCompatibleWith(*type) ||
+            (name == "move_alloc"s && type->IsTkLenCompatibleWith(sameType));
       }
-      // Check both ways so that a CLASS(*) actuals to
-      // MOVE_ALLOC and EOSHIFT both work.
-      auto sameType{sameArg->GetType().value()};
-      argOk = sameType.IsTkLenCompatibleWith(*type) ||
-          type->IsTkLenCompatibleWith(sameType);
-    } break;
+      break;
     case KindCode::sameKind:
       if (!sameArg) {
         sameArg = arg;

flang/lib/Semantics/resolve-names.cpp

@@ -9737,7 +9737,7 @@ void ResolveNamesVisitor::ResolveSpecificationParts(ProgramTree &node) {
       },
       node.stmt());
   Walk(node.spec());
-  bool inDeviceSubprogram = false;
+  bool inDeviceSubprogram{false};
   // If this is a function, convert result to an object. This is to prevent the
   // result from being converted later to a function symbol if it is called
   // inside the function.