diff --git a/llvm/tools/llc/llc.cpp b/llvm/tools/llc/llc.cpp
index 300a46d9e0b078..b292f70ba89dee 100644
--- a/llvm/tools/llc/llc.cpp
+++ b/llvm/tools/llc/llc.cpp
@@ -366,9 +366,10 @@ int main(int argc, char **argv) {
 
   // RemoveDIs debug-info transition: tests may request that we /try/ to use the
   // new debug-info format.
-  if (TryUseNewDbgInfoFormat)
+  if (TryUseNewDbgInfoFormat) {
     // Turn the new debug-info format on.
     UseNewDbgInfoFormat = true;
+  }
 
   if (TimeTrace)
     timeTraceProfilerInitialize(TimeTraceGranularity, argv[0]);
diff --git a/llvm/tools/llvm-link/llvm-link.cpp b/llvm/tools/llvm-link/llvm-link.cpp
index f6ebe43f8a39fe..e6c219a8cd7ece 100644
--- a/llvm/tools/llvm-link/llvm-link.cpp
+++ b/llvm/tools/llvm-link/llvm-link.cpp
@@ -474,9 +474,10 @@ int main(int argc, char **argv) {
 
   // RemoveDIs debug-info transition: tests may request that we /try/ to use the
   // new debug-info format.
-  if (TryUseNewDbgInfoFormat)
+  if (TryUseNewDbgInfoFormat) {
     // Turn the new debug-info format on.
     UseNewDbgInfoFormat = true;
+  }
 
   LLVMContext Context;
   Context.setDiagnosticHandler(std::make_unique<LLVMLinkDiagnosticHandler>(),
diff --git a/llvm/tools/llvm-lto/llvm-lto.cpp b/llvm/tools/llvm-lto/llvm-lto.cpp
index 81cbe1704e7160..7943d6952b828d 100644
--- a/llvm/tools/llvm-lto/llvm-lto.cpp
+++ b/llvm/tools/llvm-lto/llvm-lto.cpp
@@ -946,9 +946,10 @@ int main(int argc, char **argv) {
 
   // RemoveDIs debug-info transition: tests may request that we /try/ to use the
   // new debug-info format.
-  if (TryUseNewDbgInfoFormat)
+  if (TryUseNewDbgInfoFormat) {
     // Turn the new debug-info format on.
     UseNewDbgInfoFormat = true;
+  }
 
   if (OptLevel < '0' || OptLevel > '3')
     error("optimization level must be between 0 and 3");
diff --git a/llvm/tools/llvm-lto2/llvm-lto2.cpp b/llvm/tools/llvm-lto2/llvm-lto2.cpp
index a0aaa621f3d80e..d5de4f6b1a277c 100644
--- a/llvm/tools/llvm-lto2/llvm-lto2.cpp
+++ b/llvm/tools/llvm-lto2/llvm-lto2.cpp
@@ -231,9 +231,10 @@ static int run(int argc, char **argv) {
 
   // RemoveDIs debug-info transition: tests may request that we /try/ to use the
   // new debug-info format.
-  if (TryUseNewDbgInfoFormat)
+  if (TryUseNewDbgInfoFormat) {
     // Turn the new debug-info format on.
     UseNewDbgInfoFormat = true;
+  }
 
   // FIXME: Workaround PR30396 which means that a symbol can appear
   // more than once if it is defined in module-level assembly and
diff --git a/llvm/tools/llvm-reduce/llvm-reduce.cpp b/llvm/tools/llvm-reduce/llvm-reduce.cpp
index 9c33f301da6edc..f913771487afe1 100644
--- a/llvm/tools/llvm-reduce/llvm-reduce.cpp
+++ b/llvm/tools/llvm-reduce/llvm-reduce.cpp
@@ -152,9 +152,10 @@ int main(int Argc, char **Argv) {
 
   // RemoveDIs debug-info transition: tests may request that we /try/ to use the
   // new debug-info format.
-  if (TryUseNewDbgInfoFormat)
+  if (TryUseNewDbgInfoFormat) {
     // Turn the new debug-info format on.
     UseNewDbgInfoFormat = true;
+  }
 
   if (Argc == 1) {
     cl::PrintHelpMessage();
diff --git a/llvm/tools/opt/optdriver.cpp b/llvm/tools/opt/optdriver.cpp
index 8fbfb804e40b1a..85f52941a85b48 100644
--- a/llvm/tools/opt/optdriver.cpp
+++ b/llvm/tools/opt/optdriver.cpp
@@ -463,9 +463,10 @@ extern "C" int optMain(
 
   // RemoveDIs debug-info transition: tests may request that we /try/ to use the
   // new debug-info format.
-  if (TryUseNewDbgInfoFormat)
+  if (TryUseNewDbgInfoFormat) {
     // Turn the new debug-info format on.
     UseNewDbgInfoFormat = true;
+  }
 
   LLVMContext Context;