Revert "[NFC] Fix dangling-else warning"

This reverts commit ea33083.

Author: jsji

llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp

@@ -2936,9 +2936,8 @@ TEST_F(OpenMPIRBuilderTest, CriticalDirective) {
   const DataLayout &DL = M->getDataLayout();
   const llvm::Align TypeAlign = DL.getABITypeAlign(CriticalNamePtrTy);
   const llvm::Align PtrAlign = DL.getPointerABIAlignment(GV->getAddressSpace());
-  if (const llvm::MaybeAlign Alignment = GV->getAlign()) {
+  if (const llvm::MaybeAlign Alignment = GV->getAlign())
     EXPECT_EQ(*Alignment, std::max(TypeAlign, PtrAlign));
-  }
 }
 
 TEST_F(OpenMPIRBuilderTest, OrderedDirectiveDependSource) {

llvm/unittests/IR/AttributesTest.cpp

@@ -468,9 +468,9 @@ TEST(Attributes, SetIntersect) {
     AS0 = AttributeSet::get(C0, AB0);
     Res = AS0.intersectWith(C0, AS1);
     ASSERT_EQ(Res.has_value(), CanDrop);
-    if (CanDrop) {
+    if (CanDrop)
       ASSERT_FALSE(Res->hasAttributes());
-    }
+
     AS1 = AttributeSet::get(C1, AB0);
     Res = AS0.intersectWith(C0, AS1);
     ASSERT_TRUE(Res.has_value());

llvm/unittests/IR/PatternMatch.cpp

@@ -637,23 +637,20 @@ TEST_F(PatternMatchTest, CheckedInt) {
     CRes = nullptr;
     EXPECT_EQ(CheckUgt1(APVal), m_CheckedInt(CheckUgt1).match(C));
     EXPECT_EQ(CheckUgt1(APVal), m_CheckedInt(CRes, CheckUgt1).match(C));
-    if (CheckUgt1(APVal)) {
+    if (CheckUgt1(APVal))
       EXPECT_EQ(CRes, C);
-    }
 
     CRes = nullptr;
     EXPECT_EQ(CheckNonZero(APVal), m_CheckedInt(CheckNonZero).match(C));
     EXPECT_EQ(CheckNonZero(APVal), m_CheckedInt(CRes, CheckNonZero).match(C));
-    if (CheckNonZero(APVal)) {
+    if (CheckNonZero(APVal))
       EXPECT_EQ(CRes, C);
-    }
 
     CRes = nullptr;
     EXPECT_EQ(CheckPow2(APVal), m_CheckedInt(CheckPow2).match(C));
     EXPECT_EQ(CheckPow2(APVal), m_CheckedInt(CRes, CheckPow2).match(C));
-    if (CheckPow2(APVal)) {
+    if (CheckPow2(APVal))
       EXPECT_EQ(CRes, C);
-    }
 
   };
 
@@ -713,9 +710,8 @@ TEST_F(PatternMatchTest, CheckedInt) {
     EXPECT_EQ(Expec, m_CheckedInt(CRes, CheckFn).match(C));
     if (Expec) {
       EXPECT_NE(CRes, nullptr);
-      if (AllSame) {
+      if (AllSame)
         EXPECT_EQ(CRes, C);
-      }
     }
   };
   auto DoVecCheck = [&](ArrayRef<std::optional<int8_t>> Vals) {

llvm/unittests/Object/ELFObjectFileTest.cpp

@@ -1244,9 +1244,8 @@ TEST(ELFObjectFileTest, ReadPGOAnalysisMap) {
           }
           EXPECT_EQ(PGOAnalyses, *ExpectedPGO);
           for (auto &&[BB, PGO] : llvm::zip(*BBAddrMaps, PGOAnalyses)) {
-            if (PGO.FeatEnable.BBFreq || PGO.FeatEnable.BrProb) {
+            if (PGO.FeatEnable.BBFreq || PGO.FeatEnable.BrProb)
               EXPECT_EQ(BB.getNumBBEntries(), PGO.BBEntries.size());
-            }
           }
         }
       };

llvm/unittests/ProfileData/CoverageMappingTest.cpp

@@ -1113,9 +1113,8 @@ TEST(CoverageMappingTest, TVIdxBuilder) {
     EXPECT_EQ(Node.Width, IndicesRefs[I].Width);
     for (int C = 0; C < 2; ++C) {
       auto Index = TheBuilder.Indices[I][C];
-      if (Node.NextIDs[C] < 0) {
+      if (Node.NextIDs[C] < 0)
         EXPECT_TRUE(Decisions.insert({Index, Node.Width}).second);
-      }
     }
 #endif
   }