[Flang] Move the check inside isEqual

Thirumalai-Shaktivel · Thirumalai-Shaktivel · commit 6442b335c2a5 · 2025-01-27T08:42:15.000Z
diff --git a/flang/include/flang/Lower/Support/Utils.h b/flang/include/flang/Lower/Support/Utils.h
@@ -572,12 +572,16 @@ class IsEqualEvaluateExpr {
     }
     return true;
   }
+  static bool isEqual(const Fortran::evaluate::SubscriptInteger &x,
+                      const Fortran::evaluate::SubscriptInteger &y) {
+  return x == y;
+  }
   template <typename A>
   static bool isEqual(const Fortran::evaluate::ArrayConstructor<A> &x,
                       const Fortran::evaluate::ArrayConstructor<A> &y) {
     bool checkCharacterType = true;
     if constexpr (A::category == Fortran::common::TypeCategory::Character) {
-      checkCharacterType = x.LEN() == y.LEN();
+      checkCharacterType = isEqual(*x.LEN(), *y.LEN());
     }
     using Base = Fortran::evaluate::ArrayConstructorValues<A>;
     return isEqual((Base)x, (Base)y) &&

Original file line number	Diff line number	Diff line change
`@@ -572,12 +572,16 @@ class IsEqualEvaluateExpr {`
`572`	`572`	`}`
`573`	`573`	`return true;`
`574`	`574`	`}`
	`575`	`+ static bool isEqual(const Fortran::evaluate::SubscriptInteger &x,`
	`576`	`+ const Fortran::evaluate::SubscriptInteger &y) {`
	`577`	`+ return x == y;`
	`578`	`+ }`
`575`	`579`	`template <typename A>`
`576`	`580`	`static bool isEqual(const Fortran::evaluate::ArrayConstructor<A> &x,`
`577`	`581`	`const Fortran::evaluate::ArrayConstructor<A> &y) {`
`578`	`582`	`bool checkCharacterType = true;`
`579`	`583`	`if constexpr (A::category == Fortran::common::TypeCategory::Character) {`
`580`		`- checkCharacterType = x.LEN() == y.LEN();`
	`584`	`+ checkCharacterType = isEqual(x.LEN(), y.LEN());`
`581`	`585`	`}`
`582`	`586`	`using Base = Fortran::evaluate::ArrayConstructorValues<A>;`
`583`	`587`	`return isEqual((Base)x, (Base)y) &&`