This is an archive of the discontinued LLVM Phabricator instance.

Differential D89406

clang/{Format,Rewrite}: Stop using SourceManager::getBuffer, NFC
ClosedPublic

Authored by dexonsmith on Oct 14 2020, 10:02 AM.

Details

Reviewers
arphaman
JDevlieghere
Commits
rG0ddf4bd47c18: clang/{Format,Rewrite}: Stop using SourceManager::getBuffer, NFC
Summary

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.

Diff Detail

Revision Contents

PathSize
clang/
lib/
Format/
2 lines
Rewrite/
18 lines

Diff 299149

clang/lib/Format/FormatTokenLexer.cpp

Show First 20 Lines • Show All 757 Lines • ▼ Show 20 Linesbool FormatTokenLexer::tryMergeConflictMarkers() {
// into a single token with a special token type that the unwrapped line // into a single token with a special token type that the unwrapped line
// parser will use to correctly rebuild the underlying code. // parser will use to correctly rebuild the underlying code.
FileID ID; FileID ID;
// Get the position of the first token in the line. // Get the position of the first token in the line.
unsigned FirstInLineOffset; unsigned FirstInLineOffset;
std::tie(ID, FirstInLineOffset) = SourceMgr.getDecomposedLoc( std::tie(ID, FirstInLineOffset) = SourceMgr.getDecomposedLoc(
Tokens[FirstInLineIndex]->getStartOfNonWhitespace()); 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. // Calculate the offset of the start of the current line.
auto LineOffset = Buffer.rfind('\n', FirstInLineOffset); auto LineOffset = Buffer.rfind('\n', FirstInLineOffset);
if (LineOffset == StringRef::npos) { if (LineOffset == StringRef::npos) {
LineOffset = 0; LineOffset = 0;
} else { } else {
++LineOffset; ++LineOffset;
} }
▲ Show 20 Lines • Show All 306 Lines • Show Last 20 Lines

clang/lib/Rewrite/HTMLRewrite.cpp

Show First 20 Lines • Show All 101 Lines • ▼ Show 20 Lines default:
break; break;
} }
} }
} }
void html::EscapeText(Rewriter &R, FileID FID, void html::EscapeText(Rewriter &R, FileID FID,
bool EscapeSpaces, bool ReplaceTabs) { bool EscapeSpaces, bool ReplaceTabs) {
const llvm::MemoryBuffer *Buf = R.getSourceMgr().getBuffer(FID); llvm::MemoryBufferRef Buf = R.getSourceMgr().getBufferOrFake(FID);
const char* C = Buf->getBufferStart(); const char* C = Buf.getBufferStart();
const char* FileEnd = Buf->getBufferEnd(); const char* FileEnd = Buf.getBufferEnd();
assert (C <= FileEnd); assert (C <= FileEnd);
RewriteBuffer &RB = R.getEditBuffer(FID); RewriteBuffer &RB = R.getEditBuffer(FID);
unsigned ColNo = 0; unsigned ColNo = 0;
for (unsigned FilePos = 0; C != FileEnd ; ++C, ++FilePos) { for (unsigned FilePos = 0; C != FileEnd ; ++C, ++FilePos) {
switch (*C) { switch (*C) {
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Linesstatic void AddLineNumber(RewriteBuffer &RB, unsigned LineNo,
} else { } else {
RB.InsertTextBefore(B, OS.str()); RB.InsertTextBefore(B, OS.str());
RB.InsertTextBefore(E, "</td></tr>"); RB.InsertTextBefore(E, "</td></tr>");
} }
} }
void html::AddLineNumbers(Rewriter& R, FileID FID) { void html::AddLineNumbers(Rewriter& R, FileID FID) {
const llvm::MemoryBuffer *Buf = R.getSourceMgr().getBuffer(FID); llvm::MemoryBufferRef Buf = R.getSourceMgr().getBufferOrFake(FID);
const char* FileBeg = Buf->getBufferStart(); const char* FileBeg = Buf.getBufferStart();
const char* FileEnd = Buf->getBufferEnd(); const char* FileEnd = Buf.getBufferEnd();
const char* C = FileBeg; const char* C = FileBeg;
RewriteBuffer &RB = R.getEditBuffer(FID); RewriteBuffer &RB = R.getEditBuffer(FID);
assert (C <= FileEnd); assert (C <= FileEnd);
unsigned LineNo = 0; unsigned LineNo = 0;
unsigned FilePos = 0; unsigned FilePos = 0;
Show All 29 Linesvoid html::AddLineNumbers(Rewriter& R, FileID FID) {
os << "<table class=\"code\" data-fileid=\"" << FID.getHashValue() << "\">\n"; os << "<table class=\"code\" data-fileid=\"" << FID.getHashValue() << "\">\n";
RB.InsertTextBefore(0, os.str()); RB.InsertTextBefore(0, os.str());
RB.InsertTextAfter(FileEnd - FileBeg, "</table>"); RB.InsertTextAfter(FileEnd - FileBeg, "</table>");
} }
void html::AddHeaderFooterInternalBuiltinCSS(Rewriter &R, FileID FID, void html::AddHeaderFooterInternalBuiltinCSS(Rewriter &R, FileID FID,
StringRef title) { StringRef title) {
const llvm::MemoryBuffer *Buf = R.getSourceMgr().getBuffer(FID); llvm::MemoryBufferRef Buf = R.getSourceMgr().getBufferOrFake(FID);
const char* FileStart = Buf->getBufferStart(); const char* FileStart = Buf.getBufferStart();
const char* FileEnd = Buf->getBufferEnd(); const char* FileEnd = Buf.getBufferEnd();
SourceLocation StartLoc = R.getSourceMgr().getLocForStartOfFile(FID); SourceLocation StartLoc = R.getSourceMgr().getLocForStartOfFile(FID);
SourceLocation EndLoc = StartLoc.getLocWithOffset(FileEnd-FileStart); SourceLocation EndLoc = StartLoc.getLocWithOffset(FileEnd-FileStart);
std::string s; std::string s;
llvm::raw_string_ostream os(s); llvm::raw_string_ostream os(s);
os << "<!doctype html>\n" // Use HTML 5 doctype os << "<!doctype html>\n" // Use HTML 5 doctype
"<html>\n<head>\n"; "<html>\n<head>\n";
▲ Show 20 Lines • Show All 381 Lines • Show Last 20 Lines