Skip to content

Commit 5e4c436

Browse files
authored
[APINotes] Fix a few accidental refactoring artifacts
This fixes a few breakages introduced during upstreaming.
1 parent ded4ea9 commit 5e4c436

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

clang/lib/APINotes/APINotesReader.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ class VersionedTableInfo {
8181
auto version = ReadVersionTuple(Data);
8282
const auto *DataBefore = Data;
8383
(void)DataBefore;
84+
auto UnversionedData = Derived::readUnversioned(Key, Data);
8485
assert(Data != DataBefore &&
8586
"Unversioned data reader didn't move pointer");
86-
auto UnversionedData = Derived::readUnversioned(Key, Data);
8787
Result.push_back({version, UnversionedData});
8888
}
8989
return Result;
@@ -148,7 +148,7 @@ class IdentifierTableInfo {
148148
external_key_type GetExternalKey(internal_key_type Key) { return Key; }
149149

150150
hash_value_type ComputeHash(internal_key_type Key) {
151-
return llvm::hash_value(Key);
151+
return llvm::djbHash(Key);
152152
}
153153

154154
static bool EqualKey(internal_key_type LHS, internal_key_type RHS) {
@@ -1797,8 +1797,8 @@ APINotesReader::Create(std::unique_ptr<llvm::MemoryBuffer> InputBuffer,
17971797
template <typename T>
17981798
APINotesReader::VersionedInfo<T>::VersionedInfo(
17991799
llvm::VersionTuple Version,
1800-
llvm::SmallVector<std::pair<llvm::VersionTuple, T>, 1> Results)
1801-
: Results(std::move(Results)) {
1800+
llvm::SmallVector<std::pair<llvm::VersionTuple, T>, 1> R)
1801+
: Results(std::move(R)) {
18021802

18031803
assert(!Results.empty());
18041804
assert(std::is_sorted(

clang/lib/APINotes/APINotesWriter.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ class APINotesWriter::Implementation {
128128
SelectorID getSelector(ObjCSelectorRef SelectorRef) {
129129
// Translate the selector reference into a stored selector.
130130
StoredObjCSelector Selector;
131+
Selector.NumArgs = SelectorRef.NumArgs;
131132
Selector.Identifiers.reserve(SelectorRef.Identifiers.size());
132133
for (auto piece : SelectorRef.Identifiers)
133134
Selector.Identifiers.push_back(getIdentifier(piece));

0 commit comments

Comments
 (0)