diff options
author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2020-10-14 14:36:00 -0400 |
---|---|---|
committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2020-10-15 00:35:16 -0400 |
commit | 006519816689acef5fd971955e21b7ab17ae65d9 (patch) | |
tree | 0fe0d280bf3e3c4e8db4e58cbd728f4ded429eb4 /clang-tools-extra/clang-tidy/misc | |
parent | af4fb416bd355960ce93f271a0591f24f58d25ec (diff) | |
download | llvm-006519816689acef5fd971955e21b7ab17ae65d9.zip llvm-006519816689acef5fd971955e21b7ab17ae65d9.tar.gz llvm-006519816689acef5fd971955e21b7ab17ae65d9.tar.bz2 |
clang-{tools,unittests}: Stop using SourceManager::getBuffer, NFC
Update clang-tools-extra, clang/tools, clang/unittests to migrate from
`SourceManager::getBuffer`, which returns an always dereferenceable
`MemoryBuffer*`, to `getBufferOrNone` or `getBufferOrFake`, both of
which return a `MemoryBufferRef`, depending on whether the call site was
checking for validity of the buffer. No functionality change intended.
Differential Revision: https://reviews.llvm.org/D89416
Diffstat (limited to 'clang-tools-extra/clang-tidy/misc')
-rw-r--r-- | clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp | 10 | ||||
-rw-r--r-- | clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp b/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp index b84e4d5..5d3d3c4 100644 --- a/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp +++ b/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp @@ -794,14 +794,14 @@ static bool areExprsFromDifferentMacros(const Expr *LhsExpr, SM.getDecomposedLoc(SM.getExpansionLoc(Lsr.getBegin())); std::pair<FileID, unsigned> RsrLocInfo = SM.getDecomposedLoc(SM.getExpansionLoc(Rsr.getBegin())); - const llvm::MemoryBuffer *MB = SM.getBuffer(LsrLocInfo.first); + llvm::MemoryBufferRef MB = SM.getBufferOrFake(LsrLocInfo.first); - const char *LTokenPos = MB->getBufferStart() + LsrLocInfo.second; - const char *RTokenPos = MB->getBufferStart() + RsrLocInfo.second; + const char *LTokenPos = MB.getBufferStart() + LsrLocInfo.second; + const char *RTokenPos = MB.getBufferStart() + RsrLocInfo.second; Lexer LRawLex(SM.getLocForStartOfFile(LsrLocInfo.first), LO, - MB->getBufferStart(), LTokenPos, MB->getBufferEnd()); + MB.getBufferStart(), LTokenPos, MB.getBufferEnd()); Lexer RRawLex(SM.getLocForStartOfFile(RsrLocInfo.first), LO, - MB->getBufferStart(), RTokenPos, MB->getBufferEnd()); + MB.getBufferStart(), RTokenPos, MB.getBufferEnd()); Token LTok, RTok; do { // Compare the expressions token-by-token. diff --git a/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp b/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp index 53cebc3..3e3f8db 100644 --- a/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp +++ b/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp @@ -140,7 +140,8 @@ SourceLocation StaticAssertCheck::getLastParenLoc(const ASTContext *ASTCtx, const LangOptions &Opts = ASTCtx->getLangOpts(); const SourceManager &SM = ASTCtx->getSourceManager(); - const llvm::MemoryBuffer *Buffer = SM.getBuffer(SM.getFileID(AssertLoc)); + llvm::Optional<llvm::MemoryBufferRef> Buffer = + SM.getBufferOrNone(SM.getFileID(AssertLoc)); if (!Buffer) return SourceLocation(); |