This is an archive of the discontinued LLVM Phabricator instance.

Differential D146377

[clangd] Remove reundant use of getSpellingLoc()
ClosedPublic

Authored by nridge on Mar 19 2023, 1:04 AM.

Download Raw Diff

Details

Reviewers

hokein
kadircet

Commits

rG57bfe25574a0: [clangd] Remove reundant use of getSpellingLoc()

Summary

getFileLoc() is guaranteed to return a file loc, and getSpellingLoc()
on a file loc is a no-op.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

nridge created this revision.Mar 19 2023, 1:04 AM

Herald added a project: Restricted Project. · View Herald TranscriptMar 19 2023, 1:04 AM

Herald added a subscriber: arphaman. · View Herald Transcript

nridge requested review of this revision.Mar 19 2023, 1:04 AM

Herald added a project: Restricted Project. · View Herald TranscriptMar 19 2023, 1:04 AM

Herald added subscribers: cfe-commits, MaskRay, ilya-biryukov. · View Herald Transcript

No functional changes intended, this redundancy is just something I noticed while I was learning about these functions during my review of D144074 and looking at other usages of them in clnagd.

Harbormaster completed remote builds in B220271: Diff 506356.Mar 19 2023, 1:24 AM

Thanks!

This revision is now accepted and ready to land.Mar 20 2023, 1:36 AM

Closed by commit rG57bfe25574a0: [clangd] Remove reundant use of getSpellingLoc() (authored by nridge). · Explain WhyMar 20 2023, 11:52 AM

This revision was automatically updated to reflect the committed changes.

nridge added a commit: rG57bfe25574a0: [clangd] Remove reundant use of getSpellingLoc().

Revision Contents

Path

Size

clang-tools-extra/

clangd/

FindSymbols.cpp

4 lines

4 lines

Diff 506672

clang-tools-extra/clangd/FindSymbols.cpp

	Show First 20 Lines • Show All 217 Lines • ▼ Show 20 Lines		if (const auto *VD = dyn_cast<ValueDecl>(&ND)) {
	OS << "concept";			OS << "concept";
	}			}
	return std::move(OS.str());			return std::move(OS.str());
	}			}

	std::optional<DocumentSymbol> declToSym(ASTContext &Ctx, const NamedDecl &ND) {			std::optional<DocumentSymbol> declToSym(ASTContext &Ctx, const NamedDecl &ND) {
	auto &SM = Ctx.getSourceManager();			auto &SM = Ctx.getSourceManager();

	SourceLocation BeginLoc = SM.getSpellingLoc(SM.getFileLoc(ND.getBeginLoc()));			SourceLocation BeginLoc = SM.getFileLoc(ND.getBeginLoc());
	SourceLocation EndLoc = SM.getSpellingLoc(SM.getFileLoc(ND.getEndLoc()));			SourceLocation EndLoc = SM.getFileLoc(ND.getEndLoc());
	const auto SymbolRange =			const auto SymbolRange =
	toHalfOpenFileRange(SM, Ctx.getLangOpts(), {BeginLoc, EndLoc});			toHalfOpenFileRange(SM, Ctx.getLangOpts(), {BeginLoc, EndLoc});
	if (!SymbolRange)			if (!SymbolRange)
	return std::nullopt;			return std::nullopt;

	index::SymbolInfo SymInfo = index::getSymbolInfo(&ND);			index::SymbolInfo SymInfo = index::getSymbolInfo(&ND);
	// FIXME: This is not classifying constructors, destructors and operators			// FIXME: This is not classifying constructors, destructors and operators
	// correctly.			// correctly.
	▲ Show 20 Lines • Show All 423 Lines • Show Last 20 Lines

clang-tools-extra/clangd/XRefs.cpp

	Show First 20 Lines • Show All 1,605 Lines • ▼ Show 20 Lines
	}			}

	template <typename HierarchyItem>			template <typename HierarchyItem>
	static std::optional<HierarchyItem>			static std::optional<HierarchyItem>
	declToHierarchyItem(const NamedDecl &ND, llvm::StringRef TUPath) {			declToHierarchyItem(const NamedDecl &ND, llvm::StringRef TUPath) {
	ASTContext &Ctx = ND.getASTContext();			ASTContext &Ctx = ND.getASTContext();
	auto &SM = Ctx.getSourceManager();			auto &SM = Ctx.getSourceManager();
	SourceLocation NameLoc = nameLocation(ND, Ctx.getSourceManager());			SourceLocation NameLoc = nameLocation(ND, Ctx.getSourceManager());
	SourceLocation BeginLoc = SM.getSpellingLoc(SM.getFileLoc(ND.getBeginLoc()));			SourceLocation BeginLoc = SM.getFileLoc(ND.getBeginLoc());
	SourceLocation EndLoc = SM.getSpellingLoc(SM.getFileLoc(ND.getEndLoc()));			SourceLocation EndLoc = SM.getFileLoc(ND.getEndLoc());
	const auto DeclRange =			const auto DeclRange =
	toHalfOpenFileRange(SM, Ctx.getLangOpts(), {BeginLoc, EndLoc});			toHalfOpenFileRange(SM, Ctx.getLangOpts(), {BeginLoc, EndLoc});
	if (!DeclRange)			if (!DeclRange)
	return std::nullopt;			return std::nullopt;
	auto FilePath =			auto FilePath =
	getCanonicalPath(SM.getFileEntryForID(SM.getFileID(NameLoc)), SM);			getCanonicalPath(SM.getFileEntryForID(SM.getFileID(NameLoc)), SM);
	if (!FilePath)			if (!FilePath)
	return std::nullopt; // Not useful without a uri.			return std::nullopt; // Not useful without a uri.
	▲ Show 20 Lines • Show All 632 Lines • Show Last 20 Lines