diff options
author | Ahmed Charles <ahmedcharles@gmail.com> | 2014-03-07 20:03:18 +0000 |
---|---|---|
committer | Ahmed Charles <ahmedcharles@gmail.com> | 2014-03-07 20:03:18 +0000 |
commit | b89843299a118d9f97774f35e59f9b541ef5e284 (patch) | |
tree | ee6366d2f652d2475d52f6ea9b4fbbc64dc2647e /clang/tools | |
parent | 629afaefe0cd1a583ccee54918b7b13f48bfe273 (diff) | |
download | bcm5719-llvm-b89843299a118d9f97774f35e59f9b541ef5e284.tar.gz bcm5719-llvm-b89843299a118d9f97774f35e59f9b541ef5e284.zip |
Replace OwningPtr with std::unique_ptr.
This compiles cleanly with lldb/lld/clang-tools-extra/llvm.
llvm-svn: 203279
Diffstat (limited to 'clang/tools')
-rw-r--r-- | clang/tools/arcmt-test/arcmt-test.cpp | 10 | ||||
-rw-r--r-- | clang/tools/clang-check/ClangCheck.cpp | 2 | ||||
-rw-r--r-- | clang/tools/clang-format/ClangFormat.cpp | 2 | ||||
-rw-r--r-- | clang/tools/diagtool/ShowEnabledWarnings.cpp | 6 | ||||
-rw-r--r-- | clang/tools/driver/cc1_main.cpp | 2 | ||||
-rw-r--r-- | clang/tools/driver/cc1as_main.cpp | 31 | ||||
-rw-r--r-- | clang/tools/driver/driver.cpp | 9 | ||||
-rw-r--r-- | clang/tools/libclang/ARCMigrate.cpp | 4 | ||||
-rw-r--r-- | clang/tools/libclang/CIndex.cpp | 49 | ||||
-rw-r--r-- | clang/tools/libclang/CXLoadedDiagnostic.cpp | 9 | ||||
-rw-r--r-- | clang/tools/libclang/Indexing.cpp | 21 |
11 files changed, 69 insertions, 76 deletions
diff --git a/clang/tools/arcmt-test/arcmt-test.cpp b/clang/tools/arcmt-test/arcmt-test.cpp index 50426e3f420..518d06f2ad5 100644 --- a/clang/tools/arcmt-test/arcmt-test.cpp +++ b/clang/tools/arcmt-test/arcmt-test.cpp @@ -178,7 +178,7 @@ static bool performTransformations(StringRef resourcesPath, origCI.getMigratorOpts().NoFinalizeRemoval); assert(!transforms.empty()); - OwningPtr<PrintTransforms> transformPrinter; + std::unique_ptr<PrintTransforms> transformPrinter; if (OutputTransformations) transformPrinter.reset(new PrintTransforms(llvm::outs())); @@ -207,12 +207,12 @@ static bool performTransformations(StringRef resourcesPath, static bool filesCompareEqual(StringRef fname1, StringRef fname2) { using namespace llvm; - OwningPtr<MemoryBuffer> file1; + std::unique_ptr<MemoryBuffer> file1; MemoryBuffer::getFile(fname1, file1); if (!file1) return false; - - OwningPtr<MemoryBuffer> file2; + + std::unique_ptr<MemoryBuffer> file2; MemoryBuffer::getFile(fname2, file2); if (!file2) return false; @@ -238,7 +238,7 @@ static bool verifyTransformedFiles(ArrayRef<std::string> resultFiles) { resultMap[sys::path::stem(fname)] = fname; } - OwningPtr<MemoryBuffer> inputBuf; + std::unique_ptr<MemoryBuffer> inputBuf; if (RemappingsFile.empty()) MemoryBuffer::getSTDIN(inputBuf); else diff --git a/clang/tools/clang-check/ClangCheck.cpp b/clang/tools/clang-check/ClangCheck.cpp index 9cdaf878a2c..011cd3fad84 100644 --- a/clang/tools/clang-check/ClangCheck.cpp +++ b/clang/tools/clang-check/ClangCheck.cpp @@ -50,7 +50,7 @@ static cl::extrahelp MoreHelp( ); static cl::OptionCategory ClangCheckCategory("clang-check options"); -static OwningPtr<opt::OptTable> Options(createDriverOptTable()); +static std::unique_ptr<opt::OptTable> Options(createDriverOptTable()); static cl::opt<bool> ASTDump("ast-dump", cl::desc(Options->getOptionHelpText(options::OPT_ast_dump)), cl::cat(ClangCheckCategory)); diff --git a/clang/tools/clang-format/ClangFormat.cpp b/clang/tools/clang-format/ClangFormat.cpp index 9107fd2b109..6f94461aba3 100644 --- a/clang/tools/clang-format/ClangFormat.cpp +++ b/clang/tools/clang-format/ClangFormat.cpp @@ -208,7 +208,7 @@ static bool format(StringRef FileName) { IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs), new DiagnosticOptions); SourceManager Sources(Diagnostics, Files); - OwningPtr<MemoryBuffer> Code; + std::unique_ptr<MemoryBuffer> Code; if (error_code ec = MemoryBuffer::getFileOrSTDIN(FileName, Code)) { llvm::errs() << ec.message() << "\n"; return true; diff --git a/clang/tools/diagtool/ShowEnabledWarnings.cpp b/clang/tools/diagtool/ShowEnabledWarnings.cpp index 51213a41fc5..ad56b036044 100644 --- a/clang/tools/diagtool/ShowEnabledWarnings.cpp +++ b/clang/tools/diagtool/ShowEnabledWarnings.cpp @@ -64,9 +64,9 @@ createDiagnostics(unsigned int argc, char **argv) { new DiagnosticsEngine(DiagIDs, new DiagnosticOptions(), DiagsBuffer)); // Try to build a CompilerInvocation. - OwningPtr<CompilerInvocation> Invocation( - createInvocationFromCommandLine(ArrayRef<const char *>(argv, argc), - InterimDiags)); + std::unique_ptr<CompilerInvocation> Invocation( + createInvocationFromCommandLine(ArrayRef<const char *>(argv, argc), + InterimDiags)); if (!Invocation) return NULL; diff --git a/clang/tools/driver/cc1_main.cpp b/clang/tools/driver/cc1_main.cpp index 8738e0afecf..1c37c7ddeed 100644 --- a/clang/tools/driver/cc1_main.cpp +++ b/clang/tools/driver/cc1_main.cpp @@ -59,7 +59,7 @@ static void LLVMErrorHandler(void *UserData, const std::string &Message, int cc1_main(const char **ArgBegin, const char **ArgEnd, const char *Argv0, void *MainAddr) { - OwningPtr<CompilerInstance> Clang(new CompilerInstance()); + std::unique_ptr<CompilerInstance> Clang(new CompilerInstance()); IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs()); // Initialize targets first, so that --version shows registered targets. diff --git a/clang/tools/driver/cc1as_main.cpp b/clang/tools/driver/cc1as_main.cpp index e68bd025925..7d6af7925f2 100644 --- a/clang/tools/driver/cc1as_main.cpp +++ b/clang/tools/driver/cc1as_main.cpp @@ -151,10 +151,10 @@ bool AssemblerInvocation::CreateFromArgs(AssemblerInvocation &Opts, bool Success = true; // Parse the arguments. - OwningPtr<OptTable> OptTbl(createCC1AsOptTable()); + std::unique_ptr<OptTable> OptTbl(createCC1AsOptTable()); unsigned MissingArgIndex, MissingArgCount; - OwningPtr<InputArgList> Args( - OptTbl->ParseArgs(ArgBegin, ArgEnd,MissingArgIndex, MissingArgCount)); + std::unique_ptr<InputArgList> Args( + OptTbl->ParseArgs(ArgBegin, ArgEnd, MissingArgIndex, MissingArgCount)); // Check for missing argument error. if (MissingArgCount) { @@ -271,7 +271,7 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts, return false; } - OwningPtr<MemoryBuffer> BufferPtr; + std::unique_ptr<MemoryBuffer> BufferPtr; if (error_code ec = MemoryBuffer::getFileOrSTDIN(Opts.InputFile, BufferPtr)) { Error = ec.message(); Diags.Report(diag::err_fe_error_reading) << Opts.InputFile; @@ -288,10 +288,10 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts, // it later. SrcMgr.setIncludeDirs(Opts.IncludePaths); - OwningPtr<MCRegisterInfo> MRI(TheTarget->createMCRegInfo(Opts.Triple)); + std::unique_ptr<MCRegisterInfo> MRI(TheTarget->createMCRegInfo(Opts.Triple)); assert(MRI && "Unable to create target register info!"); - OwningPtr<MCAsmInfo> MAI(TheTarget->createMCAsmInfo(*MRI, Opts.Triple)); + std::unique_ptr<MCAsmInfo> MAI(TheTarget->createMCAsmInfo(*MRI, Opts.Triple)); assert(MAI && "Unable to create target asm info!"); bool IsBinary = Opts.OutputType == AssemblerInvocation::FT_Obj; @@ -301,7 +301,7 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts, // FIXME: This is not pretty. MCContext has a ptr to MCObjectFileInfo and // MCObjectFileInfo needs a MCContext reference in order to initialize itself. - OwningPtr<MCObjectFileInfo> MOFI(new MCObjectFileInfo()); + std::unique_ptr<MCObjectFileInfo> MOFI(new MCObjectFileInfo()); MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &SrcMgr); // FIXME: Assembler behavior can change with -static. MOFI->InitMCObjectFileInfo(Opts.Triple, @@ -327,11 +327,11 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts, FS += "," + Opts.Features[i]; } - OwningPtr<MCStreamer> Str; + std::unique_ptr<MCStreamer> Str; - OwningPtr<MCInstrInfo> MCII(TheTarget->createMCInstrInfo()); - OwningPtr<MCSubtargetInfo> - STI(TheTarget->createMCSubtargetInfo(Opts.Triple, Opts.CPU, FS)); + std::unique_ptr<MCInstrInfo> MCII(TheTarget->createMCInstrInfo()); + std::unique_ptr<MCSubtargetInfo> STI( + TheTarget->createMCSubtargetInfo(Opts.Triple, Opts.CPU, FS)); // FIXME: There is a bit of code duplication with addPassesToEmitFile. if (Opts.OutputType == AssemblerInvocation::FT_Asm) { @@ -363,9 +363,10 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts, Str.get()->InitSections(); } - OwningPtr<MCAsmParser> Parser(createMCAsmParser(SrcMgr, Ctx, - *Str.get(), *MAI)); - OwningPtr<MCTargetAsmParser> TAP(TheTarget->createMCAsmParser(*STI, *Parser, *MCII)); + std::unique_ptr<MCAsmParser> Parser( + createMCAsmParser(SrcMgr, Ctx, *Str.get(), *MAI)); + std::unique_ptr<MCTargetAsmParser> TAP( + TheTarget->createMCAsmParser(*STI, *Parser, *MCII)); if (!TAP) { Diags.Report(diag::err_target_unknown_triple) << Opts.Triple; return false; @@ -427,7 +428,7 @@ int cc1as_main(const char **ArgBegin, const char **ArgEnd, // Honor -help. if (Asm.ShowHelp) { - OwningPtr<OptTable> Opts(driver::createCC1AsOptTable()); + std::unique_ptr<OptTable> Opts(driver::createCC1AsOptTable()); Opts->PrintHelp(llvm::outs(), "clang -cc1as", "Clang Integrated Assembler"); return 0; } diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp index 90e3371a14f..6fca3ecbed9 100644 --- a/clang/tools/driver/driver.cpp +++ b/clang/tools/driver/driver.cpp @@ -341,11 +341,10 @@ int main(int argc_, const char **argv_) { IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions; { - OwningPtr<OptTable> Opts(createDriverOptTable()); + std::unique_ptr<OptTable> Opts(createDriverOptTable()); unsigned MissingArgIndex, MissingArgCount; - OwningPtr<InputArgList> Args(Opts->ParseArgs(argv.begin()+1, argv.end(), - MissingArgIndex, - MissingArgCount)); + std::unique_ptr<InputArgList> Args(Opts->ParseArgs( + argv.begin() + 1, argv.end(), MissingArgIndex, MissingArgCount)); // We ignore MissingArgCount and the return value of ParseDiagnosticArgs. // Any errors that would be diagnosed here will also be diagnosed later, // when the DiagnosticsEngine actually exists. @@ -408,7 +407,7 @@ int main(int argc_, const char **argv_) { if (TheDriver.CCLogDiagnostics) TheDriver.CCLogDiagnosticsFilename = ::getenv("CC_LOG_DIAGNOSTICS_FILE"); - OwningPtr<Compilation> C(TheDriver.BuildCompilation(argv)); + std::unique_ptr<Compilation> C(TheDriver.BuildCompilation(argv)); int Res = 0; SmallVector<std::pair<int, const Command *>, 4> FailingCommands; if (C.get()) diff --git a/clang/tools/libclang/ARCMigrate.cpp b/clang/tools/libclang/ARCMigrate.cpp index 1b80b2f5c32..dbb604d7972 100644 --- a/clang/tools/libclang/ARCMigrate.cpp +++ b/clang/tools/libclang/ARCMigrate.cpp @@ -55,7 +55,7 @@ CXRemapping clang_getRemappings(const char *migrate_dir_path) { } TextDiagnosticBuffer diagBuffer; - OwningPtr<Remap> remap(new Remap()); + std::unique_ptr<Remap> remap(new Remap()); bool err = arcmt::getFileRemappings(remap->Vec, migrate_dir_path,&diagBuffer); @@ -77,7 +77,7 @@ CXRemapping clang_getRemappingsFromFileList(const char **filePaths, unsigned numFiles) { bool Logging = ::getenv("LIBCLANG_LOGGING"); - OwningPtr<Remap> remap(new Remap()); + std::unique_ptr<Remap> remap(new Remap()); if (numFiles == 0) { if (Logging) diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp index 614bb0cbfc9..d98acb197fa 100644 --- a/clang/tools/libclang/CIndex.cpp +++ b/clang/tools/libclang/CIndex.cpp @@ -2723,8 +2723,8 @@ static void clang_parseTranslationUnit_Impl(void *UserData) { llvm::CrashRecoveryContextReleaseRefCleanup<DiagnosticsEngine> > DiagCleanup(Diags.getPtr()); - OwningPtr<std::vector<ASTUnit::RemappedFile> > - RemappedFiles(new std::vector<ASTUnit::RemappedFile>()); + std::unique_ptr<std::vector<ASTUnit::RemappedFile>> RemappedFiles( + new std::vector<ASTUnit::RemappedFile>()); // Recover resources if we crash before exiting this function. llvm::CrashRecoveryContextCleanupRegistrar< @@ -2738,8 +2738,8 @@ static void clang_parseTranslationUnit_Impl(void *UserData) { Buffer)); } - OwningPtr<std::vector<const char *> > - Args(new std::vector<const char*>()); + std::unique_ptr<std::vector<const char *>> Args( + new std::vector<const char *>()); // Recover resources if we crash before exiting this method. llvm::CrashRecoveryContextCleanupRegistrar<std::vector<const char*> > @@ -2779,26 +2779,17 @@ static void clang_parseTranslationUnit_Impl(void *UserData) { } unsigned NumErrors = Diags->getClient()->getNumErrors(); - OwningPtr<ASTUnit> ErrUnit; - OwningPtr<ASTUnit> Unit( - ASTUnit::LoadFromCommandLine(Args->size() ? &(*Args)[0] : 0 - /* vector::data() not portable */, - Args->size() ? (&(*Args)[0] + Args->size()) :0, - Diags, - CXXIdx->getClangResourcesPath(), - CXXIdx->getOnlyLocalDecls(), - /*CaptureDiagnostics=*/true, - *RemappedFiles.get(), - /*RemappedFilesKeepOriginalName=*/true, - PrecompilePreamble, - TUKind, - CacheCodeCompletionResults, - IncludeBriefCommentsInCodeCompletion, - /*AllowPCHWithCompilerErrors=*/true, - SkipFunctionBodies, - /*UserFilesAreVolatile=*/true, - ForSerialization, - &ErrUnit)); + std::unique_ptr<ASTUnit> ErrUnit; + std::unique_ptr<ASTUnit> Unit(ASTUnit::LoadFromCommandLine( + Args->size() ? &(*Args)[0] : 0 + /* vector::data() not portable */, + Args->size() ? (&(*Args)[0] + Args->size()) : 0, Diags, + CXXIdx->getClangResourcesPath(), CXXIdx->getOnlyLocalDecls(), + /*CaptureDiagnostics=*/true, *RemappedFiles.get(), + /*RemappedFilesKeepOriginalName=*/true, PrecompilePreamble, TUKind, + CacheCodeCompletionResults, IncludeBriefCommentsInCodeCompletion, + /*AllowPCHWithCompilerErrors=*/true, SkipFunctionBodies, + /*UserFilesAreVolatile=*/true, ForSerialization, &ErrUnit)); if (NumErrors != Diags->getClient()->getNumErrors()) { // Make sure to check that 'Unit' is non-NULL. @@ -3019,10 +3010,10 @@ static void clang_reparseTranslationUnit_Impl(void *UserData) { ASTUnit *CXXUnit = cxtu::getASTUnit(TU); ASTUnit::ConcurrencyCheck Check(*CXXUnit); - - OwningPtr<std::vector<ASTUnit::RemappedFile> > - RemappedFiles(new std::vector<ASTUnit::RemappedFile>()); - + + std::unique_ptr<std::vector<ASTUnit::RemappedFile>> RemappedFiles( + new std::vector<ASTUnit::RemappedFile>()); + // Recover resources if we crash before exiting this function. llvm::CrashRecoveryContextCleanupRegistrar< std::vector<ASTUnit::RemappedFile> > RemappedCleanup(RemappedFiles.get()); @@ -6524,7 +6515,7 @@ CXTUResourceUsage clang_getCXTUResourceUsage(CXTranslationUnit TU) { } ASTUnit *astUnit = cxtu::getASTUnit(TU); - OwningPtr<MemUsageEntries> entries(new MemUsageEntries()); + std::unique_ptr<MemUsageEntries> entries(new MemUsageEntries()); ASTContext &astContext = astUnit->getASTContext(); // How much memory is used by AST nodes and types? diff --git a/clang/tools/libclang/CXLoadedDiagnostic.cpp b/clang/tools/libclang/CXLoadedDiagnostic.cpp index 2871256b0cb..679c5285263 100644 --- a/clang/tools/libclang/CXLoadedDiagnostic.cpp +++ b/clang/tools/libclang/CXLoadedDiagnostic.cpp @@ -259,7 +259,7 @@ CXDiagnosticSet DiagLoader::load(const char *file) { FileSystemOptions FO; FileManager FileMgr(FO); - OwningPtr<llvm::MemoryBuffer> Buffer; + std::unique_ptr<llvm::MemoryBuffer> Buffer; Buffer.reset(FileMgr.getBufferForFile(file)); if (!Buffer) { @@ -284,7 +284,8 @@ CXDiagnosticSet DiagLoader::load(const char *file) { return 0; } - OwningPtr<CXLoadedDiagnosticSetImpl> Diags(new CXLoadedDiagnosticSetImpl()); + std::unique_ptr<CXLoadedDiagnosticSetImpl> Diags( + new CXLoadedDiagnosticSetImpl()); while (true) { unsigned BlockID = 0; @@ -539,8 +540,8 @@ LoadResult DiagLoader::readDiagnosticBlock(llvm::BitstreamCursor &Stream, reportInvalidFile("malformed diagnostic block"); return Failure; } - - OwningPtr<CXLoadedDiagnostic> D(new CXLoadedDiagnostic()); + + std::unique_ptr<CXLoadedDiagnostic> D(new CXLoadedDiagnostic()); RecordData Record; while (true) { diff --git a/clang/tools/libclang/Indexing.cpp b/clang/tools/libclang/Indexing.cpp index 29ecd1ccc78..24c13622172 100644 --- a/clang/tools/libclang/Indexing.cpp +++ b/clang/tools/libclang/Indexing.cpp @@ -411,7 +411,7 @@ class IndexingFrontendAction : public ASTFrontendAction { CXTranslationUnit CXTU; SessionSkipBodyData *SKData; - OwningPtr<TUSkipBodyControl> SKCtrl; + std::unique_ptr<TUSkipBodyControl> SKCtrl; public: IndexingFrontendAction(CXClientData clientData, @@ -465,7 +465,7 @@ public: struct IndexSessionData { CXIndex CIdx; - OwningPtr<SessionSkipBodyData> SkipBodyData; + std::unique_ptr<SessionSkipBodyData> SkipBodyData; explicit IndexSessionData(CXIndex cIdx) : CIdx(cIdx), SkipBodyData(new SessionSkipBodyData) {} @@ -559,9 +559,9 @@ static void clang_indexSourceFile_Impl(void *UserData) { llvm::CrashRecoveryContextCleanupRegistrar<DiagnosticsEngine, llvm::CrashRecoveryContextReleaseRefCleanup<DiagnosticsEngine> > DiagCleanup(Diags.getPtr()); - - OwningPtr<std::vector<const char *> > - Args(new std::vector<const char*>()); + + std::unique_ptr<std::vector<const char *>> Args( + new std::vector<const char *>()); // Recover resources if we crash before exiting this method. llvm::CrashRecoveryContextCleanupRegistrar<std::vector<const char*> > @@ -592,7 +592,7 @@ static void clang_indexSourceFile_Impl(void *UserData) { if (CInvok->getFrontendOpts().Inputs.empty()) return; - OwningPtr<MemBufferOwner> BufOwner(new MemBufferOwner()); + std::unique_ptr<MemBufferOwner> BufOwner(new MemBufferOwner()); // Recover resources if we crash before exiting this method. llvm::CrashRecoveryContextCleanupRegistrar<MemBufferOwner> @@ -618,7 +618,8 @@ static void clang_indexSourceFile_Impl(void *UserData) { ASTUnit *Unit = ASTUnit::create(CInvok.getPtr(), Diags, CaptureDiagnostics, /*UserFilesAreVolatile=*/true); - OwningPtr<CXTUOwner> CXTU(new CXTUOwner(MakeCXTranslationUnit(CXXIdx, Unit))); + std::unique_ptr<CXTUOwner> CXTU( + new CXTUOwner(MakeCXTranslationUnit(CXXIdx, Unit))); // Recover resources if we crash before exiting this method. llvm::CrashRecoveryContextCleanupRegistrar<CXTUOwner> @@ -631,7 +632,7 @@ static void clang_indexSourceFile_Impl(void *UserData) { if (SkipBodies) CInvok->getFrontendOpts().SkipFunctionBodies = true; - OwningPtr<IndexingFrontendAction> IndexAction; + std::unique_ptr<IndexingFrontendAction> IndexAction; IndexAction.reset(new IndexingFrontendAction(client_data, CB, index_options, CXTU->getTU(), SkipBodies ? IdxSession->SkipBodyData.get() : 0)); @@ -790,14 +791,14 @@ static void clang_indexTranslationUnit_Impl(void *UserData) { ? index_callbacks_size : sizeof(CB); memcpy(&CB, client_index_callbacks, ClientCBSize); - OwningPtr<IndexingContext> IndexCtx; + std::unique_ptr<IndexingContext> IndexCtx; IndexCtx.reset(new IndexingContext(client_data, CB, index_options, TU)); // Recover resources if we crash before exiting this method. llvm::CrashRecoveryContextCleanupRegistrar<IndexingContext> IndexCtxCleanup(IndexCtx.get()); - OwningPtr<IndexingConsumer> IndexConsumer; + std::unique_ptr<IndexingConsumer> IndexConsumer; IndexConsumer.reset(new IndexingConsumer(*IndexCtx, 0)); // Recover resources if we crash before exiting this method. |