[llvm-commits] [llvm] r168833 - /llvm/trunk/lib/Transforms/Instrumentation/BlackList.cpp

[Alexey Samsonov]

Thanks!

On Wed, Nov 28, 2012 at 4:01 PM, Nick Lewycky <nicholas at mxc.ca> wrote:

> Author: nicholas
> Date: Wed Nov 28 18:01:38 2012
> New Revision: 168833
>
> URL: http://llvm.org/viewvc/llvm-project?rev=168833&view=rev
> Log:
> Issue a fatal error if the line doesn't have a regular expression.
>
> Also a couple not-user-visible changes; using empty() instead of size(),
> and
> make inSection() not insert NULL Regex*'s into StringMap when doing a
> lookup.
>
> Modified:
>     llvm/trunk/lib/Transforms/Instrumentation/BlackList.cpp
>
> Modified: llvm/trunk/lib/Transforms/Instrumentation/BlackList.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/BlackList.cpp?rev=168833&r1=168832&r2=168833&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Instrumentation/BlackList.cpp (original)
> +++ llvm/trunk/lib/Transforms/Instrumentation/BlackList.cpp Wed Nov 28
> 18:01:38 2012
> @@ -33,7 +33,7 @@
>
>  BlackList::BlackList(const StringRef Path) {
>    // Validate and open blacklist file.
> -  if (!Path.size()) return;
> +  if (Path.empty()) return;
>    OwningPtr<MemoryBuffer> File;
>    if (error_code EC = MemoryBuffer::getFile(Path, File)) {
>      report_fatal_error("Can't open blacklist file: " + Path + ": " +
> @@ -53,6 +53,10 @@
>      std::pair<StringRef, StringRef> SplitLine = I->split(":");
>      StringRef Prefix = SplitLine.first;
>      std::string Regexp = SplitLine.second;
> +    if (Regexp.empty()) {
> +      // Missing ':' in the line.
> +      report_fatal_error("malformed blacklist line: " + SplitLine.first);
> +    }
>
>      // Replace * with .*
>      for (size_t pos = 0; (pos = Regexp.find("*", pos)) !=
> std::string::npos;
> @@ -69,7 +73,7 @@
>      }
>
>      // Add this regexp into the proper group by its prefix.
> -    if (Regexps[Prefix].size())
> +    if (!Regexps[Prefix].empty())
>        Regexps[Prefix] += "|";
>      Regexps[Prefix] += Regexp;
>    }
> @@ -110,10 +114,12 @@
>            inSection("global-init-type", GetGVTypeString(G)));
>  }
>
> -bool BlackList::inSection(const StringRef Section,
> -                          const StringRef Query) {
> -  Regex *FunctionRegex = Entries[Section];
> -  return FunctionRegex ? FunctionRegex->match(Query) : false;
> +bool BlackList::inSection(const StringRef Section, const StringRef Query)
> {
> +  StringMap<Regex*>::iterator I = Entries.find(Section);
> +  if (I == Entries.end()) return false;
> +
> +  Regex *FunctionRegex = I->getValue();
> +  return FunctionRegex->match(Query);
>  }
>
>  }  // namespace llvm
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>



-- 
Alexey Samsonov, MSK
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20121128/03caf6b8/attachment.html>