[llvm] r264213 - [sancov] code readability improvement.
Mike Aizatsky via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 23 16:15:04 PDT 2016
Author: aizatsky
Date: Wed Mar 23 18:15:03 2016
New Revision: 264213
URL: http://llvm.org/viewvc/llvm-project?rev=264213&view=rev
Log:
[sancov] code readability improvement.
Summary: Reply to http://reviews.llvm.org/D18341
Differential Revision: http://reviews.llvm.org/D18406
Modified:
llvm/trunk/lib/Transforms/Instrumentation/SanitizerCoverage.cpp
Modified: llvm/trunk/lib/Transforms/Instrumentation/SanitizerCoverage.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/SanitizerCoverage.cpp?rev=264213&r1=264212&r2=264213&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/SanitizerCoverage.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/SanitizerCoverage.cpp Wed Mar 23 18:15:03 2016
@@ -315,24 +315,39 @@ bool SanitizerCoverageModule::runOnModul
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 !(DominatesAll || PreDominatesAll);
+ return true;
+}
+
+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) {
More information about the llvm-commits
mailing list