[flang] Recode a line to dodge a clang warning

Rewrite a correct use of "&" -- conjunction without short-circuiting --
from a recent patch into multiple lines so that clang doesn't warn
about it.

diff --git a/flang/lib/Semantics/expression.cpp b/flang/lib/Semantics/expression.cpp
index 6fa4827..603fb87 100644 (file)
--- a/flang/lib/Semantics/expression.cpp
+++ b/flang/lib/Semantics/expression.cpp
@@ -356,8 +356,10 @@ bool ExpressionAnalyzer::CheckPolymorphic(const DataRef &dataRef) {
 }
 
 bool ExpressionAnalyzer::CheckDataRef(const DataRef &dataRef) {
-  // '&' here prevents short-circuiting
-  return CheckRanks(dataRef) & CheckPolymorphic(dataRef);
+  // Always check both, don't short-circuit
+  bool ranksOk{CheckRanks(dataRef)};
+  bool polyOk{CheckPolymorphic(dataRef)};
+  return ranksOk && polyOk;
 }
 
 // Parse tree correction after a substring S(j:k) was misparsed as an