[sancov] code readability improvement.

[aizatsky]

Summary

Reply to http://reviews.llvm.org/D18341

[vitalybuka]

LGTM anyway

lib/Transforms/Instrumentation/SanitizerCoverage.cpp

319 ↗

(On Diff #51443)

Reverse logic is still better :-)

static bool isNotFullDominator(const BasicBlock *BB, const DominatorTree *DT) {

for (const BasicBlock *SUCC : make_range(succ_begin(BB), succ_end(BB))) {
  if (!DT->dominates(BB, SUCC))
    return true;
}
return false;

}

350 ↗

(On Diff #51443)

return isNotFullDominator() && isNotFullPostDominator();

llvm/trunk/lib/Transforms/Instrumentation/SanitizerCoverage.cpp

std::tie(CtorFunc, std::ignore) = createSanitizerCtorAndInitFunctions(
          IRB.CreatePointerCast(ModuleName, Int8PtrTy)});
 
     appendToGlobalCtors(M, CtorFunc, SanCtorAndDtorPriority);
   }
 
   return true;
 }
 
-static bool shouldInstrumentBlock(const BasicBlock *BB, const DominatorTree *DT,
-                                  const PostDominatorTree *PDT) {
-  if (!ClPruneBlocks)
-    return true;
+// True if block has successors and it dominates all of them.
+static bool isFullDominator(const BasicBlock *BB, const DominatorTree *DT) {
+  if (succ_begin(BB) == succ_end(BB))
+    return false;
 
-  // Check if BB dominates all its successors.
-  bool DominatesAll = succ_begin(BB) != succ_end(BB);
   for (const BasicBlock *SUCC : make_range(succ_begin(BB), succ_end(BB))) {
-    DominatesAll &= DT->dominates(BB, SUCC);
+    if (!DT->dominates(BB, SUCC))
+      return false;
   }
 
-  // Check if BB pre-dominates all predecessors.
-  bool PreDominatesAll = pred_begin(BB) != pred_end(BB);
+  return true;
+}
+
+// True if block has predecessors and it postdominates all of them.
+static bool isFullPostDominator(const BasicBlock *BB,
+                                const PostDominatorTree *PDT) {
+  if (pred_begin(BB) == pred_end(BB))
+    return false;
+
   for (const BasicBlock *PRED : make_range(pred_begin(BB), pred_end(BB))) {
-    PreDominatesAll &= PDT->dominates(BB, PRED);
-  }
+    if (!PDT->dominates(BB, PRED))
+      return false;
+  }
+
+  return true;
 
-  return !(DominatesAll || PreDominatesAll);
+static bool shouldInstrumentBlock(const BasicBlock *BB, const DominatorTree *DT,
+                                  const PostDominatorTree *PDT) {
+  if (!ClPruneBlocks)
+    return true;
+
+  return !(isFullDominator(BB, DT) || isFullPostDominator(BB, PDT));
 }
 
 bool SanitizerCoverageModule::runOnFunction(Function &F) {
   if (F.empty())
     return false;
   if (F.getName().find(".module_ctor") != std::string::npos)
     return false; // Should not instrument sanitizer init functions.
   // Don't instrument functions using SEH for now. Splitting basic blocks like