2 files changed, 5 insertions, 0 deletions
diff --git a/llvm/lib/Transforms/Instrumentation/BlackList.cpp b/llvm/lib/Transforms/Instrumentation/BlackList.cpp
index 2cb119964a3..ef34b8a56d8 100644
--- a/llvm/lib/Transforms/Instrumentation/BlackList.cpp
+++ b/llvm/lib/Transforms/Instrumentation/BlackList.cpp
@@ -45,6 +45,9 @@ BlackList::BlackList(const StringRef Path) {
   StringMap<std::string> Regexps;
   for (SmallVector<StringRef, 16>::iterator I = Lines.begin(), E = Lines.end();
        I != E; ++I) {
+    // Ignore empty lines and lines starting with "#"
+    if (I->empty() || I->startswith("#"))
+      continue;
     // Get our prefix and unparsed regexp.
     std::pair<StringRef, StringRef> SplitLine = I->split(":");
     StringRef Prefix = SplitLine.first;
diff --git a/llvm/lib/Transforms/Instrumentation/BlackList.h b/llvm/lib/Transforms/Instrumentation/BlackList.h
index 73977fc10a6..f3c05a5058c 100644
--- a/llvm/lib/Transforms/Instrumentation/BlackList.h
+++ b/llvm/lib/Transforms/Instrumentation/BlackList.h
@@ -12,7 +12,9 @@
 //
 // The blacklist disables instrumentation of various functions and global
 // variables.  Each line contains a prefix, followed by a wild card expression.
+// Empty lines and lines starting with "#" are ignored.
 // ---
+// # Blacklisted items:
 // fun:*_ZN4base6subtle*
 // global:*global_with_bad_access_or_initialization*
 // global-init:*global_with_initialization_issues*