diff options
| -rw-r--r-- | clang-tools-extra/clangd/index/CanonicalIncludes.cpp | 8 | ||||
| -rw-r--r-- | clang-tools-extra/clangd/index/CanonicalIncludes.h | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/clang-tools-extra/clangd/index/CanonicalIncludes.cpp b/clang-tools-extra/clangd/index/CanonicalIncludes.cpp index d8448a1b04e..6b352855663 100644 --- a/clang-tools-extra/clangd/index/CanonicalIncludes.cpp +++ b/clang-tools-extra/clangd/index/CanonicalIncludes.cpp @@ -35,11 +35,9 @@ void CanonicalIncludes::addSymbolMapping(llvm::StringRef QualifiedName, llvm::StringRef CanonicalIncludes::mapHeader(llvm::StringRef Header, llvm::StringRef QualifiedName) const { - if (!QualifiedName.empty()) { - auto SE = SymbolMapping.find(QualifiedName); - if (SE != SymbolMapping.end()) - return SE->second; - } + auto SE = SymbolMapping.find(QualifiedName); + if (SE != SymbolMapping.end()) + return SE->second; std::lock_guard<std::mutex> Lock(RegexMutex); for (auto &Entry : RegexHeaderMappingTable) { #ifndef NDEBUG diff --git a/clang-tools-extra/clangd/index/CanonicalIncludes.h b/clang-tools-extra/clangd/index/CanonicalIncludes.h index 3d6c4daef08..b7cd62419ab 100644 --- a/clang-tools-extra/clangd/index/CanonicalIncludes.h +++ b/clang-tools-extra/clangd/index/CanonicalIncludes.h @@ -48,12 +48,10 @@ public: void addSymbolMapping(llvm::StringRef QualifiedName, llvm::StringRef CanonicalPath); - /// \return \p Header itself if there is no mapping for it; otherwise, return - /// a canonical header name. - /// \p QualifiedName of a symbol declared in \p Header can be provided to - /// check against the symbol mapping. + /// Returns the canonical include for symbol with \p QualifiedName, which is + /// declared in \p Header llvm::StringRef mapHeader(llvm::StringRef Header, - llvm::StringRef QualifiedName = "") const; + llvm::StringRef QualifiedName) const; private: // A map from header patterns to header names. This needs to be mutable so |
