Merge pull request #77266 from xedin/fix-name-of-expr-time-threshold-param

[ConstraintSystem] NFC: Rename threshold in `ExpressionTimer` to clar…

Author: xedin

include/swift/Sema/ConstraintSystem.h

@@ -240,9 +240,9 @@ class ExpressionTimer {
   ASTContext &Context;
   llvm::TimeRecord StartTime;
 
-  /// The number of milliseconds from creation until
+  /// The number of seconds from creation until
   /// this timer is considered expired.
-  unsigned ThresholdInMillis;
+  unsigned ThresholdInSecs;
 
   bool PrintDebugTiming;
   bool PrintWarning;
@@ -251,7 +251,8 @@ class ExpressionTimer {
   /// This constructor sets a default threshold defined for all expressions
   /// via compiler flag `solver-expression-time-threshold`.
   ExpressionTimer(AnchorType Anchor, ConstraintSystem &CS);
-  ExpressionTimer(AnchorType Anchor, ConstraintSystem &CS, unsigned thresholdInMillis);
+  ExpressionTimer(AnchorType Anchor, ConstraintSystem &CS,
+                  unsigned thresholdInSecs);
 
   ~ExpressionTimer();
 
@@ -272,20 +273,18 @@ class ExpressionTimer {
     return endTime.getProcessTime() - StartTime.getProcessTime();
   }
 
-  /// Return the remaining process time in milliseconds until the
+  /// Return the remaining process time in seconds until the
   /// threshold specified during construction is reached.
-  unsigned getRemainingProcessTimeInMillis() const {
+  unsigned getRemainingProcessTimeInSeconds() const {
     auto elapsed = unsigned(getElapsedProcessTimeInFractionalSeconds());
-    return elapsed >= ThresholdInMillis ? 0 : ThresholdInMillis - elapsed;
+    return elapsed >= ThresholdInSecs ? 0 : ThresholdInSecs - elapsed;
   }
 
   // Disable emission of warnings about expressions that take longer
   // than the warning threshold.
   void disableWarning() { PrintWarning = false; }
 
-  bool isExpired() const {
-    return getRemainingProcessTimeInMillis() == 0;
-  }
+  bool isExpired() const { return getRemainingProcessTimeInSeconds() == 0; }
 };
 
 } // end namespace constraints

lib/Sema/CSStep.h

@@ -938,7 +938,7 @@ class ConjunctionStep : public BindingStep<ConjunctionElementProducer> {
       Snapshot.emplace(cs, conjunction);
 
     if (cs.Timer) {
-      auto remainingTime = cs.Timer->getRemainingProcessTimeInMillis();
+      auto remainingTime = cs.Timer->getRemainingProcessTimeInSeconds();
       OuterTimeRemaining.emplace(cs.Timer->getAnchor(), remainingTime);
     }
   }

lib/Sema/ConstraintSystem.cpp

@@ -58,10 +58,10 @@ ExpressionTimer::ExpressionTimer(AnchorType Anchor, ConstraintSystem &CS)
           CS.getASTContext().TypeCheckerOpts.ExpressionTimeoutThreshold) {}
 
 ExpressionTimer::ExpressionTimer(AnchorType Anchor, ConstraintSystem &CS,
-                                 unsigned thresholdInMillis)
+                                 unsigned thresholdInSecs)
     : Anchor(Anchor), Context(CS.getASTContext()),
       StartTime(llvm::TimeRecord::getCurrentTime()),
-      ThresholdInMillis(thresholdInMillis),
+      ThresholdInSecs(thresholdInSecs),
       PrintDebugTiming(CS.getASTContext().TypeCheckerOpts.DebugTimeExpressions),
       PrintWarning(true) {}