Author: spyffe Date: Mon Jul 10 17:27:57 2017 New Revision: 307602 URL: http://llvm.org/viewvc/llvm-project?rev=307602&view=rev Log: [clang-import-test] Committed missed update to clang-import-test.cpp
I didn't commit clang-import-test.cpp in r307600, but it had some changes that were part of https://reviews.llvm.org/D35220 Corrected that now. Modified: cfe/trunk/tools/clang-import-test/clang-import-test.cpp Modified: cfe/trunk/tools/clang-import-test/clang-import-test.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-import-test/clang-import-test.cpp?rev=307602&r1=307601&r2=307602&view=diff ============================================================================== --- cfe/trunk/tools/clang-import-test/clang-import-test.cpp (original) +++ cfe/trunk/tools/clang-import-test/clang-import-test.cpp Mon Jul 10 17:27:57 2017 @@ -182,14 +182,6 @@ BuildCompilerInstance(ArrayRef<const cha return Ins; } -std::unique_ptr<CompilerInstance> -BuildCompilerInstance(ArrayRef<std::string> ClangArgs) { - std::vector<const char *> ClangArgv(ClangArgs.size()); - std::transform(ClangArgs.begin(), ClangArgs.end(), ClangArgv.begin(), - [](const std::string &s) -> const char * { return s.data(); }); - return init_convenience::BuildCompilerInstance(ClangArgv); -} - std::unique_ptr<ASTContext> BuildASTContext(CompilerInstance &CI, SelectorTable &ST, Builtin::Context &BC) { auto AST = llvm::make_unique<ASTContext>( @@ -313,14 +305,8 @@ int main(int argc, const char **argv) { std::vector<std::unique_ptr<CompilerInstance>> IndirectCIs; if (!Direct) { for (auto &ImportCI : ImportCIs) { - llvm::Expected<std::unique_ptr<CompilerInstance>> IndirectCI = - BuildIndirect(ImportCI); - if (auto E = IndirectCI.takeError()) { - llvm::errs() << llvm::toString(std::move(E)); - exit(-1); - } else { - IndirectCIs.push_back(std::move(*IndirectCI)); - } + std::unique_ptr<CompilerInstance> IndirectCI = BuildIndirect(ImportCI); + IndirectCIs.push_back(std::move(IndirectCI)); } } llvm::Expected<std::unique_ptr<CompilerInstance>> ExpressionCI = _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits