summaryrefslogtreecommitdiffstats
path: root/clang-tools-extra/change-namespace
diff options
context:
space:
mode:
authorEric Liu <ioeric@google.com>2017-02-24 12:56:51 +0000
committerEric Liu <ioeric@google.com>2017-02-24 12:56:51 +0000
commit4c8767fa55d6c2158cbf88738d6d234031865a89 (patch)
tree684b9218af050c5196377ecfdc31e75c796d1c6d /clang-tools-extra/change-namespace
parentebc35129e51feb36b3b4a3b228635c0126e5e0d6 (diff)
downloadbcm5719-llvm-4c8767fa55d6c2158cbf88738d6d234031865a89.tar.gz
bcm5719-llvm-4c8767fa55d6c2158cbf88738d6d234031865a89.zip
[change-namespace] fix asan failure in r296110.
llvm-svn: 296113
Diffstat (limited to 'clang-tools-extra/change-namespace')
-rw-r--r--clang-tools-extra/change-namespace/tool/ClangChangeNamespace.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/clang-tools-extra/change-namespace/tool/ClangChangeNamespace.cpp b/clang-tools-extra/change-namespace/tool/ClangChangeNamespace.cpp
index 02a97839f15..6a17f192776 100644
--- a/clang-tools-extra/change-namespace/tool/ClangChangeNamespace.cpp
+++ b/clang-tools-extra/change-namespace/tool/ClangChangeNamespace.cpp
@@ -80,15 +80,16 @@ cl::opt<std::string> WhiteListFile(
cl::init(""), cl::cat(ChangeNamespaceCategory));
llvm::ErrorOr<std::vector<std::string>> GetWhiteListedSymbolPatterns() {
+ if (WhiteListFile.empty())
+ return std::vector<std::string>();
+
llvm::SmallVector<StringRef, 8> Lines;
- if (!WhiteListFile.empty()) {
- llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
- llvm::MemoryBuffer::getFile(WhiteListFile);
- if (!File)
- return File.getError();
- llvm::StringRef Content = File.get()->getBuffer();
- Content.split(Lines, '\n', /*MaxSplit=*/-1, /*KeepEmpty=*/false);
- }
+ llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
+ llvm::MemoryBuffer::getFile(WhiteListFile);
+ if (!File)
+ return File.getError();
+ llvm::StringRef Content = File.get()->getBuffer();
+ Content.split(Lines, '\n', /*MaxSplit=*/-1, /*KeepEmpty=*/false);
return std::vector<std::string>(Lines.begin(), Lines.end());
}
OpenPOWER on IntegriCloud