work

src/pass.h

@@ -327,10 +327,10 @@ struct PassRunner {
   // By default, we do not know if we are running first in the ordering of
   // optimization passes, or last - we could be anywhere.
   struct Ordering {
-    bool first = false;
-    bool last = false;
+    bool first;
+    bool last;
   };
-  static const Ordering UnknownOrdering;
+  static constexpr Ordering UnknownOrdering = {false, false};
 
   // Adds the default set of optimization passes; this is what -O does.
   //

src/tools/optimization-options.h

@@ -400,13 +400,11 @@ struct OptimizationOptions : public ToolOptions {
 
     // Find the first and last default opt passes, so we can tell them they are
     // first/last.
-    Index firstDefault = -1;
-    Index lastDefault = -1;
+    Index firstDefault = passes.size();
+    Index lastDefault = passes.size();
     for (Index i = 0; i < passes.size(); i++) {
       if (passes[i].name == DEFAULT_OPT_PASSES) {
-        if (firstDefault == -1) {
-          firstDefault = i;
-        }
+        firstDefault = std::min(firstDefault, i);
         lastDefault = i;
       }
     }