Author: nzaghen Date: Tue May 15 09:37:45 2018 New Revision: 332371 URL: http://llvm.org/viewvc/llvm-project?rev=332371&view=rev Log: [clang-tools-extra] Update uses of DEBUG macro to LLVM_DEBUG.
The DEBUG() macro is very generic so it might clash with other projects. The renaming was done as follows: - git grep -l 'DEBUG' | xargs sed -i 's/\bDEBUG\s\?(/LLVM_DEBUG(/g' - git diff -U0 master | ../clang/tools/clang-format/clang-format-diff.py -i -p1 -style LLVM Differential Revision: https://reviews.llvm.org/D44976 Modified: clang-tools-extra/trunk/clang-move/ClangMove.cpp clang-tools-extra/trunk/clang-move/HelperDeclRefGraph.cpp clang-tools-extra/trunk/clang-tidy/ClangTidyOptions.cpp clang-tools-extra/trunk/clang-tidy/readability/IdentifierNamingCheck.cpp clang-tools-extra/trunk/include-fixer/IncludeFixer.cpp clang-tools-extra/trunk/include-fixer/SymbolIndexManager.cpp Modified: clang-tools-extra/trunk/clang-move/ClangMove.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-move/ClangMove.cpp?rev=332371&r1=332370&r2=332371&view=diff ============================================================================== --- clang-tools-extra/trunk/clang-move/ClangMove.cpp (original) +++ clang-tools-extra/trunk/clang-move/ClangMove.cpp Tue May 15 09:37:45 2018 @@ -680,8 +680,8 @@ void ClangMoveTool::run(const ast_matche Result.Nodes.getNodeAs<clang::NamedDecl>("helper_decls")) { MovedDecls.push_back(ND); HelperDeclarations.push_back(ND); - DEBUG(llvm::dbgs() << "Add helper : " - << ND->getNameAsString() << " (" << ND << ")\n"); + LLVM_DEBUG(llvm::dbgs() << "Add helper : " << ND->getNameAsString() << " (" + << ND << ")\n"); } else if (const auto *UD = Result.Nodes.getNodeAs<clang::NamedDecl>("using_decl")) { MovedDecls.push_back(UD); @@ -741,12 +741,12 @@ void ClangMoveTool::removeDeclsInOldFile // We remove the helper declarations which are not used in the old.cc after // moving the given declarations. for (const auto *D : HelperDeclarations) { - DEBUG(llvm::dbgs() << "Check helper is used: " - << D->getNameAsString() << " (" << D << ")\n"); + LLVM_DEBUG(llvm::dbgs() << "Check helper is used: " + << D->getNameAsString() << " (" << D << ")\n"); if (!UsedDecls.count(HelperDeclRGBuilder::getOutmostClassOrFunDecl( D->getCanonicalDecl()))) { - DEBUG(llvm::dbgs() << "Helper removed in old.cc: " - << D->getNameAsString() << " (" << D << ")\n"); + LLVM_DEBUG(llvm::dbgs() << "Helper removed in old.cc: " + << D->getNameAsString() << " (" << D << ")\n"); RemovedDecls.push_back(D); } } @@ -826,8 +826,8 @@ void ClangMoveTool::moveDeclsToNewFiles( D->getCanonicalDecl()))) continue; - DEBUG(llvm::dbgs() << "Helper used in new.cc: " << D->getNameAsString() - << " " << D << "\n"); + LLVM_DEBUG(llvm::dbgs() << "Helper used in new.cc: " << D->getNameAsString() + << " " << D << "\n"); ActualNewCCDecls.push_back(D); } @@ -937,7 +937,7 @@ void ClangMoveTool::onEndOfTranslationUn moveAll(SM, Context->Spec.OldCC, Context->Spec.NewCC); return; } - DEBUG(RGBuilder.getGraph()->dump()); + LLVM_DEBUG(RGBuilder.getGraph()->dump()); moveDeclsToNewFiles(); removeDeclsInOldFiles(); } Modified: clang-tools-extra/trunk/clang-move/HelperDeclRefGraph.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-move/HelperDeclRefGraph.cpp?rev=332371&r1=332370&r2=332371&view=diff ============================================================================== --- clang-tools-extra/trunk/clang-move/HelperDeclRefGraph.cpp (original) +++ clang-tools-extra/trunk/clang-move/HelperDeclRefGraph.cpp Tue May 15 09:37:45 2018 @@ -116,9 +116,9 @@ void HelperDeclRGBuilder::run( if (const auto *FuncRef = Result.Nodes.getNodeAs<DeclRefExpr>("func_ref")) { const auto *DC = Result.Nodes.getNodeAs<Decl>("dc"); assert(DC); - DEBUG(llvm::dbgs() << "Find helper function usage: " - << FuncRef->getDecl()->getNameAsString() << " (" - << FuncRef->getDecl() << ")\n"); + LLVM_DEBUG(llvm::dbgs() << "Find helper function usage: " + << FuncRef->getDecl()->getNameAsString() << " (" + << FuncRef->getDecl() << ")\n"); RG->addEdge( getOutmostClassOrFunDecl(DC->getCanonicalDecl()), getOutmostClassOrFunDecl(FuncRef->getDecl()->getCanonicalDecl())); @@ -126,9 +126,9 @@ void HelperDeclRGBuilder::run( Result.Nodes.getNodeAs<CXXRecordDecl>("used_class")) { const auto *DC = Result.Nodes.getNodeAs<Decl>("dc"); assert(DC); - DEBUG(llvm::dbgs() << "Find helper class usage: " - << UsedClass->getNameAsString() << " (" << UsedClass - << ")\n"); + LLVM_DEBUG(llvm::dbgs() + << "Find helper class usage: " << UsedClass->getNameAsString() + << " (" << UsedClass << ")\n"); RG->addEdge(getOutmostClassOrFunDecl(DC->getCanonicalDecl()), UsedClass); } } Modified: clang-tools-extra/trunk/clang-tidy/ClangTidyOptions.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/ClangTidyOptions.cpp?rev=332371&r1=332370&r2=332371&view=diff ============================================================================== --- clang-tools-extra/trunk/clang-tidy/ClangTidyOptions.cpp (original) +++ clang-tools-extra/trunk/clang-tidy/ClangTidyOptions.cpp Tue May 15 09:37:45 2018 @@ -225,7 +225,8 @@ FileOptionsProvider::FileOptionsProvider // similar. std::vector<OptionsSource> FileOptionsProvider::getRawOptions(StringRef FileName) { - DEBUG(llvm::dbgs() << "Getting options for file " << FileName << "...\n"); + LLVM_DEBUG(llvm::dbgs() << "Getting options for file " << FileName + << "...\n"); assert(FS && "FS must be set."); llvm::SmallString<128> AbsoluteFilePath(FileName); @@ -254,8 +255,8 @@ FileOptionsProvider::getRawOptions(Strin if (Result) { // Store cached value for all intermediate directories. while (Path != CurrentPath) { - DEBUG(llvm::dbgs() << "Caching configuration for path " << Path - << ".\n"); + LLVM_DEBUG(llvm::dbgs() + << "Caching configuration for path " << Path << ".\n"); CachedOptions[Path] = *Result; Path = llvm::sys::path::parent_path(Path); } @@ -282,7 +283,7 @@ FileOptionsProvider::tryReadConfigFile(S for (const ConfigFileHandler &ConfigHandler : ConfigHandlers) { SmallString<128> ConfigFile(Directory); llvm::sys::path::append(ConfigFile, ConfigHandler.first); - DEBUG(llvm::dbgs() << "Trying " << ConfigFile << "...\n"); + LLVM_DEBUG(llvm::dbgs() << "Trying " << ConfigFile << "...\n"); bool IsFile = false; // Ignore errors from is_regular_file: we only need to know if we can read Modified: clang-tools-extra/trunk/clang-tidy/readability/IdentifierNamingCheck.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/readability/IdentifierNamingCheck.cpp?rev=332371&r1=332370&r2=332371&view=diff ============================================================================== --- clang-tools-extra/trunk/clang-tidy/readability/IdentifierNamingCheck.cpp (original) +++ clang-tools-extra/trunk/clang-tidy/readability/IdentifierNamingCheck.cpp Tue May 15 09:37:45 2018 @@ -840,10 +840,10 @@ void IdentifierNamingCheck::check(const std::string Fixup = fixupWithStyle(Name, Style); if (StringRef(Fixup).equals(Name)) { if (!IgnoreFailedSplit) { - DEBUG(llvm::dbgs() - << Decl->getLocStart().printToString(*Result.SourceManager) - << llvm::format(": unable to split words for %s '%s'\n", - KindName.c_str(), Name.str().c_str())); + LLVM_DEBUG(llvm::dbgs() + << Decl->getLocStart().printToString(*Result.SourceManager) + << llvm::format(": unable to split words for %s '%s'\n", + KindName.c_str(), Name.str().c_str())); } } else { NamingCheckFailure &Failure = NamingCheckFailures[NamingCheckId( @@ -877,10 +877,10 @@ void IdentifierNamingCheck::checkMacro(S std::string Fixup = fixupWithStyle(Name, Style); if (StringRef(Fixup).equals(Name)) { if (!IgnoreFailedSplit) { - DEBUG( - llvm::dbgs() << MacroNameTok.getLocation().printToString(SourceMgr) - << llvm::format(": unable to split words for %s '%s'\n", - KindName.c_str(), Name.str().c_str())); + LLVM_DEBUG(llvm::dbgs() + << MacroNameTok.getLocation().printToString(SourceMgr) + << llvm::format(": unable to split words for %s '%s'\n", + KindName.c_str(), Name.str().c_str())); } } else { NamingCheckId ID(MI->getDefinitionLoc(), Name); Modified: clang-tools-extra/trunk/include-fixer/IncludeFixer.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/include-fixer/IncludeFixer.cpp?rev=332371&r1=332370&r2=332371&view=diff ============================================================================== --- clang-tools-extra/trunk/include-fixer/IncludeFixer.cpp (original) +++ clang-tools-extra/trunk/include-fixer/IncludeFixer.cpp Tue May 15 09:37:45 2018 @@ -156,7 +156,8 @@ bool IncludeFixerSemaSource::MaybeDiagno clang::ASTContext &context = CI->getASTContext(); std::string QueryString = QualType(T->getUnqualifiedDesugaredType(), 0) .getAsString(context.getPrintingPolicy()); - DEBUG(llvm::dbgs() << "Query missing complete type '" << QueryString << "'"); + LLVM_DEBUG(llvm::dbgs() << "Query missing complete type '" << QueryString + << "'"); // Pass an empty range here since we don't add qualifier in this case. std::vector<find_all_symbols::SymbolInfo> MatchedSymbols = query(QueryString, "", tooling::Range()); @@ -276,7 +277,8 @@ clang::TypoCorrection IncludeFixerSemaSo SymbolRange = CreateToolingRange(Typo.getLoc()); } - DEBUG(llvm::dbgs() << "TypoScopeQualifiers: " << TypoScopeString << "\n"); + LLVM_DEBUG(llvm::dbgs() << "TypoScopeQualifiers: " << TypoScopeString + << "\n"); std::vector<find_all_symbols::SymbolInfo> MatchedSymbols = query(QueryString, TypoScopeString, SymbolRange); @@ -357,12 +359,12 @@ IncludeFixerSemaSource::query(StringRef return {}; } - DEBUG(llvm::dbgs() << "Looking up '" << Query << "' at "); - DEBUG(CI->getSourceManager() - .getLocForStartOfFile(CI->getSourceManager().getMainFileID()) - .getLocWithOffset(Range.getOffset()) - .print(llvm::dbgs(), CI->getSourceManager())); - DEBUG(llvm::dbgs() << " ..."); + LLVM_DEBUG(llvm::dbgs() << "Looking up '" << Query << "' at "); + LLVM_DEBUG(CI->getSourceManager() + .getLocForStartOfFile(CI->getSourceManager().getMainFileID()) + .getLocWithOffset(Range.getOffset()) + .print(llvm::dbgs(), CI->getSourceManager())); + LLVM_DEBUG(llvm::dbgs() << " ..."); llvm::StringRef FileName = CI->getSourceManager().getFilename( CI->getSourceManager().getLocForStartOfFile( CI->getSourceManager().getMainFileID())); @@ -390,8 +392,8 @@ IncludeFixerSemaSource::query(StringRef if (MatchedSymbols.empty()) MatchedSymbols = SymbolIndexMgr.search(Query, /*IsNestedSearch=*/true, FileName); - DEBUG(llvm::dbgs() << "Having found " << MatchedSymbols.size() - << " symbols\n"); + LLVM_DEBUG(llvm::dbgs() << "Having found " << MatchedSymbols.size() + << " symbols\n"); // We store a copy of MatchedSymbols in a place where it's globally reachable. // This is used by the standalone version of the tool. this->MatchedSymbols = MatchedSymbols; Modified: clang-tools-extra/trunk/include-fixer/SymbolIndexManager.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/include-fixer/SymbolIndexManager.cpp?rev=332371&r1=332370&r2=332371&view=diff ============================================================================== --- clang-tools-extra/trunk/include-fixer/SymbolIndexManager.cpp (original) +++ clang-tools-extra/trunk/include-fixer/SymbolIndexManager.cpp Tue May 15 09:37:45 2018 @@ -97,8 +97,8 @@ SymbolIndexManager::search(llvm::StringR Symbols.insert(Symbols.end(), Res.begin(), Res.end()); } - DEBUG(llvm::dbgs() << "Searching " << Names.back() << "... got " - << Symbols.size() << " results...\n"); + LLVM_DEBUG(llvm::dbgs() << "Searching " << Names.back() << "... got " + << Symbols.size() << " results...\n"); for (auto &SymAndSig : Symbols) { const SymbolInfo &Symbol = SymAndSig.Symbol; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
