replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up after clang r331155. 

llvm-svn: 331156
This commit is contained in:
Richard Smith 2018-04-30 05:26:07 +00:00
parent b5f8171a1b
commit 4bb15ab853
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang-tools-extra/clang-move/ClangMove.cpp
View File

@ -280,7 +280,10 @@ SourceLocation
getLocForEndOfDecl(const clang::Decl *D,
const LangOptions &LangOpts = clang::LangOptions()) {
const auto &SM = D->getASTContext().getSourceManager();
auto EndExpansionLoc = SM.getExpansionRange(D->getLocEnd()).second;
// If the expansion range is a character range, this is the location of
// the first character past the end. Otherwise it's the location of the
// first character in the final token in the range.
auto EndExpansionLoc = SM.getExpansionRange(D->getLocEnd()).getEnd();
std::pair<FileID, unsigned> LocInfo = SM.getDecomposedLoc(EndExpansionLoc);
// Try to load the file buffer.
bool InvalidTemp = false;

2
clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
View File

@ -374,7 +374,7 @@ static bool LineIsMarkedWithNOLINTinMacro(SourceManager &SM, SourceLocation Loc,
return true;
if (!Loc.isMacroID())
return false;
Loc = SM.getImmediateExpansionRange(Loc).first;
Loc = SM.getImmediateExpansionRange(Loc).getBegin();
}
return false;
}

2
clang-tools-extra/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp
View File

@ -81,7 +81,7 @@ void LambdaFunctionNameCheck::check(const MatchFinder::MatchResult &Result) {
if (E->getLocation().isMacroID()) {
auto ER =
Result.SourceManager->getImmediateExpansionRange(E->getLocation());
if (SuppressMacroExpansions.find(SourceRange(ER.first, ER.second)) !=
if (SuppressMacroExpansions.find(ER.getAsRange()) !=
SuppressMacroExpansions.end()) {
// This is a macro expansion for which we should not warn.
return;

9
clang-tools-extra/clang-tidy/bugprone/MultipleStatementMacroCheck.cpp
View File

@ -38,7 +38,7 @@ const Stmt *nextStmt(const MatchFinder::MatchResult &Result, const Stmt *S) {
return nextStmt(Result, Parent);
}
using ExpansionRanges = std::vector<std::pair<SourceLocation, SourceLocation>>;
using ExpansionRanges = std::vector<SourceRange>;
/// \bried Get all the macro expansion ranges related to `Loc`.
///
@ -47,8 +47,9 @@ ExpansionRanges getExpansionRanges(SourceLocation Loc,
const MatchFinder::MatchResult &Result) {
ExpansionRanges Locs;
while (Loc.isMacroID()) {
Locs.push_back(Result.SourceManager->getImmediateExpansionRange(Loc));
Loc = Locs.back().first;
Locs.push_back(
Result.SourceManager->getImmediateExpansionRange(Loc).getAsRange());
Loc = Locs.back().getBegin();
}
return Locs;
}
@ -96,7 +97,7 @@ void MultipleStatementMacroCheck::check(
InnerRanges.back() != NextRanges.back())
return;
diag(InnerRanges.back().first, "multiple statement macro used without "
diag(InnerRanges.back().getBegin(), "multiple statement macro used without "
"braces; some statements will be "
"unconditionally executed");
}

4
clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp
View File

@ -332,7 +332,7 @@ private:
NullMacros.end();
}
MacroLoc = SM.getExpansionRange(ArgLoc).first;
MacroLoc = SM.getExpansionRange(ArgLoc).getBegin();
ArgLoc = Expansion.getSpellingLoc().getLocWithOffset(LocInfo.second);
if (ArgLoc.isFileID())
@ -387,7 +387,7 @@ private:
continue;
}
MacroLoc = SM.getImmediateExpansionRange(Loc).first;
MacroLoc = SM.getImmediateExpansionRange(Loc).getBegin();
if (MacroLoc.isFileID() && MacroLoc == TestMacroLoc) {
// Match made.
return true;

2
clang-tools-extra/clangd/AST.cpp
View File

@ -32,7 +32,7 @@ SourceLocation findNameLoc(const clang::Decl* D) {
// be "<scratch space>"
// * symbols controlled and defined by a compile command-line option
// `-DName=foo`, the spelling location will be "<command line>".
SpellingLoc = SM.getExpansionRange(D->getLocation()).first;
SpellingLoc = SM.getExpansionRange(D->getLocation()).getBegin();
}
}
return SpellingLoc;