function definition tweak

Author: vdonaldson

flang/include/flang/Evaluate/target.h

@@ -52,9 +52,10 @@ class TargetCharacteristics {
   }
   void set_areSubnormalsFlushedToZero(bool yes = true);
 
-  // Check if a given real kind, any real kind, or all real kinds have
-  // flushing control.
-  bool hasSubnormalFlushingControl(int kind, bool any = false) const;
+  // Check if a given real kind has flushing control.
+  bool hasSubnormalFlushingControl(int kind) const;
+  // Check if any or all real kinds have flushing control.
+  bool hasSubnormalFlushingControl(bool any = false) const;
   void set_hasSubnormalFlushingControl(int kind, bool yes = true);
 
   Rounding roundingMode() const { return roundingMode_; }

flang/lib/Evaluate/fold-logical.cpp

@@ -891,9 +891,15 @@ Expr<Type<TypeCategory::Logical, KIND>> FoldIntrinsicFunction(
         IeeeFeature::Subnormal)};
   } else if (name == "__builtin_ieee_support_underflow_control") {
     // Setting kind=0 checks subnormal flushing control across all type kinds.
-    int kind{args[0] ? args[0]->GetType().value().kind() : 0};
-    return Expr<T>{
-        context.targetCharacteristics().hasSubnormalFlushingControl(kind)};
+    if (args[0]) {
+      return Expr<T>{
+          context.targetCharacteristics().hasSubnormalFlushingControl(
+              args[0]->GetType().value().kind())};
+    } else {
+      return Expr<T>{
+          context.targetCharacteristics().hasSubnormalFlushingControl(
+              /*any=*/false)};
+    }
   }
   return Expr<T>{std::move(funcRef)};
 }

flang/lib/Evaluate/target.cpp

@@ -108,25 +108,22 @@ void TargetCharacteristics::set_areSubnormalsFlushedToZero(bool yes) {
   areSubnormalsFlushedToZero_ = yes;
 }
 
-// Check if the target has subnormal flushing control for:
-//  - a given real kind (kind != 0)
-//  - any real kind (kind == 0 && any == true)
-//  - all real kinds (kind == 0 && any == false)
-bool TargetCharacteristics::hasSubnormalFlushingControl(
-    int kind, bool any) const {
-  CHECK(kind >= 0 && kind <= maxKind);
-  if (kind == 0) {
-    for (int kind{1}; kind <= maxKind; ++kind) {
-      if (CanSupportType(TypeCategory::Real, kind) &&
-          hasSubnormalFlushingControl_[kind] == any) {
-        return any;
-      }
+// Check if a given real kind has flushing control.
+bool TargetCharacteristics::hasSubnormalFlushingControl(int kind) const {
+  CHECK(kind > 0 && kind <= maxKind);
+  CHECK(CanSupportType(TypeCategory::Real, kind));
+  return hasSubnormalFlushingControl_[kind];
+}
+
+// Check if any or all real kinds have flushing control.
+bool TargetCharacteristics::hasSubnormalFlushingControl(bool any) const {
+  for (int kind{1}; kind <= maxKind; ++kind) {
+    if (CanSupportType(TypeCategory::Real, kind) &&
+        hasSubnormalFlushingControl_[kind] == any) {
+      return any;
     }
-    return !any;
-  } else {
-    CHECK(CanSupportType(TypeCategory::Real, kind));
-    return hasSubnormalFlushingControl_[kind];
   }
+  return !any;
 }
 
 void TargetCharacteristics::set_hasSubnormalFlushingControl(

flang/lib/Lower/Bridge.cpp

@@ -5240,7 +5240,7 @@ class FirConverter : public Fortran::lower::AbstractConverter {
     }
     if ((funit.mayModifyUnderflowMode) &&
         (bridge.getTargetCharacteristics().hasSubnormalFlushingControl(
-            0, /*any=*/true))) {
+            /*any=*/true))) {
       // F18 Clause 17.5p2: In a procedure [...], the processor shall not
       // change the underflow mode on entry, and on return shall ensure that
       // the underflow mode is the same as it was on entry.