From 1e4c01b79273b9cd4e9e9ecfd3422df3900b8356 Mon Sep 17 00:00:00 2001 From: Dylan Noblesmith Date: Mon, 13 Feb 2012 12:32:21 +0000 Subject: [PATCH] drop more llvm:: prefixes on OwningPtr<> More cleanup after r149798. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@150379 91177308-0d34-0410-b5e6-96231b3b80d8 --- examples/analyzer-plugin/MainCallChecker.cpp | 2 +- examples/clang-interpreter/main.cpp | 8 ++++---- examples/wpa/clang-wpa.cpp | 6 +++--- tools/arcmt-test/arcmt-test.cpp | 2 +- tools/driver/cc1_main.cpp | 2 +- tools/driver/cc1as_main.cpp | 2 +- tools/driver/driver.cpp | 4 ++-- tools/libclang/ARCMigrate.cpp | 2 +- tools/libclang/CIndex.cpp | 10 +++++----- tools/libclang/CIndexUSRs.cpp | 2 +- tools/libclang/CXLoadedDiagnostic.cpp | 6 +++--- tools/libclang/Indexing.cpp | 12 ++++++------ 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/examples/analyzer-plugin/MainCallChecker.cpp b/examples/analyzer-plugin/MainCallChecker.cpp index 34fb578c01..48a979548f 100644 --- a/examples/analyzer-plugin/MainCallChecker.cpp +++ b/examples/analyzer-plugin/MainCallChecker.cpp @@ -8,7 +8,7 @@ using namespace ento; namespace { class MainCallChecker : public Checker < check::PreStmt > { - mutable llvm::OwningPtr BT; + mutable OwningPtr BT; public: void checkPreStmt(const CallExpr *CE, CheckerContext &C) const; diff --git a/examples/clang-interpreter/main.cpp b/examples/clang-interpreter/main.cpp index 8ab1a18255..d0db740ca8 100644 --- a/examples/clang-interpreter/main.cpp +++ b/examples/clang-interpreter/main.cpp @@ -46,7 +46,7 @@ static int Execute(llvm::Module *Mod, char * const *envp) { llvm::InitializeNativeTarget(); std::string Error; - llvm::OwningPtr EE( + OwningPtr EE( llvm::ExecutionEngine::createJIT(Mod, &Error)); if (!EE) { llvm::errs() << "unable to make execution engine: " << Error << "\n"; @@ -83,7 +83,7 @@ int main(int argc, const char **argv, char * const *envp) { // (basically, exactly one input, and the operation mode is hard wired). llvm::SmallVector Args(argv, argv + argc); Args.push_back("-fsyntax-only"); - llvm::OwningPtr C(TheDriver.BuildCompilation(Args)); + OwningPtr C(TheDriver.BuildCompilation(Args)); if (!C) return 0; @@ -108,7 +108,7 @@ int main(int argc, const char **argv, char * const *envp) { // Initialize a compiler invocation object from the clang (-cc1) arguments. const driver::ArgStringList &CCArgs = Cmd->getArguments(); - llvm::OwningPtr CI(new CompilerInvocation); + OwningPtr CI(new CompilerInvocation); CompilerInvocation::CreateFromArgs(*CI, const_cast(CCArgs.data()), const_cast(CCArgs.data()) + @@ -140,7 +140,7 @@ int main(int argc, const char **argv, char * const *envp) { CompilerInvocation::GetResourcesPath(argv[0], MainAddr); // Create and execute the frontend to generate an LLVM bitcode module. - llvm::OwningPtr Act(new EmitLLVMOnlyAction()); + OwningPtr Act(new EmitLLVMOnlyAction()); if (!Clang.ExecuteAction(*Act)) return 1; diff --git a/examples/wpa/clang-wpa.cpp b/examples/wpa/clang-wpa.cpp index 89eddb3562..869c540dea 100644 --- a/examples/wpa/clang-wpa.cpp +++ b/examples/wpa/clang-wpa.cpp @@ -94,7 +94,7 @@ int main(int argc, char **argv) { = CompilerInstance::createDiagnostics(DiagOpts, argc, argv); for (unsigned i = 0, e = InputFilenames.size(); i != e; ++i) { const std::string &InFile = InputFilenames[i]; - llvm::OwningPtr AST(ASTUnit::LoadFromASTFile(InFile, Diags, + OwningPtr AST(ASTUnit::LoadFromASTFile(InFile, Diags, FileSystemOptions(), false, 0, 0, true)); if (!AST) @@ -104,7 +104,7 @@ int main(int argc, char **argv) { } if (ViewCallGraph) { - llvm::OwningPtr CG; + OwningPtr CG; CG.reset(new CallGraph(Prog)); for (unsigned i = 0, e = ASTUnits.size(); i != e; ++i) @@ -154,7 +154,7 @@ int main(int argc, char **argv) { if (PP.getLangOptions().ObjC1) Opts.CheckersControlList.push_back(std::make_pair("cocoa", true)); - llvm::OwningPtr checkerMgr; + OwningPtr checkerMgr; checkerMgr.reset(ento::registerCheckers(Opts, PP.getLangOptions(), PP.getDiagnostics())); diff --git a/tools/arcmt-test/arcmt-test.cpp b/tools/arcmt-test/arcmt-test.cpp index 2fd1444159..0ac7837d3e 100644 --- a/tools/arcmt-test/arcmt-test.cpp +++ b/tools/arcmt-test/arcmt-test.cpp @@ -177,7 +177,7 @@ static bool performTransformations(StringRef resourcesPath, origCI.getMigratorOpts().NoFinalizeRemoval); assert(!transforms.empty()); - llvm::OwningPtr transformPrinter; + OwningPtr transformPrinter; if (OutputTransformations) transformPrinter.reset(new PrintTransforms(llvm::outs())); diff --git a/tools/driver/cc1_main.cpp b/tools/driver/cc1_main.cpp index ad3f3502ec..e491d6199a 100644 --- a/tools/driver/cc1_main.cpp +++ b/tools/driver/cc1_main.cpp @@ -117,7 +117,7 @@ static int cc1_test(DiagnosticsEngine &Diags, int cc1_main(const char **ArgBegin, const char **ArgEnd, const char *Argv0, void *MainAddr) { - llvm::OwningPtr Clang(new CompilerInstance()); + OwningPtr Clang(new CompilerInstance()); llvm::IntrusiveRefCntPtr DiagID(new DiagnosticIDs()); // Run clang -cc1 test. diff --git a/tools/driver/cc1as_main.cpp b/tools/driver/cc1as_main.cpp index fc8c5dca99..cc4400ab31 100644 --- a/tools/driver/cc1as_main.cpp +++ b/tools/driver/cc1as_main.cpp @@ -411,7 +411,7 @@ int cc1as_main(const char **ArgBegin, const char **ArgEnd, // Honor -help. if (Asm.ShowHelp) { - llvm::OwningPtr Opts(driver::createCC1AsOptTable()); + OwningPtr Opts(driver::createCC1AsOptTable()); Opts->PrintHelp(llvm::outs(), "clang -cc1as", "Clang Integrated Assembler"); return 0; } diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp index e399790827..784b51d59f 100644 --- a/tools/driver/driver.cpp +++ b/tools/driver/driver.cpp @@ -186,7 +186,7 @@ static void ExpandArgsFromBuf(const char *Arg, SmallVectorImpl &ArgVector, std::set &SavedStrings) { const char *FName = Arg + 1; - llvm::OwningPtr MemBuf; + OwningPtr MemBuf; if (llvm::MemoryBuffer::getFile(FName, MemBuf)) { ArgVector.push_back(SaveStringInSet(SavedStrings, Arg)); return; @@ -448,7 +448,7 @@ int main(int argc_, const char **argv_) { argv.insert(&argv[1], ExtraArgs.begin(), ExtraArgs.end()); } - llvm::OwningPtr C(TheDriver.BuildCompilation(argv)); + OwningPtr C(TheDriver.BuildCompilation(argv)); int Res = 0; const Command *FailingCommand = 0; if (C.get()) diff --git a/tools/libclang/ARCMigrate.cpp b/tools/libclang/ARCMigrate.cpp index 39c7d84d51..58f8ba454d 100644 --- a/tools/libclang/ARCMigrate.cpp +++ b/tools/libclang/ARCMigrate.cpp @@ -56,7 +56,7 @@ CXRemapping clang_getRemappings(const char *migrate_dir_path) { } TextDiagnosticBuffer diagBuffer; - llvm::OwningPtr remap(new Remap()); + OwningPtr remap(new Remap()); bool err = arcmt::getFileRemappings(remap->Vec, migrate_dir_path,&diagBuffer); diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index f6e4d99671..8071378ac6 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -2457,7 +2457,7 @@ static void clang_parseTranslationUnit_Impl(void *UserData) { llvm::CrashRecoveryContextReleaseRefCleanup > DiagCleanup(Diags.getPtr()); - llvm::OwningPtr > + OwningPtr > RemappedFiles(new std::vector()); // Recover resources if we crash before exiting this function. @@ -2472,7 +2472,7 @@ static void clang_parseTranslationUnit_Impl(void *UserData) { Buffer)); } - llvm::OwningPtr > + OwningPtr > Args(new std::vector()); // Recover resources if we crash before exiting this method. @@ -2516,7 +2516,7 @@ static void clang_parseTranslationUnit_Impl(void *UserData) { } unsigned NumErrors = Diags->getClient()->getNumErrors(); - llvm::OwningPtr Unit( + OwningPtr Unit( ASTUnit::LoadFromCommandLine(Args->size() ? &(*Args)[0] : 0 /* vector::data() not portable */, Args->size() ? (&(*Args)[0] + Args->size()) :0, @@ -2658,7 +2658,7 @@ static void clang_reparseTranslationUnit_Impl(void *UserData) { ASTUnit *CXXUnit = static_cast(TU->TUData); ASTUnit::ConcurrencyCheck Check(*CXXUnit); - llvm::OwningPtr > + OwningPtr > RemappedFiles(new std::vector()); // Recover resources if we crash before exiting this function. @@ -5448,7 +5448,7 @@ CXTUResourceUsage clang_getCXTUResourceUsage(CXTranslationUnit TU) { } ASTUnit *astUnit = static_cast(TU->TUData); - llvm::OwningPtr entries(new MemUsageEntries()); + OwningPtr entries(new MemUsageEntries()); ASTContext &astContext = astUnit->getASTContext(); // How much memory is used by AST nodes and types? diff --git a/tools/libclang/CIndexUSRs.cpp b/tools/libclang/CIndexUSRs.cpp index f550394269..690e84f2e5 100644 --- a/tools/libclang/CIndexUSRs.cpp +++ b/tools/libclang/CIndexUSRs.cpp @@ -30,7 +30,7 @@ using namespace clang::cxstring; namespace { class USRGenerator : public DeclVisitor { - llvm::OwningPtr > OwnedBuf; + OwningPtr > OwnedBuf; SmallVectorImpl &Buf; llvm::raw_svector_ostream Out; bool IgnoreResults; diff --git a/tools/libclang/CXLoadedDiagnostic.cpp b/tools/libclang/CXLoadedDiagnostic.cpp index 09049e8a0e..d52c18319f 100644 --- a/tools/libclang/CXLoadedDiagnostic.cpp +++ b/tools/libclang/CXLoadedDiagnostic.cpp @@ -257,7 +257,7 @@ CXDiagnosticSet DiagLoader::load(const char *file) { FileSystemOptions FO; FileManager FileMgr(FO); - llvm::OwningPtr Buffer; + OwningPtr Buffer; Buffer.reset(FileMgr.getBufferForFile(file)); if (!Buffer) { @@ -282,7 +282,7 @@ CXDiagnosticSet DiagLoader::load(const char *file) { return 0; } - llvm::OwningPtr + OwningPtr Diags(new CXLoadedDiagnosticSetImpl()); while (true) { @@ -543,7 +543,7 @@ LoadResult DiagLoader::readDiagnosticBlock(llvm::BitstreamCursor &Stream, return Failure; } - llvm::OwningPtr D(new CXLoadedDiagnostic()); + OwningPtr D(new CXLoadedDiagnostic()); RecordData Record; while (true) { diff --git a/tools/libclang/Indexing.cpp b/tools/libclang/Indexing.cpp index a70a341543..0d6da2824d 100644 --- a/tools/libclang/Indexing.cpp +++ b/tools/libclang/Indexing.cpp @@ -280,7 +280,7 @@ static void clang_indexSourceFile_Impl(void *UserData) { llvm::CrashRecoveryContextReleaseRefCleanup > DiagCleanup(Diags.getPtr()); - llvm::OwningPtr > + OwningPtr > Args(new std::vector()); // Recover resources if we crash before exiting this method. @@ -312,7 +312,7 @@ static void clang_indexSourceFile_Impl(void *UserData) { if (CInvok->getFrontendOpts().Inputs.empty()) return; - llvm::OwningPtr BufOwner(new MemBufferOwner()); + OwningPtr BufOwner(new MemBufferOwner()); // Recover resources if we crash before exiting this method. llvm::CrashRecoveryContextCleanupRegistrar @@ -337,13 +337,13 @@ static void clang_indexSourceFile_Impl(void *UserData) { ASTUnit *Unit = ASTUnit::create(CInvok.getPtr(), Diags, /*CaptureDiagnostics=*/true); - llvm::OwningPtr CXTU(new CXTUOwner(MakeCXTranslationUnit(Unit))); + OwningPtr CXTU(new CXTUOwner(MakeCXTranslationUnit(Unit))); // Recover resources if we crash before exiting this method. llvm::CrashRecoveryContextCleanupRegistrar CXTUCleanup(CXTU.get()); - llvm::OwningPtr IndexAction; + OwningPtr IndexAction; IndexAction.reset(new IndexingFrontendAction(client_data, CB, index_options, CXTU->getTU())); @@ -496,14 +496,14 @@ static void clang_indexTranslationUnit_Impl(void *UserData) { ? index_callbacks_size : sizeof(CB); memcpy(&CB, client_index_callbacks, ClientCBSize); - llvm::OwningPtr IndexCtx; + OwningPtr IndexCtx; IndexCtx.reset(new IndexingContext(client_data, CB, index_options, TU)); // Recover resources if we crash before exiting this method. llvm::CrashRecoveryContextCleanupRegistrar IndexCtxCleanup(IndexCtx.get()); - llvm::OwningPtr IndexConsumer; + OwningPtr IndexConsumer; IndexConsumer.reset(new IndexingConsumer(*IndexCtx)); // Recover resources if we crash before exiting this method. -- 2.40.0