diff --git a/llvm/lib/Support/FileCheck.cpp b/llvm/lib/Support/FileCheck.cpp
--- a/llvm/lib/Support/FileCheck.cpp
+++ b/llvm/lib/Support/FileCheck.cpp
@@ -359,7 +359,7 @@
   size_t FormatSpecEnd = Expr.find(',');
   if (FormatSpecEnd != StringRef::npos) {
     Expr = Expr.ltrim(SpaceChars);
-    if (stripFront(Expr, "%", false /*Optional*/))
+    if (stripFront(Expr, "%", /*Optional=*/false))
       return FileCheckErrorDiagnostic::get(
           SM, Expr, "invalid matching format specification in expression");
 
@@ -382,7 +382,7 @@
     }
 
     Expr = Expr.ltrim(SpaceChars);
-    if (stripFront(Expr, ",", false /*Optional*/))
+    if (stripFront(Expr, ",", /*Optional=*/false))
       return FileCheckErrorDiagnostic::get(
           SM, Expr, "invalid matching format specification in expression");
   }
diff --git a/llvm/unittests/Support/FileCheckTest.cpp b/llvm/unittests/Support/FileCheckTest.cpp
--- a/llvm/unittests/Support/FileCheckTest.cpp
+++ b/llvm/unittests/Support/FileCheckTest.cpp
@@ -497,8 +497,8 @@
   FileCheckPattern P = FileCheckPattern(Check::CheckPlain, &Cxt, 1);
   Optional<FileCheckNumericVariable *> DefinedNumericVariable;
   Expected<FileCheckExpression *> Expression = P.parseNumericSubstitutionBlock(
-      LocalNumVarRef, DefinedNumericVariable, false /*Legacy*/,
-      1 /*LineNumber*/, &Cxt, SM);
+      LocalNumVarRef, DefinedNumericVariable, /*Legacy=*/false,
+      /*LineNumber=*/1, &Cxt, SM);
   EXPECT_TRUE(static_cast<bool>(LocalVar));
   EXPECT_EQ(*LocalVar, "FOO");
   Expected<StringRef> EmptyVar = Cxt.getPatternVarValue(EmptyVarStr);
@@ -522,8 +522,8 @@
   EXPECT_TRUE(errorToBool((*Expression)->getAST()->eval().takeError()));
   P = FileCheckPattern(Check::CheckPlain, &Cxt, 2);
   Expression = P.parseNumericSubstitutionBlock(
-      LocalNumVarRef, DefinedNumericVariable, false /*Legacy*/,
-      2 /*LineNumber*/, &Cxt, SM);
+      LocalNumVarRef, DefinedNumericVariable, /*Legacy=*/false,
+      /*LineNumber=*/2, &Cxt, SM);
   EXPECT_TRUE(errorToBool(Expression.takeError()));
   EmptyVar = Cxt.getPatternVarValue(EmptyVarStr);
   EXPECT_TRUE(errorToBool(EmptyVar.takeError()));
@@ -539,8 +539,8 @@
   EXPECT_EQ(*GlobalVar, "BAR");
   P = FileCheckPattern(Check::CheckPlain, &Cxt, 3);
   Expression = P.parseNumericSubstitutionBlock(
-      GlobalNumVarRef, DefinedNumericVariable, false /*Legacy*/,
-      3 /*LineNumber*/, &Cxt, SM);
+      GlobalNumVarRef, DefinedNumericVariable, /*Legacy=*/false,
+      /*LineNumber=*/3, &Cxt, SM);
   EXPECT_TRUE(static_cast<bool>(Expression));
   ExpressionVal = (*Expression)->getAST()->eval();
   EXPECT_TRUE(static_cast<bool>(ExpressionVal));
@@ -551,8 +551,8 @@
   EXPECT_FALSE(errorToBool(Cxt.getPatternVarValue(GlobalVarStr).takeError()));
   P = FileCheckPattern(Check::CheckPlain, &Cxt, 4);
   Expression = P.parseNumericSubstitutionBlock(
-      GlobalNumVarRef, DefinedNumericVariable, false /*Legacy*/,
-      4 /*LineNumber*/, &Cxt, SM);
+      GlobalNumVarRef, DefinedNumericVariable, /*Legacy=*/false,
+      /*LineNumber=*/4, &Cxt, SM);
   EXPECT_TRUE(static_cast<bool>(Expression));
   ExpressionVal = (*Expression)->getAST()->eval();
   EXPECT_TRUE(static_cast<bool>(ExpressionVal));