Author: Duncan P. N. Exon Smith Date: 2020-10-19T17:02:59-04:00 New Revision: 0ddf4bd47c18a4608b67fdda537f575c4c7a0a52
URL: https://github.com/llvm/llvm-project/commit/0ddf4bd47c18a4608b67fdda537f575c4c7a0a52 DIFF: https://github.com/llvm/llvm-project/commit/0ddf4bd47c18a4608b67fdda537f575c4c7a0a52.diff LOG: clang/{Format,Rewrite}: Stop using SourceManager::getBuffer, NFC Update clang/lib/Format and clang/lib/Rewrite to use a `MemoryBufferRef` from `getBufferOrFake` instead of `MemoryBuffer*` from `getBuffer`. No functionality change here, since the call sites weren't checking if the buffer was valid. Differential Revision: https://reviews.llvm.org/D89406 Added: Modified: clang/lib/Format/FormatTokenLexer.cpp clang/lib/Rewrite/HTMLRewrite.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/FormatTokenLexer.cpp b/clang/lib/Format/FormatTokenLexer.cpp index c1466196b4d6..eb2438ecabd6 100644 --- a/clang/lib/Format/FormatTokenLexer.cpp +++ b/clang/lib/Format/FormatTokenLexer.cpp @@ -763,7 +763,7 @@ bool FormatTokenLexer::tryMergeConflictMarkers() { unsigned FirstInLineOffset; std::tie(ID, FirstInLineOffset) = SourceMgr.getDecomposedLoc( Tokens[FirstInLineIndex]->getStartOfNonWhitespace()); - StringRef Buffer = SourceMgr.getBuffer(ID)->getBuffer(); + StringRef Buffer = SourceMgr.getBufferOrFake(ID).getBuffer(); // Calculate the offset of the start of the current line. auto LineOffset = Buffer.rfind('\n', FirstInLineOffset); if (LineOffset == StringRef::npos) { diff --git a/clang/lib/Rewrite/HTMLRewrite.cpp b/clang/lib/Rewrite/HTMLRewrite.cpp index e304fbbed729..1dc7bee78440 100644 --- a/clang/lib/Rewrite/HTMLRewrite.cpp +++ b/clang/lib/Rewrite/HTMLRewrite.cpp @@ -107,9 +107,9 @@ void html::HighlightRange(RewriteBuffer &RB, unsigned B, unsigned E, void html::EscapeText(Rewriter &R, FileID FID, bool EscapeSpaces, bool ReplaceTabs) { - const llvm::MemoryBuffer *Buf = R.getSourceMgr().getBuffer(FID); - const char* C = Buf->getBufferStart(); - const char* FileEnd = Buf->getBufferEnd(); + llvm::MemoryBufferRef Buf = R.getSourceMgr().getBufferOrFake(FID); + const char* C = Buf.getBufferStart(); + const char* FileEnd = Buf.getBufferEnd(); assert (C <= FileEnd); @@ -226,9 +226,9 @@ static void AddLineNumber(RewriteBuffer &RB, unsigned LineNo, void html::AddLineNumbers(Rewriter& R, FileID FID) { - const llvm::MemoryBuffer *Buf = R.getSourceMgr().getBuffer(FID); - const char* FileBeg = Buf->getBufferStart(); - const char* FileEnd = Buf->getBufferEnd(); + llvm::MemoryBufferRef Buf = R.getSourceMgr().getBufferOrFake(FID); + const char* FileBeg = Buf.getBufferStart(); + const char* FileEnd = Buf.getBufferEnd(); const char* C = FileBeg; RewriteBuffer &RB = R.getEditBuffer(FID); @@ -274,9 +274,9 @@ void html::AddLineNumbers(Rewriter& R, FileID FID) { void html::AddHeaderFooterInternalBuiltinCSS(Rewriter &R, FileID FID, StringRef title) { - const llvm::MemoryBuffer *Buf = R.getSourceMgr().getBuffer(FID); - const char* FileStart = Buf->getBufferStart(); - const char* FileEnd = Buf->getBufferEnd(); + llvm::MemoryBufferRef Buf = R.getSourceMgr().getBufferOrFake(FID); + const char* FileStart = Buf.getBufferStart(); + const char* FileEnd = Buf.getBufferEnd(); SourceLocation StartLoc = R.getSourceMgr().getLocForStartOfFile(FID); SourceLocation EndLoc = StartLoc.getLocWithOffset(FileEnd-FileStart); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits