Index: cfe/trunk/lib/AST/ExprConstant.cpp =================================================================== --- cfe/trunk/lib/AST/ExprConstant.cpp +++ cfe/trunk/lib/AST/ExprConstant.cpp @@ -6961,8 +6961,8 @@ if (NumEltsToInit != NumElts && MaybeElementDependentArrayFiller(FillerExpr)) NumEltsToInit = NumElts; - DEBUG(llvm::dbgs() << "The number of elements to initialize: " << - NumEltsToInit << ".\n"); + LLVM_DEBUG(llvm::dbgs() << "The number of elements to initialize: " + << NumEltsToInit << ".\n"); Result = APValue(APValue::UninitArray(), NumEltsToInit, NumElts); Index: cfe/trunk/lib/Analysis/BodyFarm.cpp =================================================================== --- cfe/trunk/lib/Analysis/BodyFarm.cpp +++ cfe/trunk/lib/Analysis/BodyFarm.cpp @@ -314,7 +314,7 @@ /// } /// \endcode static Stmt *create_call_once(ASTContext &C, const FunctionDecl *D) { - DEBUG(llvm::dbgs() << "Generating body for call_once\n"); + LLVM_DEBUG(llvm::dbgs() << "Generating body for call_once\n"); // We need at least two parameters. if (D->param_size() < 2) @@ -342,9 +342,9 @@ auto *FlagRecordDecl = dyn_cast_or_null(FlagType->getAsTagDecl()); if (!FlagRecordDecl) { - DEBUG(llvm::dbgs() << "Flag field is not a record: " - << "unknown std::call_once implementation, " - << "ignoring the call.\n"); + LLVM_DEBUG(llvm::dbgs() << "Flag field is not a record: " + << "unknown std::call_once implementation, " + << "ignoring the call.\n"); return nullptr; } @@ -359,16 +359,17 @@ } if (!FlagFieldDecl) { - DEBUG(llvm::dbgs() << "No field _M_once or __state_ found on " - << "std::once_flag struct: unknown std::call_once " - << "implementation, ignoring the call."); + LLVM_DEBUG(llvm::dbgs() << "No field _M_once or __state_ found on " + << "std::once_flag struct: unknown std::call_once " + << "implementation, ignoring the call."); return nullptr; } bool isLambdaCall = CallbackRecordDecl && CallbackRecordDecl->isLambda(); if (CallbackRecordDecl && !isLambdaCall) { - DEBUG(llvm::dbgs() << "Not supported: synthesizing body for functors when " - << "body farming std::call_once, ignoring the call."); + LLVM_DEBUG(llvm::dbgs() + << "Not supported: synthesizing body for functors when " + << "body farming std::call_once, ignoring the call."); return nullptr; } @@ -395,9 +396,9 @@ // First two arguments are used for the flag and for the callback. if (D->getNumParams() != CallbackFunctionType->getNumParams() + 2) { - DEBUG(llvm::dbgs() << "Types of params of the callback do not match " - << "params passed to std::call_once, " - << "ignoring the call\n"); + LLVM_DEBUG(llvm::dbgs() << "Types of params of the callback do not match " + << "params passed to std::call_once, " + << "ignoring the call\n"); return nullptr; } @@ -411,9 +412,9 @@ .getNonReferenceType() .getCanonicalType() != PDecl->getType().getNonReferenceType().getCanonicalType()) { - DEBUG(llvm::dbgs() << "Types of params of the callback do not match " - << "params passed to std::call_once, " - << "ignoring the call\n"); + LLVM_DEBUG(llvm::dbgs() << "Types of params of the callback do not match " + << "params passed to std::call_once, " + << "ignoring the call\n"); return nullptr; } Expr *ParamExpr = M.makeDeclRefExpr(PDecl); Index: cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp =================================================================== --- cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp +++ cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp @@ -290,7 +290,7 @@ else ASTSym->setSection("__clangast"); - DEBUG({ + LLVM_DEBUG({ // Print the IR for the PCH container to the debug output. llvm::SmallString<0> Buffer; clang::EmitBackendOutput( Index: cfe/trunk/lib/Format/BreakableToken.cpp =================================================================== --- cfe/trunk/lib/Format/BreakableToken.cpp +++ cfe/trunk/lib/Format/BreakableToken.cpp @@ -67,8 +67,9 @@ unsigned ColumnLimit, unsigned TabWidth, encoding::Encoding Encoding) { - DEBUG(llvm::dbgs() << "Comment split: \"" << Text << ", " << ColumnLimit - << "\", Content start: " << ContentStartColumn << "\n"); + LLVM_DEBUG(llvm::dbgs() << "Comment split: \"" << Text << ", " << ColumnLimit + << "\", Content start: " << ContentStartColumn + << "\n"); if (ColumnLimit <= ContentStartColumn + 1) return BreakableToken::Split(StringRef::npos, 0); @@ -424,7 +425,7 @@ } } - DEBUG({ + LLVM_DEBUG({ llvm::dbgs() << "IndentAtLineBreak " << IndentAtLineBreak << "\n"; llvm::dbgs() << "DelimitersOnNewline " << DelimitersOnNewline << "\n"; for (size_t i = 0; i < Lines.size(); ++i) { Index: cfe/trunk/lib/Format/ContinuationIndenter.cpp =================================================================== --- cfe/trunk/lib/Format/ContinuationIndenter.cpp +++ cfe/trunk/lib/Format/ContinuationIndenter.cpp @@ -1768,12 +1768,12 @@ Token->adaptStartOfLine(0, Whitespaces); unsigned Penalty = 0; - DEBUG(llvm::dbgs() << "Breaking protruding token at column " << StartColumn - << ".\n"); + LLVM_DEBUG(llvm::dbgs() << "Breaking protruding token at column " + << StartColumn << ".\n"); for (unsigned LineIndex = 0, EndIndex = Token->getLineCount(); LineIndex != EndIndex; ++LineIndex) { - DEBUG(llvm::dbgs() << " Line: " << LineIndex << " (Reflow: " << Reflow - << ")\n"); + LLVM_DEBUG(llvm::dbgs() + << " Line: " << LineIndex << " (Reflow: " << Reflow << ")\n"); NewBreakBefore = false; // If we did reflow the previous line, we'll try reflowing again. Otherwise // we'll start reflowing if the current line is broken or whitespace is @@ -1781,11 +1781,11 @@ bool TryReflow = Reflow; // Break the current token until we can fit the rest of the line. while (ContentStartColumn + RemainingTokenColumns > ColumnLimit) { - DEBUG(llvm::dbgs() << " Over limit, need: " - << (ContentStartColumn + RemainingTokenColumns) - << ", space: " << ColumnLimit - << ", reflown prefix: " << ContentStartColumn - << ", offset in line: " << TailOffset << "\n"); + LLVM_DEBUG(llvm::dbgs() << " Over limit, need: " + << (ContentStartColumn + RemainingTokenColumns) + << ", space: " << ColumnLimit + << ", reflown prefix: " << ContentStartColumn + << ", offset in line: " << TailOffset << "\n"); // If the current token doesn't fit, find the latest possible split in the // current line so that breaking at it will be under the column limit. // FIXME: Use the earliest possible split while reflowing to correctly @@ -1800,7 +1800,7 @@ // The last line's penalty is handled in addNextStateToQueue(). Penalty += Style.PenaltyExcessCharacter * (ContentStartColumn + RemainingTokenColumns - ColumnLimit); - DEBUG(llvm::dbgs() << " No break opportunity.\n"); + LLVM_DEBUG(llvm::dbgs() << " No break opportunity.\n"); break; } assert(Split.first != 0); @@ -1827,7 +1827,7 @@ // ^--------------- to next split columns unsigned ToSplitColumns = Token->getRangeLength( LineIndex, TailOffset, Split.first, ContentStartColumn); - DEBUG(llvm::dbgs() << " ToSplit: " << ToSplitColumns << "\n"); + LLVM_DEBUG(llvm::dbgs() << " ToSplit: " << ToSplitColumns << "\n"); BreakableToken::Split NextSplit = Token->getSplit( LineIndex, TailOffset + Split.first + Split.second, ColumnLimit, @@ -1847,9 +1847,10 @@ // unbreakable sequence. ToNextSplitColumns = Token->getLengthAfterCompression(ToNextSplitColumns, Split); - DEBUG(llvm::dbgs() << " ContentStartColumn: " << ContentStartColumn - << "\n"); - DEBUG(llvm::dbgs() << " ToNextSplit: " << ToNextSplitColumns << "\n"); + LLVM_DEBUG(llvm::dbgs() + << " ContentStartColumn: " << ContentStartColumn << "\n"); + LLVM_DEBUG(llvm::dbgs() + << " ToNextSplit: " << ToNextSplitColumns << "\n"); // If the whitespace compression makes us fit, continue on the current // line. bool ContinueOnLine = @@ -1861,16 +1862,16 @@ ExcessCharactersPenalty = (ContentStartColumn + ToNextSplitColumns - ColumnLimit) * Style.PenaltyExcessCharacter; - DEBUG(llvm::dbgs() - << " Penalty excess: " << ExcessCharactersPenalty - << "\n break : " << NewBreakPenalty << "\n"); + LLVM_DEBUG(llvm::dbgs() + << " Penalty excess: " << ExcessCharactersPenalty + << "\n break : " << NewBreakPenalty << "\n"); if (ExcessCharactersPenalty < NewBreakPenalty) { Exceeded = true; ContinueOnLine = true; } } if (ContinueOnLine) { - DEBUG(llvm::dbgs() << " Continuing on line...\n"); + LLVM_DEBUG(llvm::dbgs() << " Continuing on line...\n"); // The current line fits after compressing the whitespace - reflow // the next line into it if possible. TryReflow = true; @@ -1886,7 +1887,7 @@ continue; } } - DEBUG(llvm::dbgs() << " Breaking...\n"); + LLVM_DEBUG(llvm::dbgs() << " Breaking...\n"); ContentStartColumn = Token->getContentStartColumn(LineIndex, /*Break=*/true); unsigned NewRemainingTokenColumns = Token->getRemainingLength( @@ -1902,8 +1903,8 @@ } assert(NewRemainingTokenColumns < RemainingTokenColumns); - DEBUG(llvm::dbgs() << " Breaking at: " << TailOffset + Split.first - << ", " << Split.second << "\n"); + LLVM_DEBUG(llvm::dbgs() << " Breaking at: " << TailOffset + Split.first + << ", " << Split.second << "\n"); if (!DryRun) Token->insertBreak(LineIndex, TailOffset, Split, Whitespaces); @@ -1941,11 +1942,12 @@ // the next logical line. BreakableToken::Split SplitBeforeNext = Token->getReflowSplit(NextLineIndex, CommentPragmasRegex); - DEBUG(llvm::dbgs() << " Size of reflown text: " << ContentStartColumn - << "\n Potential reflow split: "); + LLVM_DEBUG(llvm::dbgs() + << " Size of reflown text: " << ContentStartColumn + << "\n Potential reflow split: "); if (SplitBeforeNext.first != StringRef::npos) { - DEBUG(llvm::dbgs() << SplitBeforeNext.first << ", " - << SplitBeforeNext.second << "\n"); + LLVM_DEBUG(llvm::dbgs() << SplitBeforeNext.first << ", " + << SplitBeforeNext.second << "\n"); TailOffset = SplitBeforeNext.first + SplitBeforeNext.second; // If the rest of the next line fits into the current line below the // column limit, we can safely reflow. @@ -1953,11 +1955,12 @@ NextLineIndex, TailOffset, ContentStartColumn); Reflow = true; if (ContentStartColumn + RemainingTokenColumns > ColumnLimit) { - DEBUG(llvm::dbgs() << " Over limit after reflow, need: " - << (ContentStartColumn + RemainingTokenColumns) - << ", space: " << ColumnLimit - << ", reflown prefix: " << ContentStartColumn - << ", offset in line: " << TailOffset << "\n"); + LLVM_DEBUG(llvm::dbgs() + << " Over limit after reflow, need: " + << (ContentStartColumn + RemainingTokenColumns) + << ", space: " << ColumnLimit + << ", reflown prefix: " << ContentStartColumn + << ", offset in line: " << TailOffset << "\n"); // If the whole next line does not fit, try to find a point in // the next line at which we can break so that attaching the part // of the next line to that break point onto the current line is @@ -1966,7 +1969,7 @@ Token->getSplit(NextLineIndex, TailOffset, ColumnLimit, ContentStartColumn, CommentPragmasRegex); if (Split.first == StringRef::npos) { - DEBUG(llvm::dbgs() << " Did not find later break\n"); + LLVM_DEBUG(llvm::dbgs() << " Did not find later break\n"); Reflow = false; } else { // Check whether the first split point gets us below the column @@ -1975,9 +1978,9 @@ unsigned ToSplitColumns = Token->getRangeLength( NextLineIndex, TailOffset, Split.first, ContentStartColumn); if (ContentStartColumn + ToSplitColumns > ColumnLimit) { - DEBUG(llvm::dbgs() << " Next split protrudes, need: " - << (ContentStartColumn + ToSplitColumns) - << ", space: " << ColumnLimit); + LLVM_DEBUG(llvm::dbgs() << " Next split protrudes, need: " + << (ContentStartColumn + ToSplitColumns) + << ", space: " << ColumnLimit); unsigned ExcessCharactersPenalty = (ContentStartColumn + ToSplitColumns - ColumnLimit) * Style.PenaltyExcessCharacter; @@ -1988,7 +1991,7 @@ } } } else { - DEBUG(llvm::dbgs() << "not found.\n"); + LLVM_DEBUG(llvm::dbgs() << "not found.\n"); } } if (!Reflow) { @@ -2030,7 +2033,7 @@ BreakableToken::Split SplitAfterLastLine = Token->getSplitAfterLastLine(TailOffset); if (SplitAfterLastLine.first != StringRef::npos) { - DEBUG(llvm::dbgs() << "Replacing whitespace after last line.\n"); + LLVM_DEBUG(llvm::dbgs() << "Replacing whitespace after last line.\n"); if (!DryRun) Token->replaceWhitespaceAfterLastLine(TailOffset, SplitAfterLastLine, Whitespaces); Index: cfe/trunk/lib/Format/Format.cpp =================================================================== --- cfe/trunk/lib/Format/Format.cpp +++ cfe/trunk/lib/Format/Format.cpp @@ -930,9 +930,9 @@ // Ensure that each language is configured at most once. for (unsigned j = 0; j < i; ++j) { if (Styles[i].Language == Styles[j].Language) { - DEBUG(llvm::dbgs() - << "Duplicate languages in the config file on positions " << j - << " and " << i << "\n"); + LLVM_DEBUG(llvm::dbgs() + << "Duplicate languages in the config file on positions " + << j << " and " << i << "\n"); return make_error_code(ParseError::Error); } } @@ -2146,7 +2146,7 @@ SmallString<128> ConfigFile(Directory); llvm::sys::path::append(ConfigFile, ".clang-format"); - DEBUG(llvm::dbgs() << "Trying " << ConfigFile << "...\n"); + LLVM_DEBUG(llvm::dbgs() << "Trying " << ConfigFile << "...\n"); Status = FS->status(ConfigFile.str()); bool FoundConfigFile = @@ -2155,7 +2155,7 @@ // Try _clang-format too, since dotfiles are not commonly used on Windows. ConfigFile = Directory; llvm::sys::path::append(ConfigFile, "_clang-format"); - DEBUG(llvm::dbgs() << "Trying " << ConfigFile << "...\n"); + LLVM_DEBUG(llvm::dbgs() << "Trying " << ConfigFile << "...\n"); Status = FS->status(ConfigFile.str()); FoundConfigFile = Status && (Status->getType() == llvm::sys::fs::file_type::regular_file); @@ -2177,7 +2177,8 @@ return make_string_error("Error reading " + ConfigFile + ": " + ec.message()); } - DEBUG(llvm::dbgs() << "Using configuration file " << ConfigFile << "\n"); + LLVM_DEBUG(llvm::dbgs() + << "Using configuration file " << ConfigFile << "\n"); return Style; } } Index: cfe/trunk/lib/Format/SortJavaScriptImports.cpp =================================================================== --- cfe/trunk/lib/Format/SortJavaScriptImports.cpp +++ cfe/trunk/lib/Format/SortJavaScriptImports.cpp @@ -188,9 +188,9 @@ if (FirstNonImportLine && FirstNonImportLine->First->NewlinesBefore < 2) ReferencesText += "\n"; - DEBUG(llvm::dbgs() << "Replacing imports:\n" - << getSourceText(InsertionPoint) << "\nwith:\n" - << ReferencesText << "\n"); + LLVM_DEBUG(llvm::dbgs() << "Replacing imports:\n" + << getSourceText(InsertionPoint) << "\nwith:\n" + << ReferencesText << "\n"); auto Err = Result.add(tooling::Replacement( Env.getSourceManager(), CharSourceRange::getCharRange(InsertionPoint), ReferencesText)); @@ -307,7 +307,7 @@ FirstNonImportLine = nullptr; AnyImportAffected = AnyImportAffected || Line->Affected; Reference.Range.setEnd(LineEnd->Tok.getEndLoc()); - DEBUG({ + LLVM_DEBUG({ llvm::dbgs() << "JsModuleReference: {" << "is_export: " << Reference.IsExport << ", cat: " << Reference.Category Index: cfe/trunk/lib/Format/TokenAnalyzer.cpp =================================================================== --- cfe/trunk/lib/Format/TokenAnalyzer.cpp +++ cfe/trunk/lib/Format/TokenAnalyzer.cpp @@ -55,12 +55,12 @@ UnwrappedLines(1), Encoding(encoding::detectEncoding( Env.getSourceManager().getBufferData(Env.getFileID()))) { - DEBUG( + LLVM_DEBUG( llvm::dbgs() << "File encoding: " << (Encoding == encoding::Encoding_UTF8 ? "UTF8" : "unknown") << "\n"); - DEBUG(llvm::dbgs() << "Language: " << getLanguageName(Style.Language) - << "\n"); + LLVM_DEBUG(llvm::dbgs() << "Language: " << getLanguageName(Style.Language) + << "\n"); } std::pair TokenAnalyzer::process() { @@ -74,7 +74,7 @@ assert(UnwrappedLines.rbegin()->empty()); unsigned Penalty = 0; for (unsigned Run = 0, RunE = UnwrappedLines.size(); Run + 1 != RunE; ++Run) { - DEBUG(llvm::dbgs() << "Run " << Run << "...\n"); + LLVM_DEBUG(llvm::dbgs() << "Run " << Run << "...\n"); SmallVector AnnotatedLines; TokenAnnotator Annotator(Style, Tokens.getKeywords()); @@ -86,7 +86,7 @@ std::pair RunResult = analyze(Annotator, AnnotatedLines, Tokens); - DEBUG({ + LLVM_DEBUG({ llvm::dbgs() << "Replacements for run " << Run << ":\n"; for (tooling::Replacements::const_iterator I = RunResult.first.begin(), E = RunResult.first.end(); Index: cfe/trunk/lib/Format/TokenAnnotator.cpp =================================================================== --- cfe/trunk/lib/Format/TokenAnnotator.cpp +++ cfe/trunk/lib/Format/TokenAnnotator.cpp @@ -2143,7 +2143,7 @@ ++IndentLevel; } - DEBUG({ printDebugInfo(Line); }); + LLVM_DEBUG({ printDebugInfo(Line); }); } void TokenAnnotator::calculateUnbreakableTailLengths(AnnotatedLine &Line) { Index: cfe/trunk/lib/Format/UnwrappedLineFormatter.cpp =================================================================== --- cfe/trunk/lib/Format/UnwrappedLineFormatter.cpp +++ cfe/trunk/lib/Format/UnwrappedLineFormatter.cpp @@ -905,7 +905,8 @@ Penalty = Queue.top().first.first; StateNode *Node = Queue.top().second; if (!Node->State.NextToken) { - DEBUG(llvm::dbgs() << "\n---\nPenalty for line: " << Penalty << "\n"); + LLVM_DEBUG(llvm::dbgs() + << "\n---\nPenalty for line: " << Penalty << "\n"); break; } Queue.pop(); @@ -929,7 +930,7 @@ if (Queue.empty()) { // We were unable to find a solution, do nothing. // FIXME: Add diagnostic? - DEBUG(llvm::dbgs() << "Could not find a solution.\n"); + LLVM_DEBUG(llvm::dbgs() << "Could not find a solution.\n"); return 0; } @@ -937,8 +938,9 @@ if (!DryRun) reconstructPath(InitialState, Queue.top().second); - DEBUG(llvm::dbgs() << "Total number of analyzed states: " << Count << "\n"); - DEBUG(llvm::dbgs() << "---\n"); + LLVM_DEBUG(llvm::dbgs() + << "Total number of analyzed states: " << Count << "\n"); + LLVM_DEBUG(llvm::dbgs() << "---\n"); return Penalty; } @@ -980,7 +982,7 @@ formatChildren(State, (*I)->NewLine, /*DryRun=*/false, Penalty); Penalty += Indenter->addTokenToState(State, (*I)->NewLine, false); - DEBUG({ + LLVM_DEBUG({ printLineState((*I)->Previous->State); if ((*I)->NewLine) { llvm::dbgs() << "Penalty for placing " Index: cfe/trunk/lib/Format/UnwrappedLineParser.cpp =================================================================== --- cfe/trunk/lib/Format/UnwrappedLineParser.cpp +++ cfe/trunk/lib/Format/UnwrappedLineParser.cpp @@ -260,7 +260,7 @@ IndexedTokenSource TokenSource(AllTokens); Line->FirstStartColumn = FirstStartColumn; do { - DEBUG(llvm::dbgs() << "----\n"); + LLVM_DEBUG(llvm::dbgs() << "----\n"); reset(); Tokens = &TokenSource; TokenSource.reset(); @@ -2324,7 +2324,7 @@ void UnwrappedLineParser::addUnwrappedLine() { if (Line->Tokens.empty()) return; - DEBUG({ + LLVM_DEBUG({ if (CurrentLines == &Lines) printDebugInfo(*Line); }); Index: cfe/trunk/lib/Format/UsingDeclarationsSorter.cpp =================================================================== --- cfe/trunk/lib/Format/UsingDeclarationsSorter.cpp +++ cfe/trunk/lib/Format/UsingDeclarationsSorter.cpp @@ -161,7 +161,7 @@ StringRef Text(SourceMgr.getCharacterData(SortedBegin), SourceMgr.getCharacterData(SortedEnd) - SourceMgr.getCharacterData(SortedBegin)); - DEBUG({ + LLVM_DEBUG({ StringRef OldText(SourceMgr.getCharacterData(Begin), SourceMgr.getCharacterData(End) - SourceMgr.getCharacterData(Begin)); Index: cfe/trunk/lib/StaticAnalyzer/Core/CallEvent.cpp =================================================================== --- cfe/trunk/lib/StaticAnalyzer/Core/CallEvent.cpp +++ cfe/trunk/lib/StaticAnalyzer/Core/CallEvent.cpp @@ -399,10 +399,10 @@ getManager()->getContext(FD); bool IsAutosynthesized; Stmt* Body = AD->getBody(IsAutosynthesized); - DEBUG({ - if (IsAutosynthesized) - llvm::dbgs() << "Using autosynthesized body for " << FD->getName() - << "\n"; + LLVM_DEBUG({ + if (IsAutosynthesized) + llvm::dbgs() << "Using autosynthesized body for " << FD->getName() + << "\n"; }); if (Body) { const Decl* Decl = AD->getDecl(); Index: cfe/trunk/lib/StaticAnalyzer/Core/MemRegion.cpp =================================================================== --- cfe/trunk/lib/StaticAnalyzer/Core/MemRegion.cpp +++ cfe/trunk/lib/StaticAnalyzer/Core/MemRegion.cpp @@ -1244,8 +1244,8 @@ if (!Overflow) Overflow = checkedMul(Mult, offset.getQuantity()); if (Overflow) { - DEBUG(llvm::dbgs() << "MemRegion::getAsArrayOffset: " - << "offset overflowing, returning unknown\n"); + LLVM_DEBUG(llvm::dbgs() << "MemRegion::getAsArrayOffset: " + << "offset overflowing, returning unknown\n"); return nullptr; } Index: cfe/trunk/lib/Tooling/Tooling.cpp =================================================================== --- cfe/trunk/lib/Tooling/Tooling.cpp +++ cfe/trunk/lib/Tooling/Tooling.cpp @@ -473,7 +473,7 @@ // FIXME: We need a callback mechanism for the tool writer to output a // customized message for each file. - DEBUG({ llvm::dbgs() << "Processing: " << File << ".\n"; }); + LLVM_DEBUG({ llvm::dbgs() << "Processing: " << File << ".\n"; }); ToolInvocation Invocation(std::move(CommandLine), Action, Files.get(), PCHContainerOps); Invocation.setDiagnosticConsumer(DiagConsumer); Index: cfe/trunk/unittests/Format/FormatTest.cpp =================================================================== --- cfe/trunk/unittests/Format/FormatTest.cpp +++ cfe/trunk/unittests/Format/FormatTest.cpp @@ -39,8 +39,8 @@ std::string format(llvm::StringRef Code, const FormatStyle &Style = getLLVMStyle(), StatusCheck CheckComplete = SC_ExpectComplete) { - DEBUG(llvm::errs() << "---\n"); - DEBUG(llvm::errs() << Code << "\n\n"); + LLVM_DEBUG(llvm::errs() << "---\n"); + LLVM_DEBUG(llvm::errs() << Code << "\n\n"); std::vector Ranges(1, tooling::Range(0, Code.size())); FormattingAttemptStatus Status; tooling::Replacements Replaces = @@ -53,7 +53,7 @@ ReplacementCount = Replaces.size(); auto Result = applyAllReplacements(Code, Replaces); EXPECT_TRUE(static_cast(Result)); - DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); + LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); return *Result; } Index: cfe/trunk/unittests/Format/FormatTestComments.cpp =================================================================== --- cfe/trunk/unittests/Format/FormatTestComments.cpp +++ cfe/trunk/unittests/Format/FormatTestComments.cpp @@ -38,8 +38,8 @@ std::string format(llvm::StringRef Code, const FormatStyle &Style = getLLVMStyle(), StatusCheck CheckComplete = SC_ExpectComplete) { - DEBUG(llvm::errs() << "---\n"); - DEBUG(llvm::errs() << Code << "\n\n"); + LLVM_DEBUG(llvm::errs() << "---\n"); + LLVM_DEBUG(llvm::errs() << Code << "\n\n"); std::vector Ranges(1, tooling::Range(0, Code.size())); FormattingAttemptStatus Status; tooling::Replacements Replaces = @@ -52,7 +52,7 @@ ReplacementCount = Replaces.size(); auto Result = applyAllReplacements(Code, Replaces); EXPECT_TRUE(static_cast(Result)); - DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); + LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); return *Result; } Index: cfe/trunk/unittests/Format/FormatTestJS.cpp =================================================================== --- cfe/trunk/unittests/Format/FormatTestJS.cpp +++ cfe/trunk/unittests/Format/FormatTestJS.cpp @@ -21,8 +21,8 @@ protected: static std::string format(llvm::StringRef Code, unsigned Offset, unsigned Length, const FormatStyle &Style) { - DEBUG(llvm::errs() << "---\n"); - DEBUG(llvm::errs() << Code << "\n\n"); + LLVM_DEBUG(llvm::errs() << "---\n"); + LLVM_DEBUG(llvm::errs() << Code << "\n\n"); std::vector Ranges(1, tooling::Range(Offset, Length)); FormattingAttemptStatus Status; tooling::Replacements Replaces = @@ -30,7 +30,7 @@ EXPECT_TRUE(Status.FormatComplete); auto Result = applyAllReplacements(Code, Replaces); EXPECT_TRUE(static_cast(Result)); - DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); + LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); return *Result; } Index: cfe/trunk/unittests/Format/FormatTestJava.cpp =================================================================== --- cfe/trunk/unittests/Format/FormatTestJava.cpp +++ cfe/trunk/unittests/Format/FormatTestJava.cpp @@ -21,13 +21,13 @@ protected: static std::string format(llvm::StringRef Code, unsigned Offset, unsigned Length, const FormatStyle &Style) { - DEBUG(llvm::errs() << "---\n"); - DEBUG(llvm::errs() << Code << "\n\n"); + LLVM_DEBUG(llvm::errs() << "---\n"); + LLVM_DEBUG(llvm::errs() << Code << "\n\n"); std::vector Ranges(1, tooling::Range(Offset, Length)); tooling::Replacements Replaces = reformat(Style, Code, Ranges); auto Result = applyAllReplacements(Code, Replaces); EXPECT_TRUE(static_cast(Result)); - DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); + LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); return *Result; } Index: cfe/trunk/unittests/Format/FormatTestObjC.cpp =================================================================== --- cfe/trunk/unittests/Format/FormatTestObjC.cpp +++ cfe/trunk/unittests/Format/FormatTestObjC.cpp @@ -40,8 +40,8 @@ std::string format(llvm::StringRef Code, StatusCheck CheckComplete = SC_ExpectComplete) { - DEBUG(llvm::errs() << "---\n"); - DEBUG(llvm::errs() << Code << "\n\n"); + LLVM_DEBUG(llvm::errs() << "---\n"); + LLVM_DEBUG(llvm::errs() << Code << "\n\n"); std::vector Ranges(1, tooling::Range(0, Code.size())); FormattingAttemptStatus Status; tooling::Replacements Replaces = @@ -53,7 +53,7 @@ } auto Result = applyAllReplacements(Code, Replaces); EXPECT_TRUE(static_cast(Result)); - DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); + LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); return *Result; } Index: cfe/trunk/unittests/Format/FormatTestProto.cpp =================================================================== --- cfe/trunk/unittests/Format/FormatTestProto.cpp +++ cfe/trunk/unittests/Format/FormatTestProto.cpp @@ -21,13 +21,13 @@ protected: static std::string format(llvm::StringRef Code, unsigned Offset, unsigned Length, const FormatStyle &Style) { - DEBUG(llvm::errs() << "---\n"); - DEBUG(llvm::errs() << Code << "\n\n"); + LLVM_DEBUG(llvm::errs() << "---\n"); + LLVM_DEBUG(llvm::errs() << Code << "\n\n"); std::vector Ranges(1, tooling::Range(Offset, Length)); tooling::Replacements Replaces = reformat(Style, Code, Ranges); auto Result = applyAllReplacements(Code, Replaces); EXPECT_TRUE(static_cast(Result)); - DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); + LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); return *Result; } Index: cfe/trunk/unittests/Format/FormatTestRawStrings.cpp =================================================================== --- cfe/trunk/unittests/Format/FormatTestRawStrings.cpp +++ cfe/trunk/unittests/Format/FormatTestRawStrings.cpp @@ -33,8 +33,8 @@ std::string format(llvm::StringRef Code, const FormatStyle &Style = getLLVMStyle(), StatusCheck CheckComplete = SC_ExpectComplete) { - DEBUG(llvm::errs() << "---\n"); - DEBUG(llvm::errs() << Code << "\n\n"); + LLVM_DEBUG(llvm::errs() << "---\n"); + LLVM_DEBUG(llvm::errs() << Code << "\n\n"); std::vector Ranges(1, tooling::Range(0, Code.size())); FormattingAttemptStatus Status; tooling::Replacements Replaces = @@ -47,7 +47,7 @@ ReplacementCount = Replaces.size(); auto Result = applyAllReplacements(Code, Replaces); EXPECT_TRUE(static_cast(Result)); - DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); + LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); return *Result; } Index: cfe/trunk/unittests/Format/FormatTestSelective.cpp =================================================================== --- cfe/trunk/unittests/Format/FormatTestSelective.cpp +++ cfe/trunk/unittests/Format/FormatTestSelective.cpp @@ -21,8 +21,8 @@ class FormatTestSelective : public ::testing::Test { protected: std::string format(llvm::StringRef Code, unsigned Offset, unsigned Length) { - DEBUG(llvm::errs() << "---\n"); - DEBUG(llvm::errs() << Code << "\n\n"); + LLVM_DEBUG(llvm::errs() << "---\n"); + LLVM_DEBUG(llvm::errs() << Code << "\n\n"); std::vector Ranges(1, tooling::Range(Offset, Length)); FormattingAttemptStatus Status; tooling::Replacements Replaces = @@ -30,7 +30,7 @@ EXPECT_TRUE(Status.FormatComplete) << Code << "\n\n"; auto Result = applyAllReplacements(Code, Replaces); EXPECT_TRUE(static_cast(Result)); - DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); + LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); return *Result; } Index: cfe/trunk/unittests/Format/FormatTestTextProto.cpp =================================================================== --- cfe/trunk/unittests/Format/FormatTestTextProto.cpp +++ cfe/trunk/unittests/Format/FormatTestTextProto.cpp @@ -21,13 +21,13 @@ protected: static std::string format(llvm::StringRef Code, unsigned Offset, unsigned Length, const FormatStyle &Style) { - DEBUG(llvm::errs() << "---\n"); - DEBUG(llvm::errs() << Code << "\n\n"); + LLVM_DEBUG(llvm::errs() << "---\n"); + LLVM_DEBUG(llvm::errs() << Code << "\n\n"); std::vector Ranges(1, tooling::Range(Offset, Length)); tooling::Replacements Replaces = reformat(Style, Code, Ranges); auto Result = applyAllReplacements(Code, Replaces); EXPECT_TRUE(static_cast(Result)); - DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); + LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); return *Result; } Index: cfe/trunk/unittests/Format/NamespaceEndCommentsFixerTest.cpp =================================================================== --- cfe/trunk/unittests/Format/NamespaceEndCommentsFixerTest.cpp +++ cfe/trunk/unittests/Format/NamespaceEndCommentsFixerTest.cpp @@ -25,13 +25,13 @@ fixNamespaceEndComments(llvm::StringRef Code, const std::vector &Ranges, const FormatStyle &Style = getLLVMStyle()) { - DEBUG(llvm::errs() << "---\n"); - DEBUG(llvm::errs() << Code << "\n\n"); + LLVM_DEBUG(llvm::errs() << "---\n"); + LLVM_DEBUG(llvm::errs() << Code << "\n\n"); tooling::Replacements Replaces = clang::format::fixNamespaceEndComments(Style, Code, Ranges, ""); auto Result = applyAllReplacements(Code, Replaces); EXPECT_TRUE(static_cast(Result)); - DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); + LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); return *Result; } Index: cfe/trunk/unittests/Format/UsingDeclarationsSorterTest.cpp =================================================================== --- cfe/trunk/unittests/Format/UsingDeclarationsSorterTest.cpp +++ cfe/trunk/unittests/Format/UsingDeclarationsSorterTest.cpp @@ -23,13 +23,13 @@ std::string sortUsingDeclarations(llvm::StringRef Code, const std::vector &Ranges, const FormatStyle &Style = getLLVMStyle()) { - DEBUG(llvm::errs() << "---\n"); - DEBUG(llvm::errs() << Code << "\n\n"); + LLVM_DEBUG(llvm::errs() << "---\n"); + LLVM_DEBUG(llvm::errs() << Code << "\n\n"); tooling::Replacements Replaces = clang::format::sortUsingDeclarations(Style, Code, Ranges, ""); auto Result = applyAllReplacements(Code, Replaces); EXPECT_TRUE(static_cast(Result)); - DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); + LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); return *Result; } Index: cfe/trunk/unittests/libclang/LibclangTest.cpp =================================================================== --- cfe/trunk/unittests/libclang/LibclangTest.cpp +++ cfe/trunk/unittests/libclang/LibclangTest.cpp @@ -467,15 +467,17 @@ unsigned NumDiagnostics = clang_getNumDiagnostics(ClangTU); for (unsigned i = 0; i < NumDiagnostics; ++i) { auto Diag = clang_getDiagnostic(ClangTU, i); - DEBUG(llvm::dbgs() << clang_getCString(clang_formatDiagnostic( - Diag, clang_defaultDiagnosticDisplayOptions())) << "\n"); + LLVM_DEBUG(llvm::dbgs() + << clang_getCString(clang_formatDiagnostic( + Diag, clang_defaultDiagnosticDisplayOptions())) + << "\n"); clang_disposeDiagnostic(Diag); } } bool ReparseTU(unsigned num_unsaved_files, CXUnsavedFile* unsaved_files) { if (clang_reparseTranslationUnit(ClangTU, num_unsaved_files, unsaved_files, clang_defaultReparseOptions(ClangTU))) { - DEBUG(llvm::dbgs() << "Reparse failed\n"); + LLVM_DEBUG(llvm::dbgs() << "Reparse failed\n"); return false; } DisplayDiagnostics(); @@ -706,7 +708,7 @@ unsigned options = clang_defaultSaveOptions(ClangTU); if (clang_saveTranslationUnit(ClangTU, Filename.c_str(), options) != CXSaveError_None) { - DEBUG(llvm::dbgs() << "Saving failed\n"); + LLVM_DEBUG(llvm::dbgs() << "Saving failed\n"); return false; } @@ -715,7 +717,7 @@ ClangTU = clang_createTranslationUnit(Index, Filename.c_str()); if (!ClangTU) { - DEBUG(llvm::dbgs() << "Loading failed\n"); + LLVM_DEBUG(llvm::dbgs() << "Loading failed\n"); return false; }