diff options
Diffstat (limited to 'unittests/Lex')
| -rw-r--r-- | unittests/Lex/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | unittests/Lex/LexerTest.cpp | 4 | ||||
| -rw-r--r-- | unittests/Lex/PPCallbacksTest.cpp | 18 | ||||
| -rw-r--r-- | unittests/Lex/PPConditionalDirectiveRecordTest.cpp | 6 |
4 files changed, 14 insertions, 15 deletions
diff --git a/unittests/Lex/CMakeLists.txt b/unittests/Lex/CMakeLists.txt index 1fb57cfdfba07..461e0d95fc87e 100644 --- a/unittests/Lex/CMakeLists.txt +++ b/unittests/Lex/CMakeLists.txt @@ -14,5 +14,4 @@ target_link_libraries(LexTests clangLex clangParse clangSema - clangSerialization ) diff --git a/unittests/Lex/LexerTest.cpp b/unittests/Lex/LexerTest.cpp index 2d75b52276ccc..85987bf001612 100644 --- a/unittests/Lex/LexerTest.cpp +++ b/unittests/Lex/LexerTest.cpp @@ -62,8 +62,8 @@ protected: std::vector<Token> CheckLex(StringRef Source, ArrayRef<tok::TokenKind> ExpectedTokens) { - MemoryBuffer *buf = MemoryBuffer::getMemBuffer(Source); - SourceMgr.setMainFileID(SourceMgr.createFileID(buf)); + std::unique_ptr<MemoryBuffer> Buf = MemoryBuffer::getMemBuffer(Source); + SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(Buf))); VoidModuleLoader ModLoader; HeaderSearch HeaderInfo(new HeaderSearchOptions, SourceMgr, Diags, LangOpts, diff --git a/unittests/Lex/PPCallbacksTest.cpp b/unittests/Lex/PPCallbacksTest.cpp index a1af754036388..bb27bac6ed660 100644 --- a/unittests/Lex/PPCallbacksTest.cpp +++ b/unittests/Lex/PPCallbacksTest.cpp @@ -27,8 +27,6 @@ #include "llvm/Support/Path.h" #include "gtest/gtest.h" -using namespace llvm; -using namespace llvm::sys; using namespace clang; namespace { @@ -142,7 +140,7 @@ protected: FileMgr.getVirtualFile(HeaderPath, 0, 0); // Add header's parent path to search path. - StringRef SearchPath = path::parent_path(HeaderPath); + StringRef SearchPath = llvm::sys::path::parent_path(HeaderPath); const DirectoryEntry *DE = FileMgr.getDirectory(SearchPath); DirectoryLookup DL(DE, SrcMgr::C_User, false); HeaderInfo.AddSearchPath(DL, IsSystemHeader); @@ -160,8 +158,9 @@ protected: // the InclusionDirective callback. CharSourceRange InclusionDirectiveFilenameRange(const char* SourceText, const char* HeaderPath, bool SystemHeader) { - MemoryBuffer *Buf = MemoryBuffer::getMemBuffer(SourceText); - SourceMgr.setMainFileID(SourceMgr.createFileID(Buf)); + std::unique_ptr<llvm::MemoryBuffer> Buf = + llvm::MemoryBuffer::getMemBuffer(SourceText); + SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(Buf))); VoidModuleLoader ModLoader; @@ -176,7 +175,7 @@ protected: /*OwnsHeaderSearch =*/false); PP.Initialize(*Target); InclusionDirectiveCallbacks* Callbacks = new InclusionDirectiveCallbacks; - PP.addPPCallbacks(Callbacks); // Takes ownership. + PP.addPPCallbacks(std::unique_ptr<PPCallbacks>(Callbacks)); // Lex source text. PP.EnterMainSourceFile(); @@ -197,8 +196,9 @@ protected: LangOptions OpenCLLangOpts; OpenCLLangOpts.OpenCL = 1; - MemoryBuffer* sourceBuf = MemoryBuffer::getMemBuffer(SourceText, "test.cl"); - SourceMgr.setMainFileID(SourceMgr.createFileID(sourceBuf)); + std::unique_ptr<llvm::MemoryBuffer> SourceBuf = + llvm::MemoryBuffer::getMemBuffer(SourceText, "test.cl"); + SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(SourceBuf))); VoidModuleLoader ModLoader; HeaderSearch HeaderInfo(new HeaderSearchOptions, SourceMgr, Diags, @@ -221,7 +221,7 @@ protected: Sema S(PP, Context, Consumer); Parser P(PP, S, false); PragmaOpenCLExtensionCallbacks* Callbacks = new PragmaOpenCLExtensionCallbacks; - PP.addPPCallbacks(Callbacks); // Takes ownership. + PP.addPPCallbacks(std::unique_ptr<PPCallbacks>(Callbacks)); // Lex source text. PP.EnterMainSourceFile(); diff --git a/unittests/Lex/PPConditionalDirectiveRecordTest.cpp b/unittests/Lex/PPConditionalDirectiveRecordTest.cpp index e63106c295a34..946cb88b9810b 100644 --- a/unittests/Lex/PPConditionalDirectiveRecordTest.cpp +++ b/unittests/Lex/PPConditionalDirectiveRecordTest.cpp @@ -90,8 +90,8 @@ TEST_F(PPConditionalDirectiveRecordTest, PPRecAPI) { "#endif\n" "9\n"; - MemoryBuffer *buf = MemoryBuffer::getMemBuffer(source); - SourceMgr.setMainFileID(SourceMgr.createFileID(buf)); + std::unique_ptr<MemoryBuffer> Buf = MemoryBuffer::getMemBuffer(source); + SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(Buf))); VoidModuleLoader ModLoader; HeaderSearch HeaderInfo(new HeaderSearchOptions, SourceMgr, Diags, LangOpts, @@ -103,7 +103,7 @@ TEST_F(PPConditionalDirectiveRecordTest, PPRecAPI) { PP.Initialize(*Target); PPConditionalDirectiveRecord * PPRec = new PPConditionalDirectiveRecord(SourceMgr); - PP.addPPCallbacks(PPRec); + PP.addPPCallbacks(std::unique_ptr<PPCallbacks>(PPRec)); PP.EnterMainSourceFile(); std::vector<Token> toks; |