Skip to content

Commit 0ddf4bd

Browse files
committed
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
1 parent 188a7d6 commit 0ddf4bd

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

clang/lib/Format/FormatTokenLexer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ bool FormatTokenLexer::tryMergeConflictMarkers() {
763763
unsigned FirstInLineOffset;
764764
std::tie(ID, FirstInLineOffset) = SourceMgr.getDecomposedLoc(
765765
Tokens[FirstInLineIndex]->getStartOfNonWhitespace());
766-
StringRef Buffer = SourceMgr.getBuffer(ID)->getBuffer();
766+
StringRef Buffer = SourceMgr.getBufferOrFake(ID).getBuffer();
767767
// Calculate the offset of the start of the current line.
768768
auto LineOffset = Buffer.rfind('\n', FirstInLineOffset);
769769
if (LineOffset == StringRef::npos) {

clang/lib/Rewrite/HTMLRewrite.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ void html::HighlightRange(RewriteBuffer &RB, unsigned B, unsigned E,
107107
void html::EscapeText(Rewriter &R, FileID FID,
108108
bool EscapeSpaces, bool ReplaceTabs) {
109109

110-
const llvm::MemoryBuffer *Buf = R.getSourceMgr().getBuffer(FID);
111-
const char* C = Buf->getBufferStart();
112-
const char* FileEnd = Buf->getBufferEnd();
110+
llvm::MemoryBufferRef Buf = R.getSourceMgr().getBufferOrFake(FID);
111+
const char* C = Buf.getBufferStart();
112+
const char* FileEnd = Buf.getBufferEnd();
113113

114114
assert (C <= FileEnd);
115115

@@ -226,9 +226,9 @@ static void AddLineNumber(RewriteBuffer &RB, unsigned LineNo,
226226

227227
void html::AddLineNumbers(Rewriter& R, FileID FID) {
228228

229-
const llvm::MemoryBuffer *Buf = R.getSourceMgr().getBuffer(FID);
230-
const char* FileBeg = Buf->getBufferStart();
231-
const char* FileEnd = Buf->getBufferEnd();
229+
llvm::MemoryBufferRef Buf = R.getSourceMgr().getBufferOrFake(FID);
230+
const char* FileBeg = Buf.getBufferStart();
231+
const char* FileEnd = Buf.getBufferEnd();
232232
const char* C = FileBeg;
233233
RewriteBuffer &RB = R.getEditBuffer(FID);
234234

@@ -274,9 +274,9 @@ void html::AddLineNumbers(Rewriter& R, FileID FID) {
274274
void html::AddHeaderFooterInternalBuiltinCSS(Rewriter &R, FileID FID,
275275
StringRef title) {
276276

277-
const llvm::MemoryBuffer *Buf = R.getSourceMgr().getBuffer(FID);
278-
const char* FileStart = Buf->getBufferStart();
279-
const char* FileEnd = Buf->getBufferEnd();
277+
llvm::MemoryBufferRef Buf = R.getSourceMgr().getBufferOrFake(FID);
278+
const char* FileStart = Buf.getBufferStart();
279+
const char* FileEnd = Buf.getBufferEnd();
280280

281281
SourceLocation StartLoc = R.getSourceMgr().getLocForStartOfFile(FID);
282282
SourceLocation EndLoc = StartLoc.getLocWithOffset(FileEnd-FileStart);

0 commit comments

Comments
 (0)