[clang] 5e4c436 - [APINotes] Fix a few accidental refactoring artifacts
via cfe-commits
cfe-commits at lists.llvm.org
Mon Feb 26 16:37:18 PST 2024
Author: Egor Zhdan
Date: 2024-02-27T00:37:15Z
New Revision: 5e4c4365f89b7b31ee3868114dd0f6c5d483e42b
URL: https://github.com/llvm/llvm-project/commit/5e4c4365f89b7b31ee3868114dd0f6c5d483e42b
DIFF: https://github.com/llvm/llvm-project/commit/5e4c4365f89b7b31ee3868114dd0f6c5d483e42b.diff
LOG: [APINotes] Fix a few accidental refactoring artifacts
This fixes a few breakages introduced during upstreaming.
Added:
Modified:
clang/lib/APINotes/APINotesReader.cpp
clang/lib/APINotes/APINotesWriter.cpp
Removed:
################################################################################
diff --git a/clang/lib/APINotes/APINotesReader.cpp b/clang/lib/APINotes/APINotesReader.cpp
index ff9b95d9bf75e3..55ea4bae81e6e8 100644
--- a/clang/lib/APINotes/APINotesReader.cpp
+++ b/clang/lib/APINotes/APINotesReader.cpp
@@ -81,9 +81,9 @@ class VersionedTableInfo {
auto version = ReadVersionTuple(Data);
const auto *DataBefore = Data;
(void)DataBefore;
+ auto UnversionedData = Derived::readUnversioned(Key, Data);
assert(Data != DataBefore &&
"Unversioned data reader didn't move pointer");
- auto UnversionedData = Derived::readUnversioned(Key, Data);
Result.push_back({version, UnversionedData});
}
return Result;
@@ -148,7 +148,7 @@ class IdentifierTableInfo {
external_key_type GetExternalKey(internal_key_type Key) { return Key; }
hash_value_type ComputeHash(internal_key_type Key) {
- return llvm::hash_value(Key);
+ return llvm::djbHash(Key);
}
static bool EqualKey(internal_key_type LHS, internal_key_type RHS) {
@@ -1797,8 +1797,8 @@ APINotesReader::Create(std::unique_ptr<llvm::MemoryBuffer> InputBuffer,
template <typename T>
APINotesReader::VersionedInfo<T>::VersionedInfo(
llvm::VersionTuple Version,
- llvm::SmallVector<std::pair<llvm::VersionTuple, T>, 1> Results)
- : Results(std::move(Results)) {
+ llvm::SmallVector<std::pair<llvm::VersionTuple, T>, 1> R)
+ : Results(std::move(R)) {
assert(!Results.empty());
assert(std::is_sorted(
diff --git a/clang/lib/APINotes/APINotesWriter.cpp b/clang/lib/APINotes/APINotesWriter.cpp
index 62a2ab1799913a..76fd24ccfae984 100644
--- a/clang/lib/APINotes/APINotesWriter.cpp
+++ b/clang/lib/APINotes/APINotesWriter.cpp
@@ -128,6 +128,7 @@ class APINotesWriter::Implementation {
SelectorID getSelector(ObjCSelectorRef SelectorRef) {
// Translate the selector reference into a stored selector.
StoredObjCSelector Selector;
+ Selector.NumArgs = SelectorRef.NumArgs;
Selector.Identifiers.reserve(SelectorRef.Identifiers.size());
for (auto piece : SelectorRef.Identifiers)
Selector.Identifiers.push_back(getIdentifier(piece));
More information about the cfe-commits
mailing list