[PATCH] D77615: [Syntax] Merge overlapping top-level macros in TokenBuffer

2020-04-07 Thread Sam McCall via Phabricator via cfe-commits
This revision was automatically updated to reflect the committed changes. sammccall marked an inline comment as done. Closed by commit rGd66afd6dde54: [Syntax] Merge overlapping top-level macros in TokenBuffer (authored by sammccall). Changed prior to commit: https://reviews.llvm.org/D77615?vs=

[PATCH] D77615: [Syntax] Merge overlapping top-level macros in TokenBuffer

2020-04-07 Thread Sam McCall via Phabricator via cfe-commits
sammccall marked 3 inline comments as done. sammccall added inline comments. Comment at: clang/lib/Tooling/Syntax/Tokens.cpp:461 + +// If the macro invocation B starts in a macro A but ends in a file, we'll +// create a merged mapping for A & B by overwriting the endpoint

[PATCH] D77615: [Syntax] Merge overlapping top-level macros in TokenBuffer

2020-04-07 Thread Kadir Cetinkaya via Phabricator via cfe-commits
kadircet accepted this revision. kadircet added a comment. This revision is now accepted and ready to land. LGTM, thanks! Comment at: clang/lib/Tooling/Syntax/Tokens.cpp:452 + +// The *last* token of the macro reference is in the main file for A and B. +if (Range.getEnd

[PATCH] D77615: [Syntax] Merge overlapping top-level macros in TokenBuffer

2020-04-06 Thread Sam McCall via Phabricator via cfe-commits
sammccall created this revision. sammccall added reviewers: kadircet, vabridgers. Herald added a project: clang. Herald added a subscriber: cfe-commits. sammccall added a parent revision: D77614: [Syntax] Simplify TokenCollector::Builder, use captured expansion bounds. NFC. Our previous definitio