diff --git a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
index b8bee0c449d1..67f39ec1b1a4 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -418,15 +418,12 @@ DWARFDie DWARFContext::getDIEForOffset(uint32_t Offset) {
 bool DWARFContext::verify(raw_ostream &OS, DIDumpType DumpType) {
   bool Success = true;
   DWARFVerifier verifier(OS, *this);
+
   Success &= verifier.handleDebugAbbrev();
-  if (DumpType == DIDT_All || DumpType == DIDT_Info) {
-    if (!verifier.handleDebugInfo())
-      Success = false;
-  }
-  if (DumpType == DIDT_All || DumpType == DIDT_Line) {
-    if (!verifier.handleDebugLine())
-      Success = false;
-  }
+  if (DumpType == DIDT_All || DumpType == DIDT_Info)
+    Success &= verifier.handleDebugInfo();
+  if (DumpType == DIDT_All || DumpType == DIDT_Line)
+    Success &= verifier.handleDebugLine();
   Success &= verifier.handleAccelTables();
   return Success;
 }