mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-25 05:06:06 +00:00
Code Issues Projects Releases Wiki Activity

[clangd] Fix NDEBUG build problem introduced by rL366698

Browse Source 
Sprinkled some #ifndef NDEBUG in Selection.cpp to make
it possible to build with NDEBUG defined.

The problem was introduced in rL366698 when using dlog
for some debug printouts. The dlog macro expands to
DEBUG_WITH_TYPE, which isn't using it's arguments in
optimized builds (when NDEBUG is defined).

llvm-svn: 367178
This commit is contained in:
Bjorn Pettersson 2019-07-27 17:09:15 +00:00
parent 60c1ee23ff
commit f0f63cab7f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang-tools-extra/clangd/Selection.cpp
View File

@ -77,6 +77,7 @@ void printNodeKind(llvm::raw_ostream &OS, const DynTypedNode &N) {
}
}
#ifndef NDEBUG
std::string printNodeToString(const DynTypedNode &N, const PrintingPolicy &PP) {
std::string S;
llvm::raw_string_ostream OS(S);
@ -84,6 +85,7 @@ std::string printNodeToString(const DynTypedNode &N, const PrintingPolicy &PP) {
OS << " ";
return std::move(OS.str());
}
#endif
// We find the selection by visiting written nodes in the AST, looking for nodes
// that intersect with the selected character range.
@ -177,7 +179,10 @@ private:
SelectionVisitor(ASTContext &AST, const PrintingPolicy &PP, unsigned SelBegin,
unsigned SelEnd, FileID SelFile)
: SM(AST.getSourceManager()), LangOpts(AST.getLangOpts()),
PrintPolicy(PP), SelBegin(SelBegin), SelEnd(SelEnd), SelFile(SelFile),
#ifndef NDEBUG
PrintPolicy(PP),
#endif
SelBegin(SelBegin), SelEnd(SelEnd), SelFile(SelFile),
SelBeginTokenStart(SM.getFileOffset(Lexer::GetBeginningOfToken(
SM.getComposedLoc(SelFile, SelBegin), SM, LangOpts))) {
// Ensure we have a node for the TU decl, regardless of traversal scope.
@ -348,7 +353,9 @@ private:
SourceManager &SM;
const LangOptions &LangOpts;
#ifndef NDEBUG
const PrintingPolicy &PrintPolicy;
#endif
std::stack<Node *> Stack;
RangeSet Claimed;
std::deque<Node> Nodes; // Stable pointers as we add more nodes.